------------------------------------------------------------
revno: 1833
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Sun 2010-02-28 19:49:19 +0100
message:
debian/rules: build-depend on ant1.7 on gij-using archs (see #571532
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2010-02-28 16:45:02 +0000
+++ b/changelog 2010-02-28 18:49:19 +0000
@@ -1,8 +1,9 @@
openoffice.org (1:3.2.0-3) UNRELEASED; urgency=low
* debian/control.in: update Vcs-Bzr:
+ * debian/rules: build-depend on ant1.7 on gij-using archs (see #571532)
- -- Rene Engelhard <r...@debian.org> Sun, 28 Feb 2010 17:41:15 +0100
+ -- Rene Engelhard <r...@debian.org> Sun, 28 Feb 2010 18:18:58 +0100
openoffice.org (1:3.2.0-2) unstable; urgency=low
=== modified file 'control'
--- a/control 2010-02-28 16:45:02 +0000
+++ b/control 2010-02-28 18:49:19 +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] , 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] , libcurl4-openssl-dev
, libs
sl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>=
7.2.3~) , openjdk-6-jdk [i386 powerpc s390 amd64 ppc64 s390x sparc] , gcj-jdk
[i386 mips mipsel s390 amd64 ia64 s390x sparc hppa], libgcj-common (>= 1:4.4.1)
[i386 mips mipsel s390 amd64 ia64 s390x sparc hppa] , ant (>= 1.7.0) [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa], ant-optional (>=
1.7.0) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa] ,
gcc-mingw32 [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa],
mingw32-runtime [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc
hppa] , libcommons-codec-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc hppa], libcommons-httpclient-java [i386 powerpc mips mipsel s390
amd64 ia64 ppc64 s390x sparc hppa], libcommons-lang-java [i386 powerpc mips
mipsel s390 amd64 ia64 ppc64 s390x sparc hppa], libcommons-logging-java [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa] , lib
base-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x
sparc hppa], libsac-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x
sparc hppa], libxml-java-openoffice.org [i386 powerpc mips mipsel s390 amd64
ia64 ppc64 s390x sparc hppa], libflute-java-openoffice.org [i386 powerpc mips
mipsel s390 amd64 ia64 ppc64 s390x sparc hppa],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel
s390 amd64 ia64 ppc64 s390x sparc hppa], liblayout-java-openoffice.org [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa],
libloader-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc hppa], libformula-java-openoffice.org [i386 powerpc mips mipsel
s390 amd64 ia64 ppc64 s390x sparc hppa], librepository-java-openoffice.org
[i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa],
libfonts-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc hppa], libserializer-java-
openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc
hppa] , libcommons-logging-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc hppa] , xulrunner-dev [i386 powerpc mips mipsel s390 amd64 ia64
ppc64 s390x sparc hppa], libnss3-dev (>= 3.12.3) [i386 powerpc mips mipsel s390
amd64 ia64 ppc64 s390x sparc 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 , libebook1.2-dev , libxrandr-dev ,
liblucene2-java (>= 2.3.2) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc hppa]
, libhsqldb-java (>> 1.8.0.10) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc hppa] , bsh (>= 2.0b4) [i386 powerpc mips mipsel s390 amd64 ia64
ppc64 s390x sparc hppa] , 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] , 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] , libcurl4-openssl-dev
, libs
sl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>=
7.2.3~) , openjdk-6-jdk [i386 powerpc s390 amd64 ppc64 s390x sparc] , gcj-jdk
[i386 mips mipsel s390 amd64 ia64 s390x sparc hppa], libgcj-common (>= 1:4.4.1)
[i386 mips mipsel s390 amd64 ia64 s390x sparc hppa] , ant (>= 1.7.0) [i386
powerpc s390 amd64 ppc64 s390x sparc], ant-optional (>= 1.7.0) [i386 powerpc
s390 amd64 ppc64 s390x sparc], ant1.7 [ia64 mips mipsel kfreebsd-i386
kfreebsd-amd64 hppa], ant1.7-optional [ia64 mips mipsel kfreebsd-i386
kfreebsd-amd64 hppa] , gcc-mingw32 [i386 powerpc mips mipsel s390 amd64 ia64
ppc64 s390x sparc hppa], mingw32-runtime [i386 powerpc mips mipsel s390 amd64
ia64 ppc64 s390x sparc hppa] , libcommons-codec-java [i386 powerpc mips mipsel
s390 amd64 ia64 ppc64 s390x sparc hppa], libcommons-httpclient-java [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa],
libcommons-lang-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x
sparc hppa], libcommo
ns-logging-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc
hppa] , libbase-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64
ppc64 s390x sparc hppa], libsac-java [i386 powerpc mips mipsel s390 amd64 ia64
ppc64 s390x sparc hppa], libxml-java-openoffice.org [i386 powerpc mips mipsel
s390 amd64 ia64 ppc64 s390x sparc hppa], libflute-java-openoffice.org [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel
s390 amd64 ia64 ppc64 s390x sparc hppa], liblayout-java-openoffice.org [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa],
libloader-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc hppa], libformula-java-openoffice.org [i386 powerpc mips mipsel
s390 amd64 ia64 ppc64 s390x sparc hppa], librepository-java-openoffice.org
[i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa],
libfonts-java-openoffice.org
[i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa],
libserializer-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64
ppc64 s390x sparc hppa] , libcommons-logging-java [i386 powerpc mips mipsel
s390 amd64 ia64 ppc64 s390x sparc hppa] , xulrunner-dev [i386 powerpc mips
mipsel s390 amd64 ia64 ppc64 s390x sparc hppa], libnss3-dev (>= 3.12.3) [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc 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 , libebook1.2-dev , libxrandr-dev ,
libluc
ene2-java (>= 2.3.2) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x
sparc hppa] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc mips mipsel s390 amd64
ia64 ppc64 s390x sparc hppa] , bsh (>= 2.0b4) [i386 powerpc mips mipsel s390
amd64 ia64 ppc64 s390x sparc hppa] , 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~), base-files (= 5)
Standards-Version: 3.8.3
XS-Python-Version: current
=== modified file 'rules'
--- a/rules 2010-02-24 18:12:58 +0000
+++ b/rules 2010-02-28 18:49:19 +0000
@@ -442,6 +442,7 @@
OOO_GCJ_ARCHS := $(filter-out ppc64,$(filter-out powerpc,$(OOO_JAVA_ARCHS)))
OOO_GCJ_JDK_ARCHS := ia64 mips mipsel kfreebsd-i386 kfreebsd-amd64 hppa
+OOO_OPENJDK_ARCHS := $(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))
ifeq (,$(findstring $(ARCH),$(OOO_JAVA_ARCHS)))
ENABLE_JAVA=n
@@ -739,9 +740,9 @@
endif
endif
ifeq "$(ENABLE_MEDIAWIKI)" "y"
- BUILD_DEPS += , ant (>= 1.7.0) [$(OOO_JAVA_ARCHS)], ant-optional (>=
1.7.0) [$(OOO_JAVA_ARCHS)]
+ BUILD_DEPS += , ant (>= 1.7.0) [$(OOO_OPENJDK_ARCHS)], ant-optional (>=
1.7.0) [$(OOO_OPENJDK_ARCHS)], ant1.7 [$(OOO_GCJ_JDK_ARCHS)], ant1.7-optional
[$(OOO_GCJ_JDK_ARCHS)]
else
- BUILD_DEPS += , ant (>= 1.6.5) [$(OOO_JAVA_ARCHS)]
+ BUILD_DEPS += , ant (>= 1.6.5) [$(OOO_OPENJDK_ARCHS)], ant
[$(OOO_GCJ_JDK_ARCHS)]
endif
GCJ_VERSION = $(shell basename `readlink $(JAVA_HOME)/bin/gcj` | sed -e
s/gcj-//)
GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/`readlink
/usr/lib/libgcj_bc.so.1` | cut -d: -f1 | sed -e s/$$/-awt/)
