The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 952aefd1680ace5eb5e42fd0054d3af79f66c7c1
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Thu Dec 15 15:03:52 2011 +0100
allow firefox-dev as an alternative to xulrunner-dev
exchange firefox-dev and xulrunner-dev order in rules
diff --git a/rules b/rules
index b0c6484..84a1a22 100755
--- a/rules
+++ b/rules
@@ -844,7 +844,7 @@ ifneq (,$(filter nss, $(SYSTEM_STUFF)))
DBG_DBG_SUGGESTS+= , libnss3-1d-dbg
endif
ifneq (,$(filter mozilla-headers, $(SYSTEM_STUFF)))
- BUILD_DEPS+= , xulrunner-dev$(OOO_NO_NSPLUGIN_ARCHS)
+ BUILD_DEPS+= , firefox-dev$(OOO_NO_NSPLUGIN_ARCHS) |
xulrunner-dev$(OOO_NO_NSPLUGIN_ARCHS)
endif
CONFIGURE_FLAGS += --disable-build-mozilla --disable-mozilla
ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NSPLUGIN_ARCHS)))
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1sinyr-0005mv...@vasks.debian.org
