------------------------------------------------------------
revno: 1864
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Wed 2010-03-17 23:36:12 +0100
message:
fix libservlet2.x-java package/jar name detection
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2010-03-17 18:12:29 +0000
+++ b/changelog 2010-03-17 22:36:12 +0000
@@ -21,9 +21,11 @@
- remove ant1.7 workaround, add build-conflicts against ant 1.8.0-{1,2,3}
- update get-ooo-build and get-orig-source tergets to create
.orig-ooo-build-X.Y.z.tar.gz, too and remove obsolete vcsupdate target
+ - fix libservlet2.x-java package/jar name detection, thanks calc for the
+ info
* debian/README.Debian-source: update for 3.2, mention new extra compnents
- -- Rene Engelhard <r...@debian.org> Wed, 17 Mar 2010 17:57:47 +0100
+ -- Rene Engelhard <r...@debian.org> Wed, 17 Mar 2010 23:19:05 +0100
openoffice.org (1:3.2.0-4) unstable; urgency=low
=== modified file 'control'
--- a/control 2010-03-17 18:43:49 +0000
+++ b/control 2010-03-17 22:36:12 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <ha...@debian.org>, Rene Engelhard <r...@debian.org>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | flex-old,
libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2)
[powerpc], 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, imagemagick, netpbm, fdupes, xml-core,
libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, libpq-dev, po-debconf, , g++ (>> 4.3.0) [s390], gcc
(>> 4.3.0) [s390] , g++-4.4 (>= 4.4.2-5) [armel] , dpkg-dev (>= 1.15.1) ,
libgl1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64 s390x sparc],
libglu1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64 s390x sparc] ,
libpoppler-dev (>= 0.8.0) , libgraphite-dev [i386 powerpc mips mipsel s390 m68k
amd64 ia64 ppc64 s390x sparc hppa
armel] , libcurl4-openssl-dev , libssl-dev , libdb-dev , python-central (>=
0.5) , python-dev , debhelper (>= 7.2.3~) , openjdk-6-jdk [i386 powerpc s390
amd64 ppc64 s390x sparc armel] , gcj-jdk [i386 mips mipsel s390 amd64 ia64
s390x sparc hppa armel], libgcj-common (>= 1:4.4.1) [i386 mips mipsel s390
amd64 ia64 s390x sparc hppa armel] , ant (>= 1.7.0) [i386 powerpc mips mipsel
s390 amd64 ia64 ppc64 s390x sparc hppa armel], ant-optional (>= 1.7.0) [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel] , gcc-mingw32
[i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel],
mingw32-runtime [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc
hppa armel] , libcommons-codec-java [i386 powerpc mips mipsel s390 amd64 ia64
ppc64 s390x sparc hppa armel], libcommons-httpclient-java [i386 powerpc mips
mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel], libcommons-lang-java
[i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel]
, libcommons-logging-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc hppa armel] , libbase-java-openoffice.org [i386 powerpc mips mipsel
s390 amd64 ia64 ppc64 s390x sparc hppa armel], libsac-java [i386 powerpc mips
mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel],
libxml-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc hppa armel], libflute-java-openoffice.org [i386 powerpc mips mipsel
s390 amd64 ia64 ppc64 s390x sparc hppa armel],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel
s390 amd64 ia64 ppc64 s390x sparc hppa armel], liblayout-java-openoffice.org
[i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel],
libloader-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc hppa armel], libformula-java-openoffice.org [i386 powerpc mips
mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel],
librepository-java-openoffice.org [i386 powerpc mips mipsel s390
amd64 ia64 ppc64 s390x sparc hppa armel], libfonts-java-openoffice.org [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel],
libserializer-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64
ppc64 s390x sparc hppa armel] , libcommons-logging-java [i386 powerpc mips
mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel] , xulrunner-dev [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc armel hppa], libnss3-dev
(>= 3.12.3) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc armel
hppa] , dmake (>= 1:4.11) , mono-devel (>= 2.4.2.3) [i386 amd64 ia64],
libmono-dev (>= 2.4.2.3) [i386 amd64 ia64], mono-utils (>= 2.4.2.3) [i386 amd64
ia64], cli-common-dev (>= 0.5.7) [i386 amd64 ia64] , libhunspell-dev (>=
1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] ,
libboost-dev (>= 1.38) , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) ,
libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev ,
kdelibs5-de
v (>= 4:4.3.4) , libqt4-dev (>= 4.5) , libmysqlclient-dev ,
libmysqlcppconn-dev (>= 1.1.0~r791) [powerpc mips mipsel s390 m68k amd64 ia64
ppc64 s390x sparc hppa armel] , libebook1.2-dev , libxrandr-dev ,
liblucene2-java (>= 2.3.2) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc hppa armel] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc mips
mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel] , bsh (>= 2.0b4) [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel] ,
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 , libgtk2.0-dev (>=
2.10) , libgnomevfs2-dev , libgconf2-dev , libldap2-dev
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | flex-old,
libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2)
[powerpc], 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, imagemagick, netpbm, fdupes, xml-core,
libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, libpq-dev, po-debconf, , g++ (>> 4.3.0) [s390], gcc
(>> 4.3.0) [s390] , g++-4.4 (>= 4.4.2-5) [armel] , dpkg-dev (>= 1.15.1) ,
libgl1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64 s390x sparc],
libglu1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64 s390x sparc] ,
libpoppler-dev (>= 0.8.0) , libgraphite-dev [i386 powerpc mips mipsel s390 m68k
amd64 ia64 ppc64 s390x sparc hppa
armel] , libcurl4-openssl-dev , libssl-dev , libdb-dev , python-central (>=
0.5) , python-dev , debhelper (>= 7.2.3~) , openjdk-6-jdk [i386 powerpc s390
amd64 ppc64 s390x sparc armel] , gcj-jdk [i386 mips mipsel s390 amd64 ia64
s390x sparc hppa armel], libgcj-common (>= 1:4.4.1) [i386 mips mipsel s390
amd64 ia64 s390x sparc hppa armel] , ant (>= 1.7.0) [i386 powerpc mips mipsel
s390 amd64 ia64 ppc64 s390x sparc hppa armel], ant-optional (>= 1.7.0) [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel] , gcc-mingw32
[i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel],
mingw32-runtime [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc
hppa armel] , libcommons-codec-java [i386 powerpc mips mipsel s390 amd64 ia64
ppc64 s390x sparc hppa armel], libcommons-httpclient-java [i386 powerpc mips
mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel], libcommons-lang-java
[i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel]
, libcommons-logging-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc hppa armel] , libservlet2.5-java , libbase-java-openoffice.org
[i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel],
libsac-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa
armel], libxml-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64
ppc64 s390x sparc hppa armel], libflute-java-openoffice.org [i386 powerpc mips
mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel
s390 amd64 ia64 ppc64 s390x sparc hppa armel], liblayout-java-openoffice.org
[i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel],
libloader-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc hppa armel], libformula-java-openoffice.org [i386 powerpc mips
mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel],
librepository-java-openoffice.org [i386 powe
rpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel],
libfonts-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc hppa armel], libserializer-java-openoffice.org [i386 powerpc mips
mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel] , libcommons-logging-java
[i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel] ,
libservlet2.5-java , xulrunner-dev [i386 powerpc mips mipsel s390 amd64 ia64
ppc64 s390x sparc armel hppa], libnss3-dev (>= 3.12.3) [i386 powerpc mips
mipsel s390 amd64 ia64 ppc64 s390x sparc armel hppa] , dmake (>= 1:4.11) ,
mono-devel (>= 2.4.2.3) [i386 amd64 ia64], libmono-dev (>= 2.4.2.3) [i386 amd64
ia64], mono-utils (>= 2.4.2.3) [i386 amd64 ia64], cli-common-dev (>= 0.5.7)
[i386 amd64 ia64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) ,
libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev (>= 1.38) ,
libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev ,
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) [powerpc mips mipsel
s390 m68k amd64 ia64 ppc64 s390x sparc hppa armel] , libebook1.2-dev ,
libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc mips mipsel s390 amd64
ia64 ppc64 s390x sparc hppa armel] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc
mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel] , bsh (>= 2.0b4)
[i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel] ,
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 , libgtk2.0-dev (>=
2.10) , libgnomevfs2-dev , libgconf2-dev , libldap2-dev
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~), ant (= 1.8.0-1) [ia64 mips mipsel kfreebsd-i386 kfreebsd-amd64 hppa],
ant (= 1.8.0-2) [ia64 mips mipsel kfreebsd-i386 kfreebsd-amd64 hppa], ant (=
1.8.0-3) [ia64 mips mipsel kfreebsd-i386 kfreebsd-amd64 hppa], base-files (= 5)
Standards-Version: 3.8.3
XS-Python-Version: current
=== modified file 'rules'
--- a/rules 2010-03-17 19:37:42 +0000
+++ b/rules 2010-03-17 22:36:12 +0000
@@ -811,7 +811,8 @@
MEDIAWIKI_JAR_DEPENDS := $(MEDIAWIKI_BUILD_DEPS)
BUILD_DEPS += $(MEDIAWIKI_BUILD_DEPS)
CONFIGURE_FLAGS += --with-system-apache-commons
--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
--with-servlet-api-jar=$(shell dpkg -L `apt-cache show libcommons-logging-java
| grep Depends | cut -d"," -f2 | sed -e s/^\ //` | grep \.jar$$)
+ CONFIGURE_FLAGS += --with-system-servlet-api
--with-servlet-api-jar=$(shell dpkg -L `apt-cache show libcommons-logging-java
| grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }'` | grep
servlet-api.*\.jar$ | head -n 1)
+ BUILD_DEPS += , $(shell apt-cache show libcommons-logging-java | grep
Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }')
endif
endif
ifeq "$(ENABLE_REPORTDESIGN)" "y"
@@ -826,7 +827,8 @@
REPORT_BUILDER_BUILD_DEPS += , libcommons-logging-java
[$(OOO_JAVA_ARCHS)]
REPORT_BUILDER_JAR_DEPENDS += , libcommons-logging-java
[$(OOO_JAVA_ARCHS)]
CONFIGURE_FLAGS +=
--with-commons-logging-jar=/usr/share/java/commons-logging.jar
- CONFIGURE_FLAGS += --with-system-servlet-api
--with-servlet-api-jar=$(shell dpkg -L `apt-cache show libcommons-logging-java
| grep Depends | cut -d"," -f2 | sed -e s/^\ //` | grep \.jar$$)
+ CONFIGURE_FLAGS += --with-system-servlet-api
--with-servlet-api-jar=$(shell dpkg -L `apt-cache show libcommons-logging-java
| grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }'` | grep
servlet-api.*\.jar$ | head -n 1)
+ BUILD_DEPS += , $(shell apt-cache show libcommons-logging-java | grep
Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }')
endif
CONFIGURE_FLAGS += --enable-report-builder
endif
