------------------------------------------------------------
revno: 1239
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2008-08-25 02:52:01 +0200
message:
add gij builddep
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2008-08-24 14:28:38 +0000
+++ b/changelog 2008-08-25 00:52:01 +0000
@@ -4,10 +4,13 @@
- update lucene2 version; enable system-lucene now that it's in main
- add conditonal for cacao-oj6-jdk (which doesn't work, though,
testtool fails with the same error as seen in #495694)
+ - gcj-dbtool (which we use since we build with OpenJDK) is in gij, not
+ gij-X.Y and only the latter is pulled in by java-gcj-compat-dev. Add
+ builddep
* debian/control.ure.in:
- Section: libdevel for uno-libs3-dbg to fix override disparity
- -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 24 Aug 2008 16:28:08 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 25 Aug 2008 02:50:34 +0200
openoffice.org (1:3.0.0~ooo300m3-2) experimental; urgency=low
=== modified file 'control'
--- a/control 2008-08-24 14:28:38 +0000
+++ b/control 2008-08-25 00:52:01 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), 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-1)
[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, libjpeg62-dev, libxml2-dev,
libldap2-dev, libexpat1-dev, libgnomevfs2-dev, fastjar, xsltproc,
graphicsmagick-imagemagick-compat, netpbm, fdupes, xml-core, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, libpq-dev, bc , g++ (>> 4.3.0) [s390], gcc (>>
4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libpoppler-dev (>= 0.8.0) ,
libcurl4-openssl-dev , libssl-dev , libdb4.6-dev , python-central (>= 0.5) ,
python-dev (>= 2.4) , debhelper (>= 6.0.7~) , openjdk-6-jdk [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64] , java-gcj-compat-dev (>= 1.0.76-7)
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libgcj-bc [i386
powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , ant (>= 1.7.0) [i386
powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], ant-optional (>= 1.7.0)
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libsaxonb-java
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , mingw32 [i386
powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-codec-java
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 armel amd64
ia64 ppc64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390 armel
amd64 ia64 ppc64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64], libsac-java [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64], libxml-java [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64], libflute-1.3-jfree-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64],
libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], liblayout-java [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], libloader-java [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], libformula-java [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], librepository-java [i386 powerpc sparc mips mipsel
s390 armel amd64 ia64 ppc64], libfonts-java (>= 0.2.6) [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64], libjcommon-serializer-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64] , iceape-dev (>= 1.1.9-5) [i386
powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libnss3-dev [i386
powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , dmake (>= 1:4.11) ,
libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>=
4.6.2-3) [i386] , libboost-dev , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) ,
libwps-dev , libwpg-dev , libicu-dev , libxslt1-dev , libcairo2-dev ,
kdelibs5-dev (>= 4:3.4.3-2) , kdepimlibs5-dev , libxrandr-dev , liblucene2-java
(>= 2.3.2) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] ,
libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel s390 armel amd64
ia64 ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel s390 armel amd64
ia64 ppc64] , liblpsolve55-dev (>= 5.5.0.10-10), lp-solve (>= 5.5.0.10-10) ,
libsuitesparse-dev (>> 3.1.0) , libdbus-glib-1-dev (>= 0.60) ,
libgstreamer-plugins-base0.10-dev , libneon27-dev , librdf0-dev , libgtk2.0-dev
(>= 2.10)
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), 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-1)
[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, libjpeg62-dev, libxml2-dev,
libldap2-dev, libexpat1-dev, libgnomevfs2-dev, fastjar, xsltproc,
graphicsmagick-imagemagick-compat, netpbm, fdupes, xml-core, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, libpq-dev, bc , g++ (>> 4.3.0) [s390], gcc (>>
4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libpoppler-dev (>= 0.8.0) ,
libcurl4-openssl-dev , libssl-dev , libdb4.6-dev , python-central (>= 0.5) ,
python-dev (>= 2.4) , debhelper (>= 6.0.7~) , openjdk-6-jdk [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64] , gij [i386 powerpc sparc mips mipsel
s390 armel amd64 ia64 ppc64], java-gcj-compat-dev (>= 1.0.76-7) [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libgcj-bc [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64] , ant (>= 1.7.0) [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64], ant-optional (>= 1.7.0) [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64] , libsaxonb-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64] , mingw32 [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-codec-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-httpclient-java
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libcommons-lang-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64
ppc64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel
amd64 ia64 ppc64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel
s390 armel amd64 ia64 ppc64], libsac-java [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], libxml-java [i386 powerpc sparc mips mipsel s390 armel
amd64 ia64 ppc64], libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], libpentaho-reporting-flow-engine-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], liblayout-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libloader-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libformula-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], librepository-java [i386
powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libfonts-java (>=
0.2.6) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libjcommon-serializer-java [i386 powerpc sparc mips mipsel s390 armel amd64
ia64 ppc64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], libnss3-dev [i386 powerpc sparc mips mipsel s390 armel
amd64 ia64 ppc64] , dmake (>= 1:4.11) , libhunspell-dev (>= 1.1.5-2) ,
libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev ,
libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev ,
libicu-dev , libxslt1-dev , libcairo2-dev , kdelibs5-dev (>= 4:3.4.3-2) ,
kdepimlibs5-dev , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64] , libhsqldb-java (>= 1.8.0.9-1)
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , bsh (>= 2.0b4-1)
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , liblpsolve55-dev
(>= 5.5.0.10-10), lp-solve (>= 5.5.0.10-10) , libsuitesparse-dev (>> 3.1.0) ,
libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev ,
libneon27-dev , librdf0-dev , libgtk2.0-dev (>= 2.10)
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),
gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64]
Standards-Version: 3.8.0
XS-Python-Version: current
=== modified file 'rules'
--- a/rules 2008-08-24 14:28:38 +0000
+++ b/rules 2008-08-25 00:52:01 +0000
@@ -564,12 +564,12 @@
ifeq "$(BUILD_JARS_NATIVE)" "y"
CONFIGURE_FLAGS += --enable-gcjaot
ifneq "$(ETCH_BACKPORT)" "y"
- BUILD_DEPS += , java-gcj-compat-dev (>= 1.0.76-7) [$(OOO_JAVA_ARCHS)],
libgcj-bc [$(OOO_JAVA_ARCHS)]
+ BUILD_DEPS += , gij [$(OOO_JAVA_ARCHS)], 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 [$(OOO_JAVA_ARCHS)]
+ BUILD_DEPS += , gij [$(OOO_JAVA_ARCHS)], 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 [$(OOO_JAVA_ARCHS)]
+ BUILD_DEPS += , gij [$(OOO_JAVA_ARCHS)], java-gcj-compat-dev (>=
1.0.56) [$(OOO_JAVA_ARCHS)], libgcj-bc [$(OOO_JAVA_ARCHS)]
endif
ifeq "$(ENABLE_MEDIAWIKI)" "y"
BUILD_DEPS += , ant (>= 1.7.0) [$(OOO_JAVA_ARCHS)], ant-optional (>=
1.7.0) [$(OOO_JAVA_ARCHS)]
