[libreoffice] 22/152: add add b-d for report builder

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.

commit 994e464f3162dea94c8c4517e34d35f264168bb4
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu Nov 26 15:33:03 2015 +0100

    add add b-d for report builder
---
 changelog | 6 ++++++
 rules     | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index ea6a516..3f0d759 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:5.1.0~alpha1-4ubuntu4) xenial; urgency=medium
+
+  * add all build deps for report builder
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Thu, 26 Nov 2015 15:31:59 +0100
+
 libreoffice (1:5.1.0~alpha1-4ubuntu3) xenial; urgency=medium
 
   * revert move of liblpsolve when --with-system-lpsolve, is already done
diff --git a/rules b/rules
index 9d404dd..7801fa4 100755
--- a/rules
+++ b/rules
@@ -1118,14 +1118,14 @@ export JAVA_HOME
     ifneq (,$(filter jfreereport, $(SYSTEM_STUFF)))
 	REPORT_BUILDER_BUILD_DEPS += , libbase-java$(OOO_NO_REPORTDESIGN_ARCHS), libsac-java$(OOO_NO_REPORTDESIGN_ARCHS), libxml-java (>= 1.1.6)$(OOO_NO_REPORTDESIGN_ARCHS), libflute-java (>= 1.1.6)$(OOO_NO_REPORTDESIGN_ARCHS), libpentaho-reporting-flow-engine-java (>= 0.9.4)$(OOO_NO_REPORTDESIGN_ARCHS), liblayout-java (>= 0.2.10)$(OOO_NO_REPORTDESIGN_ARCHS), libloader-java (>= 1.1.6)$(OOO_NO_REPORTDESIGN_ARCHS), libformula-java (>= 1.1.7)$(OOO_NO_REPORTDESIGN_ARCHS), librepository-java (>= 1.1 [...]
 	REPORT_BUILDER_JAR_DEPENDS := , libbase-java, libsac-java, libxml-java (>= 1.1.6), libflute-java (>= 1.1.6), libpentaho-reporting-flow-engine-java (>= 0.9.4), liblayout-java (>= 0.2.10), libloader-java (>= 1.1.6), libformula-java (>= 1.1.7), librepository-java (>= 1.1.6), libfonts-java (>= 1.1.6), libserializer-java (>= 1.1.6)
-	BUILD_DEPS_INDEP += $(REPORT_BUILDER_BUILD_DEPS)
 	CONFIGURE_FLAGS += --with-libbase-jar=/usr/share/java/libbase.jar --with-libxml-jar=/usr/share/java/libxml.jar --with-flute-jar=/usr/share/java/flute.jar --with-jfreereport-jar=/usr/share/java/flow-engine.jar --with-liblayout-jar=/usr/share/java/liblayout.jar --with-libloader-jar=/usr/share/java/libloader.jar --with-libformula-jar=/usr/share/java/libformula.jar --with-librepository-jar=/usr/share/java/librepository.jar --with-libfonts-jar=/usr/share/java/libfonts.jar --with-libserialize [...]
     endif
     ifneq (,$(filter apache-commons, $(SYSTEM_STUFF)))
-	REPORT_BUILDER_BUILD_DEPS += , libcommons-logging-java$(OOO_NO_JAVA_ARCHS) (>= 1.1.1-9)
+	REPORT_BUILDER_BUILD_DEPS += , libcommons-logging-java (>= 1.1.1-9)$(OOO_NO_JAVA_ARCHS)
 	REPORT_BUILDER_JAR_DEPENDS += , libcommons-logging-java (>=1.1.1-9)
 	CONFIGURE_FLAGS += --with-commons-logging-jar=/usr/share/java/commons-logging.jar
     endif
+	BUILD_DEPS_INDEP += $(REPORT_BUILDER_BUILD_DEPS)
   else
 	CONFIGURE_FLAGS += --disable-report-builder
   endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git