------------------------------------------------------------
revno: 1000
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2008-02-04 13:09:25 +0100
message:
merge from 2.4 branch
modified:
control
rules
=== modified file 'control'
--- a/control 2008-01-28 18:56:34 +0000
+++ b/control 2008-02-04 12:09:25 +0000
@@ -3,7 +3,7 @@
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-1) [i386 powerpc sparc
amd64 ppc64], flex [i386 powerpc sparc amd64 ppc64], libpam0g-dev [i386 powerpc
sparc amd64 ppc64], libxaw7-dev [i386 powerpc sparc amd64 ppc64], unzip [i386
powerpc sparc amd64 ppc64], zip [i386 powerpc sparc amd64 ppc64], autoconf
[i386 powerpc sparc amd64 ppc64], sharutils [i386 powerpc sparc amd64 ppc64],
pkg-config [i386 powerpc sparc amd64 ppc64], xutils [i386 powerpc sparc amd64
ppc64], libfontconfig1-dev [i386 powerpc sparc amd64 ppc64], binutils (>=
2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc
sparc amd64 ppc64], libfreetype6-dev [i386 powerpc sparc amd64 ppc64],
libx11-dev [i386 powerpc sparc amd64 ppc64], libsm-dev [i386 powerpc sparc
amd64 ppc64], libxt-dev [i386 powerpc sparc amd64 ppc64], libxext-dev [i386
powerpc sparc amd64 ppc64], libice-dev [i386 powerpc sparc amd64 ppc64],
libsane-dev [i386 powerpc sparc amd64 ppc64], libxrender-dev [i386 powerpc
sparc amd64 ppc64], libcupsys2-dev [i386 powerpc sparc amd64 ppc64],
libarchive-zip-perl [i386 powerpc sparc amd64 ppc64],
libstartup-notification0-dev [i386 powerpc sparc amd64 ppc64], libpng12-dev
[i386 powerpc sparc amd64 ppc64], libjpeg62-dev [i386 powerpc sparc amd64
ppc64], libxml2-dev [i386 powerpc sparc amd64 ppc64], libldap2-dev [i386
powerpc sparc amd64 ppc64], libexpat1-dev [i386 powerpc sparc amd64 ppc64],
libgnomevfs2-dev [i386 powerpc sparc amd64 ppc64], fastjar [i386 powerpc sparc
amd64 ppc64], libsndfile1-dev [i386 powerpc sparc amd64 ppc64], xsltproc [i386
powerpc sparc amd64 ppc64], graphicsmagick [i386 powerpc sparc amd64 ppc64],
netpbm [i386 powerpc sparc amd64 ppc64], fdupes [i386 powerpc sparc amd64
ppc64], xml-core [i386 powerpc sparc amd64 ppc64], libxkbfile-dev [i386 powerpc
sparc amd64 ppc64], libxinerama-dev [i386 powerpc sparc amd64 ppc64],
x11proto-render-dev [i386 powerpc sparc amd64 ppc64], unixodbc-dev (>= 2.2.11)
[i386 powerpc sparc amd64 ppc64], libxml-parser-perl [i386 powerpc sparc amd64
ppc64], gperf [i386 powerpc sparc amd64 ppc64], libpq-dev [i386 powerpc sparc
amd64 ppc64] , dpkg-dev (>= 1.14.11) [i386 powerpc sparc amd64 ppc64] ,
libcurl4-gnutls-dev [i386 powerpc sparc amd64 ppc64] , libdb4.5-dev [i386
powerpc sparc amd64 ppc64] , python-central (>= 0.5) [i386 powerpc sparc amd64
ppc64], debhelper (>= 5.0.37.2) , python-dev (>= 2.4) [i386 powerpc sparc amd64
ppc64] , java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc amd64 ppc64],
libgcj-bc , ant (>= 1.6.5) [i386 powerpc sparc amd64 ppc64] , libxt-java (>=
0.20050823) [i386 powerpc sparc amd64 ppc64] , libxerces2-java [i386 powerpc
sparc amd64 ppc64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc amd64
ppc64] , mingw32 [i386 powerpc sparc amd64 ppc64] , libjcommon-java (>= 1.0.10)
[i386 powerpc sparc amd64 ppc64], libsac-java [i386 powerpc sparc amd64 ppc64],
libxml-java [i386 powerpc sparc amd64 ppc64], libflute-1.3-jfree-java [i386
powerpc sparc amd64 ppc64], libjfreereport-java (>= 0.9.0-05) [i386 powerpc
sparc amd64 ppc64], liblayout-java [i386 powerpc sparc amd64 ppc64],
libloader-java [i386 powerpc sparc amd64 ppc64], libformula-java [i386 powerpc
sparc amd64 ppc64], librepository-java [i386 powerpc sparc amd64 ppc64],
libfonts-java (>= 0.2.6) [i386 powerpc sparc amd64 ppc64],
libjcommon-serializer-java [i386 powerpc sparc amd64 ppc64] , libxul-dev [i386
powerpc sparc amd64 ppc64], libnss3-dev [i386 powerpc sparc amd64 ppc64] ,
dmake (>= 1:4.7) [i386 powerpc sparc amd64 ppc64] , mono-mcs (>= 1.2.3) [i386
sparc amd64], mono-gmcs (>= 1.2.3) [i386 sparc amd64], libmono-dev (>= 1.2.3)
[i386 sparc amd64], mono-utils (>= 1.2.3) [i386 sparc amd64], cli-common-dev
(>= 0.4.4) [i386 sparc amd64], mono-1.0-devel [i386 sparc amd64],
mono-2.0-devel [i386 sparc amd64] , libhunspell-dev (>= 1.1.5-2) [i386 powerpc
sparc amd64 ppc64] , libhyphen-dev (>= 2.3-3) [i386 powerpc sparc amd64 ppc64]
, libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev [i386 powerpc sparc
amd64 ppc64] , libvigraimpex-dev [i386 powerpc sparc amd64 ppc64] ,
portaudio19-dev [i386 powerpc sparc amd64 ppc64] , libwpd8-dev (>= 0.8.3-3)
[i386 powerpc sparc amd64 ppc64] , libwps-dev [i386 powerpc sparc amd64 ppc64]
, libwpg-dev [i386 powerpc sparc amd64 ppc64] , libicu-dev [i386 powerpc sparc
amd64 ppc64] , libxslt1-dev [i386 powerpc sparc amd64 ppc64] , libcairo2-dev
[i386 powerpc sparc amd64 ppc64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc
sparc amd64 ppc64] , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc amd64
ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc amd64 ppc64] , liblpsolve55-dev
(>= 5.5.0.10-4) [i386 powerpc sparc amd64 ppc64], lp-solve (>= 5.5.0.10-4)
[i386 powerpc sparc amd64 ppc64] , libsuitesparse-dev [i386 powerpc sparc amd64
ppc64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc amd64 ppc64] ,
libgstreamer-plugins-base0.10-dev [i386 powerpc sparc amd64 ppc64] ,
libneon27-gnutls-dev [i386 powerpc sparc amd64 ppc64] , libgtk2.0-dev (>= 2.10)
[i386 powerpc sparc amd64 ppc64]
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc
amd64 ppc64], flex [i386 powerpc sparc amd64 ppc64], libpam0g-dev [i386 powerpc
sparc amd64 ppc64], libxaw7-dev [i386 powerpc sparc amd64 ppc64], unzip [i386
powerpc sparc amd64 ppc64], zip [i386 powerpc sparc amd64 ppc64], autoconf
[i386 powerpc sparc amd64 ppc64], sharutils [i386 powerpc sparc amd64 ppc64],
pkg-config [i386 powerpc sparc amd64 ppc64], xutils [i386 powerpc sparc amd64
ppc64], libfontconfig1-dev [i386 powerpc sparc amd64 ppc64], binutils (>=
2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc
sparc amd64 ppc64], libfreetype6-dev [i386 powerpc sparc amd64 ppc64],
libx11-dev [i386 powerpc sparc amd64 ppc64], libsm-dev [i386 powerpc sparc
amd64 ppc64], libxt-dev [i386 powerpc sparc amd64 ppc64], libxext-dev [i386
powerpc sparc amd64 ppc64], libice-dev [i386 powerpc sparc amd64 ppc64],
libsane-dev [i386 powerpc sparc amd64 ppc64], libxrender-dev [i386 powerpc
sparc amd64 ppc64], libcupsys2-dev [i386 powerpc sparc amd64 ppc64],
libarchive-zip-perl [i386 powerpc sparc amd64 ppc64],
libstartup-notification0-dev [i386 powerpc sparc amd64 ppc64], libpng12-dev
[i386 powerpc sparc amd64 ppc64], libjpeg62-dev [i386 powerpc sparc amd64
ppc64], libxml2-dev [i386 powerpc sparc amd64 ppc64], libldap2-dev [i386
powerpc sparc amd64 ppc64], libexpat1-dev [i386 powerpc sparc amd64 ppc64],
libgnomevfs2-dev [i386 powerpc sparc amd64 ppc64], fastjar [i386 powerpc sparc
amd64 ppc64], libsndfile1-dev [i386 powerpc sparc amd64 ppc64], xsltproc [i386
powerpc sparc amd64 ppc64], graphicsmagick [i386 powerpc sparc amd64 ppc64],
netpbm [i386 powerpc sparc amd64 ppc64], fdupes [i386 powerpc sparc amd64
ppc64], xml-core [i386 powerpc sparc amd64 ppc64], libxkbfile-dev [i386 powerpc
sparc amd64 ppc64], libxinerama-dev [i386 powerpc sparc amd64 ppc64],
x11proto-render-dev [i386 powerpc sparc amd64 ppc64], unixodbc-dev (>= 2.2.11)
[i386 powerpc sparc amd64 ppc64], libxml-parser-perl [i386 powerpc sparc amd64
ppc64], gperf [i386 powerpc sparc amd64 ppc64], libpq-dev [i386 powerpc sparc
amd64 ppc64] , dpkg-dev (>= 1.14.11) [i386 powerpc sparc amd64 ppc64] ,
libcurl4-gnutls-dev [i386 powerpc sparc amd64 ppc64] , libdb4.5-dev [i386
powerpc sparc amd64 ppc64] , python-central (>= 0.5) [i386 powerpc sparc amd64
ppc64], debhelper (>= 5.0.37.2) , python-dev (>= 2.4) [i386 powerpc sparc amd64
ppc64] , java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc amd64 ppc64],
libgcj-bc [i386 powerpc sparc amd64 ppc64] , ant (>= 1.6.5) [i386 powerpc sparc
amd64 ppc64] , libxt-java (>= 0.20050823) [i386 powerpc sparc amd64 ppc64] ,
libxerces2-java [i386 powerpc sparc amd64 ppc64] , libxalan2-java (>= 2.6.0-1)
[i386 powerpc sparc amd64 ppc64] , mingw32 [i386 powerpc sparc amd64 ppc64] ,
libjcommon-java (>= 1.0.10) [i386 powerpc sparc amd64 ppc64], libsac-java [i386
powerpc sparc amd64 ppc64], libxml-java [i386 powerpc sparc amd64 ppc64],
libflute-1.3-jfree-java [i386 powerpc sparc amd64 ppc64], libjfreereport-java
(>= 0.9.0-05) [i386 powerpc sparc amd64 ppc64], liblayout-java [i386 powerpc
sparc amd64 ppc64], libloader-java [i386 powerpc sparc amd64 ppc64],
libformula-java [i386 powerpc sparc amd64 ppc64], librepository-java [i386
powerpc sparc amd64 ppc64], libfonts-java (>= 0.2.6) [i386 powerpc sparc amd64
ppc64], libjcommon-serializer-java [i386 powerpc sparc amd64 ppc64] ,
libxul-dev [i386 powerpc sparc amd64 ppc64], libnss3-dev [i386 powerpc sparc
amd64 ppc64] , dmake (>= 1:4.7) [i386 powerpc sparc amd64 ppc64] , mono-mcs (>=
1.2.3) [i386 sparc amd64], mono-gmcs (>= 1.2.3) [i386 sparc amd64], libmono-dev
(>= 1.2.3) [i386 sparc amd64], mono-utils (>= 1.2.3) [i386 sparc amd64],
cli-common-dev (>= 0.4.4) [i386 sparc amd64], mono-1.0-devel [i386 sparc
amd64], mono-2.0-devel [i386 sparc amd64] , libhunspell-dev (>= 1.1.5-2) [i386
powerpc sparc amd64 ppc64] , libhyphen-dev (>= 2.3-3) [i386 powerpc sparc amd64
ppc64] , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev [i386 powerpc
sparc amd64 ppc64] , libvigraimpex-dev [i386 powerpc sparc amd64 ppc64] ,
portaudio19-dev [i386 powerpc sparc amd64 ppc64] , libwpd8-dev (>= 0.8.3-3)
[i386 powerpc sparc amd64 ppc64] , libwps-dev [i386 powerpc sparc amd64 ppc64]
, libwpg-dev [i386 powerpc sparc amd64 ppc64] , libicu-dev [i386 powerpc sparc
amd64 ppc64] , libxslt1-dev [i386 powerpc sparc amd64 ppc64] , libcairo2-dev
[i386 powerpc sparc amd64 ppc64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc
sparc amd64 ppc64] , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc amd64
ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc amd64 ppc64] , liblpsolve55-dev
(>= 5.5.0.10-4) [i386 powerpc sparc amd64 ppc64], lp-solve (>= 5.5.0.10-4)
[i386 powerpc sparc amd64 ppc64] , libsuitesparse-dev [i386 powerpc sparc amd64
ppc64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc amd64 ppc64] ,
libgstreamer-plugins-base0.10-dev [i386 powerpc sparc amd64 ppc64] ,
libneon27-gnutls-dev [i386 powerpc sparc amd64 ppc64] , libgtk2.0-dev (>= 2.10)
[i386 powerpc sparc amd64 ppc64]
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, libicu36-dev (<=
3.6-7), libicu-dev (<= 3.8-1), 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),
gcj-4.2 (= 4.2.2-6)
Standards-Version: 3.7.2
XS-Python-Version: current
=== modified file 'rules'
--- a/rules 2008-01-28 18:55:44 +0000
+++ b/rules 2008-02-04 12:09:25 +0000
@@ -408,12 +408,12 @@
CONFIGURE_FLAGS += --enable-gcjaot
ifeq "$(BUILD_JARS_NATIVE)" "y"
ifeq "$(ETCH_BACKPORT)" "n"
- BUILD_DEPS += , java-gcj-compat-dev (>= 1.0.76-7) [$(OOO_JAVA_ARCHS)],
libgcj-bc
+ BUILD_DEPS += , java-gcj-compat-dev (>= 1.0.76-7) [$(OOO_JAVA_ARCHS)],
libgcj-bc [$(OOO_JAVA_ARCHS)]
else
- BUILD_DEPS += , java-gcj-compat-dev (>= 1.0.65-4) [$(OOO_JAVA_ARCHS)],
libgcj-bc
+ BUILD_DEPS += , java-gcj-compat-dev (>= 1.0.65-4) [$(OOO_JAVA_ARCHS)],
libgcj-bc [$(OOO_JAVA_ARCHS)]
endif
else
- BUILD_DEPS += , java-gcj-compat-dev (>= 1.0.56) [$(OOO_JAVA_ARCHS)],
libgcj-bc
+ BUILD_DEPS += , java-gcj-compat-dev (>= 1.0.56) [$(OOO_JAVA_ARCHS)],
libgcj-bc [$(OOO_JAVA_ARCHS)]
endif
BUILD_DEPS += , ant (>= 1.6.5) [$(OOO_JAVA_ARCHS)]
GCJ_VERSION = $(shell basename `readlink $(JAVA_HOME)/bin/gcj` | sed -e
s/gcj-//)
