[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.1-1-64-gf621e55
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit f8688bfd2c766309265d2c05bef1b74f42e2f181
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Sun Mar 18 21:22:54 2012 +0100
exchange firefox-dev and xulrunner-dev order in rules
diff --git a/rules b/rules
index e2003a6..0b797c9 100755
--- a/rules
+++ b/rules
@@ -871,7 +871,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) | firefox-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
Reply to: