------------------------------------------------------------
revno: 1414
committer: Rene Engelhard <r...@debian.org>
branch nick: experimental
timestamp: Wed 2009-02-25 15:25:11 +0100
message:
tighten hsqldb depends to 1.8.0.10 with the lock fix
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2009-02-24 23:09:29 +0000
+++ b/changelog 2009-02-25 14:25:11 +0000
@@ -35,6 +35,7 @@
configure fixed
- remove -unbundled conflict when VER = "" because upstreams packages
now are called openoffice.orgX-*.
+ - tighten hsqldb depends to 1.8.0.10 with the lock fix
* debian/rules, debian/startcenter.desktop: remove own startcenter.desktop;
OOo now has one upstream
* debian/control.ure.in: suggest java5-runtime instead of java2-runtime as
=== modified file 'control'
--- a/control 2009-02-24 23:09:29 +0000
+++ b/control 2009-02-25 14:25:11 +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-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, 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, 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 , libdb-dev , python-central (>= 0.5) ,
python-dev (>= 2.4) , debhelper (>= 6.0.7~) , openjdk-6-jdk [i386 powerpc sparc
mips mipsel s390 armel amd64 ppc64] , gij [i386 sparc mips mipsel s390 armel
amd64 ia64], java-gcj-compat-dev (>= 1.0.76-7) [i386 sparc mips mipsel s390
armel amd64 ia64], libgcj-bc [i386 sparc mips mipsel s390 armel amd64 ia64] ,
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] , 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) , mono-devel (>=
2.0.1) [i386 sparc amd64 ia64], libmono-dev (>= 2.0.1) [i386 sparc amd64 ia64],
mono-utils (>= 2.0.1) [i386 sparc amd64 ia64], cli-common-dev (>= 0.5.7) [i386
sparc amd64 ia64] , mono-jit (>= 1.9.1+dfsg-2) [amd64] , libhunspell-dev (>=
1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] ,
libboost1.37-dev (>= 1.37.0-4) , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) ,
libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev ,
kdelibs4-dev (>= 4:3.4.3-2) , 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.13-4), lp-solve (>= 5.5.0.13-4) , libsuitesparse-dev
(>= 1:3.2.0-2) , libdbus-glib-1-dev (>= 0.60) ,
libgstreamer-plugins-base0.10-dev , libneon27-dev , librdf0-dev , libgtk2.0-dev
(>= 2.10) , libgnomevfs2-dev
+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, 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, 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 , libdb-dev , python-central (>= 0.5) ,
python-dev (>= 2.4) , debhelper (>= 6.0.7~) , openjdk-6-jdk [i386 powerpc sparc
mips mipsel s390 armel amd64 ppc64] , gij [i386 sparc mips mipsel s390 armel
amd64 ia64], java-gcj-compat-dev (>= 1.0.76-7) [i386 sparc mips mipsel s390
armel amd64 ia64], libgcj-bc [i386 sparc mips mipsel s390 armel amd64 ia64] ,
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] , 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) , mono-devel (>=
2.0.1) [i386 sparc amd64 ia64], libmono-dev (>= 2.0.1) [i386 sparc amd64 ia64],
mono-utils (>= 2.0.1) [i386 sparc amd64 ia64], cli-common-dev (>= 0.5.7) [i386
sparc amd64 ia64] , mono-jit (>= 1.9.1+dfsg-2) [amd64] , libhunspell-dev (>=
1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] ,
libboost1.37-dev (>= 1.37.0-4) , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) ,
libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev ,
kdelibs4-dev (>= 4:3.4.3-2) , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386
powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libhsqldb-java (>>
1.8.0.10-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.13-4), lp-solve (>= 5.5.0.13-4) , libsuitesparse-dev
(>= 1:3.2.0-2) , libdbus-glib-1-dev (>= 0.60) ,
libgstreamer-plugins-base0.10-dev , libneon27-dev , librdf0-dev , libgtk2.0-dev
(>= 2.10) , libgnomevfs2-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),
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 2009-02-24 23:09:29 +0000
+++ b/rules 2009-02-25 14:25:11 +0000
@@ -158,6 +158,7 @@
BUILD_DBG_PACKAGE=y
USE_SYSTEM_BSH=y
USE_SYSTEM_HSQLDB=y
+HSQLDB_MINVER= (>> 1.8.0.10-1)
USE_SYSTEM_LUCENE=y
KDELIBS_MINVER= (>= 4:3.4.3-2)
USE_SYSTEM_LPSOLVE=y
@@ -877,8 +878,8 @@
CONFIGURE_FLAGS += --with-system-lucene
--with-lucene-core-jar=/usr/share/java/lucene-core.jar
--with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar
endif
ifeq "$(USE_SYSTEM_HSQLDB)" "y"
- BUILD_DEPS += , libhsqldb-java (>= 1.8.0.9-1) [$(OOO_JAVA_ARCHS)]
- BASE_HSQLDB_DEPENDS = libhsqldb-java (>= 1.8.0.9-1)
+ BUILD_DEPS += , libhsqldb-java $(HSQLDB_MINVER) [$(OOO_JAVA_ARCHS)]
+ BASE_HSQLDB_DEPENDS = libhsqldb-java $(HSQLDB_MINVER)
CONFIGURE_FLAGS+= --with-system-hsqldb
JAVA_GCJ_DEPENDS += , libhsqldb-java-gcj
endif
