[SCM] LibreOffice packaging repository branch, ubuntu-quantal-3.6, updated. libreoffice_3.5.4-5-163-ged06f67
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit ae519f324a5a27ca0652c49463136bfb3e658670
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Jul 24 15:46:43 2012 +0200
reenable binfilter
diff --git a/changelog b/changelog
index da32173..58d3337 100644
--- a/changelog
+++ b/changelog
@@ -16,12 +16,9 @@ libreoffice (1:3.6.0~rc2-0ubuntu2) quantal; urgency=low
libreoffice (1:3.6.0~rc2-0ubuntu1) quantal; urgency=low
* new upstream rc
-<<<<<<< HEAD
* switch to libservlet 3.0 API (LP: #1023405)
* revert 78c2f91bd0ba744ddacb908457a18ca6537c8017
* temp. disable reportbuilder for it needs 17 MIRs still
-=======
->>>>>>> parent of 780ca0e... lp#1023405: switch to libservlet 3.0 API
-- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 18 Jul 2012 12:54:24 +0200
diff --git a/rules b/rules
index 362a850..5bf5a1c 100755
--- a/rules
+++ b/rules
@@ -516,6 +516,8 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
ifneq (,$(filter armel armhf,$(DEB_HOST_ARCH)))
ENABLE_HELP=n
endif
+ # we are already shipping (prebeta) packages, not having binfilter makes -dbg miss deps
+ BUILD_BINFILTERS=y
endif
CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
--
LibreOffice packaging repository
Reply to: