[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.2_rc2-1-134-g097b509
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 4b349e3953e39da9d80829357f3d1cc34840a2e0
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue May 29 09:57:57 2012 +0200
replace xulrunner-dev by firefox-dev completely
diff --git a/changelog b/changelog
index cd37ba5..137da26 100644
--- a/changelog
+++ b/changelog
@@ -80,7 +80,7 @@ libreoffice (1:3.5.4~rc2-0ubuntu1~ppa1) precise; urgency=low
- fdo#50173: Styles and Formatting popup crashes LibreOffice on fluxbox [Bjoern Michaelsen]
[ Rene Engelhard ]
- * adapt officebean fix
+ * adapt officebean fix (fdo#49580)
-- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 23 May 2012 12:43:20 +0200
diff --git a/rules b/rules
index f3d879f..84c4b1d 100755
--- a/rules
+++ b/rules
@@ -882,7 +882,7 @@ ifneq (,$(filter nss, $(SYSTEM_STUFF)))
DBG_DBG_SUGGESTS+= , libnss3-1d-dbg
endif
ifneq (,$(filter mozilla-headers, $(SYSTEM_STUFF)))
- BUILD_DEPS+= , firefox-dev$(OOO_NO_NSPLUGIN_ARCHS) | xulrunner-dev$(OOO_NO_NSPLUGIN_ARCHS)
+ BUILD_DEPS+= , firefox-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: