[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.3-2-20-geb09b5f
The following commit has been merged in the master branch:
commit a53d4393a6d05ce57903939370cd947eea144c41
Author: Rene Engelhard <rene@debian.org>
Date: Wed Sep 28 13:41:00 2011 +0200
fix typo in REPORT_BUILDER_JAR_DEPENDS
diff --git a/changelog b/changelog
index a6df49b..739112e 100644
--- a/changelog
+++ b/changelog
@@ -18,7 +18,7 @@ libreoffice (1:3.4.3-3) UNRELEASED; urgency=low
- fixing crash on closing document with footnotes (LP: #854626)
- fixing crash on screen resolution change (LP: #852819)
- -- Rene Engelhard <rene@debian.org> Mon, 26 Sep 2011 21:39:11 +0000
+ -- Rene Engelhard <rene@debian.org> Wed, 28 Sep 2011 13:41:27 +0200
libreoffice (1:3.4.3-2) unstable; urgency=medium
diff --git a/rules b/rules
index b198efe..c8991a3 100755
--- a/rules
+++ b/rules
@@ -807,7 +807,7 @@ export MINGWSTRIP = i586-mingw32msvc-strip
# report-builder
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.6)$(OOO_NO_REPORTDESIGN_ARCHS), libfonts-java (>= 1.1.6)$(OOO_NO_REPORTDESIGN_ARCHS), libserializer-java (>= 1.1.6)$(OOO_NO_REPORTDESIGN_ARCHS)
- 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)
+ 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 += $(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-libserializer-jar=/usr/share/java/libserializer.jar
endif
--
LibreOffice packaging repository
Reply to: