The following commit has been merged in the master branch:
commit ce8a4c823120de09853595b366f781ccda64ca9c
Author: Rene Engelhard <r...@debian.org>
Date: Fri Feb 24 21:19:37 2012 +0100
fix (>= 1.1.9) for libcommons-logging-java to actually work, thanks Rico
Tzschichholz
diff --git a/changelog b/changelog
index 8592e4e..a14c0c1 100644
--- a/changelog
+++ b/changelog
@@ -2,9 +2,12 @@ libreoffice (1:3.4.5-4) UNRELEASED; urgency=low
* debian/patches/armhf-bridges-doubles.diff: some more armhf fixes
(+ testcase) from master
- * debian/rules: remove obsolete "export MINGWSTRIP" hack
+ * debian/rules:
+ - remove obsolete "export MINGWSTRIP" hack
+ - fix (>= 1.1.9) for libcommons-logging-java to actually work, thanks
+ Rico Tzschichholz
- -- Rene Engelhard <r...@debian.org> Thu, 23 Feb 2012 21:05:54 +0000
+ -- Rene Engelhard <r...@debian.org> Fri, 24 Feb 2012 21:16:57 +0100
libreoffice (1:3.4.5-3) unstable; urgency=low
diff --git a/control b/control
index cb1545e..dad3f8b 100644
--- a/control
+++ b/control
@@ -3,7 +3,7 @@ Section: editors
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <r...@debian.org>
-Build-Depends: lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip,
zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>=
2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev,
libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev,
libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev,
libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, po-debconf, bc, wget | curl, libgl1-mesa-dev [!armel
!mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>=
0.8.0), libpoppler-private-dev, libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3)
[!armel !sparc], libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev, libssl-dev,
libdb-dev, dpkg-dev (>= 1.15.6), python (>= 2.6.6-3+squeeze4), python-dev,
debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), openjdk-6-jdk (>= 6b23~pre8-2)
[alpha amd64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x
sparc], openjdk-7-jdk [ia64], gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64],
gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386], libgcj-common (>=
1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386], ant (>= 1.7.0), ant-optional (>=
1.7.0), mingw-w64 (>= 1.0), libcommons-codec-java, libcommons-httpclient-java,
libcommons-lang-java, libcommons-logging-java, libservlet2.5-java (>= 1.1.1-9),
libbase-java [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libsac-java [!armel
!hppa !kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!armel !hppa
!kfreebsd-amd64 !kfreebsd-i386], libflute-java (>= 1.1.6) [!armel !hppa
!kfreebsd-amd64 !kfreebsd-i386], libpentaho-reporting-flow-engine-java (>=
0.9.4) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>=
0.2.10) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libloader-java (>=
1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libformula-java (>= 1
.1.7) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], librepository-java (>=
1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6)
[!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libserializer-java (>= 1.1.6)
[!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java,
libservlet2.5-java (>= 1.1.1-9), javahelper (>= 0.37~), xulrunner-dev,
libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), libhunspell-dev (>= 1.1.5-2),
libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>=
1.38), libmdds-dev (>= 0.5.0), libvigraimpex-dev, libwpd-dev (>= 0.9.0),
libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0),
libicu-dev (>= 4.0), libxslt1-dev, libcairo2-dev, kdelibs5-dev (>= 4:4.3.4),
libqt4-dev (>= 4.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791),
libebook1.2-dev [!armel !armhf], libpq-dev (>= 9.0~), libxrandr-dev,
liblucene2-java (>= 2.3.2), libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4),
liblpsolve55-dev
(>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1), libsuitesparse-dev (>=
1:3.4.0), libdbus-glib-1-dev (>= 0.60), libgstreamer-plugins-base0.10-dev,
libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libgtk2.0-dev (>= 2.10),
libgnomevfs2-dev, libgconf2-dev, liborbit2-dev, libldap2-dev
+Build-Depends: lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip,
zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>=
2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev,
libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev,
libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev,
libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, po-debconf, bc, wget | curl, libgl1-mesa-dev [!armel
!mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>=
0.8.0), libpoppler-private-dev, libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3)
[!armel !sparc], libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev, libssl-dev,
libdb-dev, dpkg-dev (>= 1.15.6), python (>= 2.6.6-3+squeeze4), python-dev,
debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), openjdk-6-jdk (>= 6b23~pre8-2)
[alpha amd64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x
sparc], openjdk-7-jdk [ia64], gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64],
gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386], libgcj-common (>=
1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386], ant (>= 1.7.0), ant-optional (>=
1.7.0), mingw-w64 (>= 1.0), libcommons-codec-java, libcommons-httpclient-java,
libcommons-lang-java, libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java,
libbase-java [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libsac-java [!armel
!hppa !kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!armel !hppa
!kfreebsd-amd64 !kfreebsd-i386], libflute-java (>= 1.1.6) [!armel !hppa
!kfreebsd-amd64 !kfreebsd-i386], libpentaho-reporting-flow-engine-java (>=
0.9.4) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>=
0.2.10) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libloader-java (>=
1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libformula-java (>= 1
.1.7) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], librepository-java (>=
1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6)
[!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libserializer-java (>= 1.1.6)
[!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java (>=
1.1.1-9), libservlet2.5-java, javahelper (>= 0.37~), xulrunner-dev, libnss3-dev
(>= 3.12.3), dmake (>= 1:4.11), libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>=
2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38),
libmdds-dev (>= 0.5.0), libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev
(>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libicu-dev (>= 4.0),
libxslt1-dev, libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5),
libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libebook1.2-dev
[!armel !armhf], libpq-dev (>= 9.0~), libxrandr-dev, liblucene2-java (>=
2.3.2), libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev
(>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1), libsuitesparse-dev (>=
1:3.4.0), libdbus-glib-1-dev (>= 0.60), libgstreamer-plugins-base0.10-dev,
libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libgtk2.0-dev (>= 2.10),
libgnomevfs2-dev, libgconf2-dev, liborbit2-dev, libldap2-dev
Build-Depends-Indep: fdupes, xml-core, imagemagick, fontforge,
translate-toolkit (>= 1.9)
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (=
1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386
amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev,
nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (=
1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4),
libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1)
[amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<<
1.3.9~), qt3-dev-tools, ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64],
ant (= 1.8.0-2) [hppa kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-3) [hppa
kfreebsd-i386 kfreebsd-amd64], g++-4.6 (= 4.6.1-10), g++-4.6 (= 4.6.1-11),
base-files (= 6.0), base-files (= 6.0squeeze1), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.9.1
diff --git a/rules b/rules
index a21e107..9be42dc 100755
--- a/rules
+++ b/rules
@@ -823,10 +823,10 @@ export JAVA_HOME
CONFIGURE_FLAGS +=
--with-commons-codec-jar=/usr/share/java/commons-codec.jar
--with-commons-lang-jar=/usr/share/java/commons-lang.jar
--with-commons-httpclient-jar=/usr/share/java/commons-httpclient.jar
--with-commons-logging-jar=/usr/share/java/commons-logging.jar
CONFIGURE_FLAGS += --with-system-servlet-api
ifeq "$(SQUEEZE_BACKPORT)" "y"
- BUILD_DEPS += , $(shell dpkg -s libcommons-logging-java | grep Suggests
| cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }')
+ BUILD_DEPS += (<< 1.1.1-9), $(shell dpkg -s libcommons-logging-java |
grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }')
CONFIGURE_FLAGS += --with-servlet-api-jar=$(shell dpkg -L `dpkg -s
libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk
'{ print $$2 }'` | grep servlet-api.*\.jar$ | head -n 1)
else
- BUILD_DEPS += , $(shell dpkg -s libcommons-logging-java | grep Suggests
| cut -d"," -f5 | sed -e s/^\ // | awk '{ print $$1 }') (>= 1.1.1-9)
+ BUILD_DEPS += (>= 1.1.1-9), $(shell dpkg -s libcommons-logging-java |
grep Suggests | cut -d"," -f5 | sed -e s/^\ // | awk '{ print $$1 }')
CONFIGURE_FLAGS += --with-servlet-api-jar=$(shell dpkg -L `dpkg -s
libcommons-logging-java | grep Suggests | cut -d"," -f5 | sed -e s/^\ // | awk
'{ print $$1 }'` | grep servlet-api.*\.jar$ | head -n 1)
endif
endif
@@ -844,10 +844,10 @@ export JAVA_HOME
REPORT_BUILDER_JAR_DEPENDS += , libcommons-logging-java
CONFIGURE_FLAGS +=
--with-commons-logging-jar=/usr/share/java/commons-logging.jar
ifeq "$(SQUEEZE_BACKPORT)" "y"
- BUILD_DEPS += , $(shell dpkg -s libcommons-logging-java | grep Suggests
| cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }')
+ BUILD_DEPS += (<< 1.1.1-9), $(shell dpkg -s libcommons-logging-java |
grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }')
CONFIGURE_FLAGS += --with-servlet-api-jar=$(shell dpkg -L `dpkg -s
libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk
'{ print $$2 }'` | grep servlet-api.*\.jar$ | head -n 1)
else
- BUILD_DEPS += , $(shell dpkg -s libcommons-logging-java | grep Suggests
| cut -d"," -f5 | sed -e s/^\ // | awk '{ print $$1 }') (>= 1.1.1-9)
+ BUILD_DEPS += (>= 1.1.1-9), $(shell dpkg -s libcommons-logging-java |
grep Suggests | cut -d"," -f5 | sed -e s/^\ // | awk '{ print $$1 }')
CONFIGURE_FLAGS += --with-servlet-api-jar=$(shell dpkg -L `dpkg -s
libcommons-logging-java | grep Suggests | cut -d"," -f5 | sed -e s/^\ // | awk
'{ print $$1 }'` | grep servlet-api.*\.jar$ | head -n 1)
endif
endif
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1s11co-0002zc...@vasks.debian.org
