[SCM] LibreOffice packaging repository branch, ubuntu-quantal-3.6, updated. libreoffice_3.5.4-5-172-g899d9d2
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 456666e513c4eda8fdd975b9b4ad28f332c59114
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Aug 8 15:29:51 2012 +0200
reenable reportbuilder
diff --git a/changelog b/changelog
index a848297..8523a31 100644
--- a/changelog
+++ b/changelog
@@ -11,8 +11,9 @@ libreoffice (1:3.6.0~rc4-0ubuntu2) precise; urgency=low
- remove obsolete lp-904212-add-missing-mimetypes-to-impress.desktop.diff
- remove obsolete remove-broken-mysqlcon-version-check.diff
- remove unoapi-test disabling patch, now that we seem to evade lp#1017125
+ * reenable reportbuilder for universe ppa builds only (LP: #992232)
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 08 Aug 2012 11:05:24 +0200
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 08 Aug 2012 15:28:16 +0200
libreoffice (1:3.6.0~rc4-0ubuntu1) quantal-proposed; urgency=low
diff --git a/rules b/rules
index 2d12d21..3b7d702 100755
--- a/rules
+++ b/rules
@@ -509,11 +509,13 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
RUN_MAKE_CHECK:=n
endif
PARALLEL_BUILD=y
-
#temp. hacks
+ ifeq ($(shell echo "$(DEB_VERSION)" | grep -c universe),1)
+ ENABLE_REPORTDESIGN=y
+ else
+ ENABLE_REPORTDESIGN=n
+ endif
ENABLE_EVO2:=n
- # too much MIRs for the initial upload
- ENABLE_REPORTDESIGN=n
ifneq (,$(filter armel armhf,$(DEB_HOST_ARCH)))
ENABLE_HELP=n
endif
--
LibreOffice packaging repository
Reply to: