------------------------------------------------------------
revno: 1856
committer: Rene Engelhard <[email protected]>
branch nick: unstable
timestamp: Tue 2010-03-16 01:05:57 +0100
message:
remove ant1.7 workaround, add build-conflicts against ant 1.8.0-{1,2,3}
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2010-03-15 01:30:29 +0000
+++ b/changelog 2010-03-16 00:05:57 +0000
@@ -11,15 +11,16 @@
workaround for mysqlc as for graphite
* debian/patches/branch_directly_to_cpp_vtable_call_on_arm.diff: add
ARM bridges fix from issue 105359
- * debian/rulesi:
+ * debian/rules:
- re-enable system-mysqlcppconn (also in the STLport case); handle
MYSQLC_STATUS suffix in version.mk
- - re-enable armel
+ - re-enable armel
- fix build with 1.0 source format. Add missing uuencode for the extra
"3.0 (quilt)" components. Use "normal" quilt for patching, add build-dep
- disable system-boost on lenny
+ - remove ant1.7 workaround, add build-conflicts against ant 1.8.0-{1,2,3}
- -- Rene Engelhard <[email protected]> Mon, 15 Mar 2010 02:16:01 +0100
+ -- Rene Engelhard <[email protected]> Tue, 16 Mar 2010 00:59:52 +0100
openoffice.org (1:3.2.0-4) unstable; urgency=low
=== modified file 'control'
--- a/control 2010-03-13 14:36:00 +0000
+++ b/control 2010-03-16 00:05:57 +0000
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian OpenOffice Team <[email protected]>
Uploaders: Chris Halls <[email protected]>, Rene Engelhard <[email protected]>
-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 s390 amd64
ppc64 s390x sparc armel], ant-optional (>= 1.7.0) [i386 powerpc s390 amd64
ppc64 s390x sparc armel], 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
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], libco
mmons-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 s39
0x 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 armel], libnss3-dev (>= 3.12.3) [i386 powerpc mips mipsel s390 amd64 ia64
ppc64 s390x sparc armel hppa armel] , 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~), base-files (= 5)
+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 armel],
libnss3-dev (>= 3.12.3) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x
sparc armel hppa armel] , 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
Vcs-Bzr:
nosmart+http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.2/unstable
=== modified file 'control.in'
--- a/control.in 2010-03-05 15:41:09 +0000
+++ b/control.in 2010-03-16 00:05:57 +0000
@@ -48,7 +48,7 @@
libpq-dev,
po-debconf,
%BUILD_DEPS%
-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~)
+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) [%OOO_GCJ_JDK_ARCHS%], ant (= 1.8.0-2)
[%OOO_GCJ_JDK_ARCHS%], ant (= 1.8.0-3) [%OOO_GCJ_JDK_ARCHS%]
Standards-Version: 3.8.3
XS-Python-Version: @PYTHON_VERSION@
Vcs-Bzr:
nosmart+http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.2/unstable
=== modified file 'rules'
--- a/rules 2010-03-15 01:30:29 +0000
+++ b/rules 2010-03-16 00:05:57 +0000
@@ -764,9 +764,9 @@
endif
endif
ifeq "$(ENABLE_MEDIAWIKI)" "y"
- 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)]
+ BUILD_DEPS += , ant (>= 1.7.0) [$(OOO_JAVA_ARCHS)], ant-optional (>=
1.7.0) [$(OOO_JAVA_ARCHS)]
else
- BUILD_DEPS += , ant (>= 1.6.5) [$(OOO_OPENJDK_ARCHS)], ant1.7
[$(OOO_GCJ_JDK_ARCHS)]
+ BUILD_DEPS += , ant (>= 1.6.5) [$(OOO_JAVA_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/)
@@ -1679,6 +1679,7 @@
perl -pi -e "s,%OOO_NPSOPLUGIN_ARCHS%,$(OOO_NPSOPLUGIN_ARCHS),g"
debian/control
perl -pi -e "s,%OOO_OGLTRANS_ARCHS%,$(OOO_OGLTRANS_ARCHS),g"
debian/control
perl -pi -e "s,%OOO_BINFILTER_ARCHS%,$(OOO_BINFILTER_ARCHS),g"
debian/control
+ perl -pi -e "s,%OOO_GCJ_JDK_ARCHS%,$(OOO_GCJ_JDK_ARCHS),g"
debian/control
ifeq (he,$(findstring he,$(LANGPACKISOS)))
perl -pi -e 's/openoffice.org-help-he$$/openoffice.org-help-he,
openoffice.org-ctl-he/' debian/control
