------------------------------------------------------------
revno: 1650
committer: Rene Engelhard <[email protected]>
branch nick: experimental
timestamp: Tue 2009-08-25 23:46:32 +0200
message:
use boost 1.38.0 for now
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2009-08-25 09:21:28 +0000
+++ b/changelog 2009-08-25 21:46:32 +0000
@@ -4,7 +4,7 @@
* upload to unstable
* ooo-build:
- - update (42e686acfbdae0f5d9586c98120bb302682c6187)
+ - update (91552c96b381f4bcdf5b47cc80790ec028a10bc2)
- new-SQLLEN.diff: fix ODBC libs for "new" SQLLEN (closes: #539642)
- prevent-multiple-window-resize-calls-when-maximised.diff: add;
fixes window resize behavior when using Gtk plugin under KDE,
@@ -12,13 +12,14 @@
* debian/rules:
- use upstreams tarballs
+ - revert to build with boost 1.38 until #543576 is (re-)fixed in 1.39...
* debian/control.mysql.in, debian/rules,
debian/openoffice.org-mysql-connector.*: add support for "mysqlnative"
driver 1.0.0 alongside the already packages sdbc_postgresql one. Use
internal libmysqlcppconn on i386 for now... Don't enable it yet.
- -- Rene Engelhard <[email protected]> Mon, 17 Aug 2009 02:50:51 +0200
+ -- Rene Engelhard <[email protected]> Tue, 25 Aug 2009 23:41:25 +0200
openoffice.org (1:3.1.1~rc2-1) experimental; urgency=low
=== modified file 'control'
--- a/control 2009-08-25 09:21:28 +0000
+++ b/control 2009-08-25 21:46:32 +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, 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) , libgl1-mesa-dev [i386 powerpc
sparc s390 amd64 ia64 ppc64], libglu1-mesa-dev [i386 powerpc sparc s390 amd64
ia64 ppc64] , libpoppler-dev (>= 0.8.0) , libcurl4-gnutls-dev , libssl-dev ,
libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>= 6.0.7~) ,
openjdk-6-
jdk , gcj-jdk [i386 sparc mips mipsel s390 armel amd64 ia64], libgcj-common
(>= 1:4.4.0) [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] , 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] , libbase-java-openoffice.org [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libsac-java [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64], libxml-java-openoffice.org [i386
powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libflute-java-openof
fice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64], liblayout-java-openoffice.org [i386
powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libloader-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64
ia64 ppc64], libformula-java-openoffice.org [i386 powerpc sparc mips mipsel
s390 armel amd64 ia64 ppc64], librepository-java-openoffice.org [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libfonts-java-openoffice.org
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libserializer-java-openoffice.org [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 arm armel amd64 ia64 ppc64], libnss3-dev [i386 powerpc sparc mips
mipsel s390 arm 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] ,
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 (>= 4.0) , libxslt1-dev , libcairo2-dev ,
kdelibs5-dev , libqt4-dev (>= 4.5) , libebook1.2-dev , libxrandr-dev ,
liblucene2-java (>= 2.3.2) [i386 powerpc sparc mips mipsel s390 armel amd64
ia64 ppc64] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64] , bsh (>= 2.0b4) [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64] , 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-dev , librdf0-d
ev , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev , libgconf2-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], 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, 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) , libgl1-mesa-dev [i386 powerpc
sparc s390 amd64 ia64 ppc64], libglu1-mesa-dev [i386 powerpc sparc s390 amd64
ia64 ppc64] , libpoppler-dev (>= 0.8.0) , libcurl4-gnutls-dev , libssl-dev ,
libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>= 6.0.7~) ,
openjdk-6-
jdk , gcj-jdk [i386 sparc mips mipsel s390 armel amd64 ia64], libgcj-common
(>= 1:4.4.0) [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] , 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] , libbase-java-openoffice.org [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libsac-java [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64], libxml-java-openoffice.org [i386
powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libflute-java-openof
fice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64], liblayout-java-openoffice.org [i386
powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libloader-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64
ia64 ppc64], libformula-java-openoffice.org [i386 powerpc sparc mips mipsel
s390 armel amd64 ia64 ppc64], librepository-java-openoffice.org [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libfonts-java-openoffice.org
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libserializer-java-openoffice.org [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 arm armel amd64 ia64 ppc64], libnss3-dev [i386 powerpc sparc mips
mipsel s390 arm 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] ,
libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>=
4.6.2-3) [i386] , libboost1.38-dev , libvigraimpex-dev , libwpd8-dev (>=
0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev ,
libcairo2-dev , kdelibs5-dev , libqt4-dev (>= 4.5) , libebook1.2-dev ,
libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64] , bsh (>= 2.0b4) [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64] , 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-dev , librd
f0-dev , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev , libgconf2-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), base-files (= 5)
Standards-Version: 3.8.3
XS-Python-Version: current
Vcs-Bzr:
nosmart+http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.1/unstable
=== modified file 'control.in'
--- a/control.in 2009-08-16 23:11:42 +0000
+++ b/control.in 2009-08-25 21:46:32 +0000
@@ -49,7 +49,7 @@
libpq-dev,
bc
%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]
+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)
Standards-Version: 3.8.3
XS-Python-Version: @PYTHON_VERSION@
Vcs-Bzr:
nosmart+http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.1/unstable
=== modified file 'rules'
--- a/rules 2009-08-25 09:43:12 +0000
+++ b/rules 2009-08-25 21:46:32 +0000
@@ -129,10 +129,13 @@
USE_STLPORT=n
USE_SYSTEM_STLPORT=y
USE_SYSTEM_BOOST=y
-BOOST_VERSION=default
+BOOST_VERSION=1.38
ifeq "$(BOOST_VERSION)" "1.37"
BOOST_MINVER= (>= 1.37.0-4)
endif
+ifeq "$(BOOST_VERSION)" "1.39"
+ BOOST_MINVER= (>= 1.39.0-2)
+endif
USE_SYSTEM_VIGRA=y
USE_EXTERNAL_CXXLIBS=y
LIBWPD8_MINVER= (>= 0.8.3-3)
