The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit d5dea3c6bbb333659016a0fdde03ae098db19096
Author: Bjoern Michaelsen <[email protected]>
Date: Fri Jul 20 13:34:14 2012 +0200
remove reportbuilder dep as long as it is still disabled, disable help on
armel, armhf for now
diff --git a/changelog b/changelog
index d1c2c7b..58d3337 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:3.6.0~rc2-0ubuntu3) quantal-proposed; urgency=low
+
+ * remove reportbuilder dep as long as we still have it disabled
+ * disable help on armel,armhf for now because of build breaker in
+ helpcontent2/util/sdatabase
+
+ -- Bjoern Michaelsen <[email protected]> Fri, 20 Jul 2012
13:14:11 +0200
+
libreoffice (1:3.6.0~rc2-0ubuntu2) quantal; urgency=low
* remove build-conflict against gcc-4.7
diff --git a/control.in b/control.in
index ca53bd3..710c811 100644
--- a/control.in
+++ b/control.in
@@ -58,7 +58,6 @@ Depends: libreofficeVER-core (= ${binary:Version}),
libreofficeVER-draw,
libreofficeVER-math,
libreofficeVER-base%OOO_NO_BASE_ARCHS%,
- libreofficeVER-report-builder-bin%OOO_NO_REPORTDESIGN_ARCHS%,
ttf-dejavu,
ttf-sil-gentium-basic,
libreofficeVER-filter-mobiledev,
diff --git a/rules b/rules
index 6cc5675..ac0abbc 100755
--- a/rules
+++ b/rules
@@ -518,6 +518,9 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
endif
# too much MIRs for the initial upload
ENABLE_REPORTDESIGN=n
+ ifneq (,$(filter armel armhf,$(DEB_HOST_ARCH)))
+ ENABLE_HELP=n
+ endif
endif
CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
