------------------------------------------------------------
revno: 1402
committer: Rene Engelhard <r...@debian.org>
branch nick: experimental
timestamp: Tue 2009-02-17 01:07:35 +0100
message:
build against libdb-dev...
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2009-02-16 06:28:17 +0000
+++ b/changelog 2009-02-17 00:07:35 +0000
@@ -12,6 +12,8 @@
- specify ARCH_FLAGS as -O0 when DEB_BULD_OPTIONS contains noopt
(closes: #514166)
- only build-dep on mono 2.0.1 when MONO2=y
+ - build against default db (4.7) now (as librd0-dev depends on libdb-dev
+ which depends on libdb-dev...)
* debian/openoffice.org-{base,calc}.overrides.lintian: override
desktop-command-not-in-package here, too (like in all the other modules)
=== modified file 'control'
--- a/control 2009-02-05 23:21:46 +0000
+++ b/control 2009-02-17 00:07:35 +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 , 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 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] , 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) ,
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] , libboost-dev , libvigraimpex-dev ,
libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev , 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-3), lp-solve (>= 5.5.0.13-3) ,
libsuitesparse-dev (>> 1:3.2.0) , 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] , 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) ,
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] , libboost-dev , libvigraimpex-dev ,
libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev , 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-3), lp-solve (>= 5.5.0.13-3) ,
libsuitesparse-dev (>> 1:3.2.0) , 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], xulrunner-dev
Standards-Version: 3.8.0
XS-Python-Version: current
=== modified file 'rules'
--- a/rules 2009-02-16 06:28:17 +0000
+++ b/rules 2009-02-17 00:07:35 +0000
@@ -176,7 +176,6 @@
USE_LIBSUITESPARSE=y
USE_BZIP_COMPRESS=n
PRUNE_OOOBUILD=y
-DBVER=4.6
NEONSONR=27
PARALLEL_BUILD=n
MOZILLA=iceape
@@ -428,7 +427,7 @@
DBG_DBG_SUGGESTS += , libssl$(shell readlink /usr/lib/libssl.so | cut
-d"." -f3,4,5)-dbg
endif
- BUILD_DEPS += , libdb$(DBVER)-dev
+ BUILD_DEPS += , libdb-dev
ifneq "$(BUILD_DBG_PACKAGE)" "y"
# build with small symbols anyway
