------------------------------------------------------------
revno: 1676
committer: Rene Engelhard <[email protected]>
branch nick: unstable
timestamp: Wed 2009-09-23 19:24:29 +0200
message:
update ooo-build; ENABLE_MYSQLNATIVE=y
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2009-09-21 01:08:46 +0000
+++ b/changelog 2009-09-23 17:24:29 +0000
@@ -3,7 +3,7 @@
* The "Goodbye sparc!" release. :-(
* ooo-build:
- - update (e43be3327f9ee193d09f0365607469f849846d04)
+ - update (dfae7670722533f98455aa7f96d8709f79c72d84)
* merge from Ubuntu:
- Add support to turn off building on sparc.
@@ -11,9 +11,10 @@
- don't build sparc. Too many random(!) build failures
- add ENABLE_S390X conditionals. enable. forgotten so far although OOo
claims to support s390x
+ - enable mysql-connector
* debian/control.mysql.in: remove bogus conflicts, add Homepage:
- -- Rene Engelhard <[email protected]> Mon, 21 Sep 2009 03:02:00 +0200
+ -- Rene Engelhard <[email protected]> Wed, 23 Sep 2009 19:23:02 +0200
openoffice.org (1:3.1.1-2) unstable; urgency=low
=== modified file 'control'
--- a/control 2009-09-21 01:08:46 +0000
+++ b/control 2009-09-23 17:24:29 +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
s390 amd64 ia64 ppc64 s390x], libglu1-mesa-dev [i386 powerpc s390 amd64 ia64
ppc64 s390x] , libpoppler-dev (>= 0.8.0) , libcurl4-openssl-dev , libssl-dev ,
libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>= 6.0.7~) ,
openjdk-6
-jdk , gij [i386 mips mipsel s390 armel amd64 ia64 s390x], java-gcj-compat-dev
(>= 1.0.76-7) [i386 mips mipsel s390 armel amd64 ia64 s390x], libgcj-bc [i386
mips mipsel s390 armel amd64 ia64 s390x] , ant (>= 1.7.0) [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x], ant-optional (>= 1.7.0) [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] , mingw32 [i386 powerpc
mips mipsel s390 armel amd64 ia64 ppc64 s390x] , libcommons-codec-java [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x],
libcommons-httpclient-java [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x], libcommons-lang-java [i386 powerpc mips mipsel s390 armel amd64
ia64 ppc64 s390x], libcommons-logging-java [i386 powerpc mips mipsel s390 armel
amd64 ia64 ppc64 s390x] , iceape-dev (>= 1.1.9-5) [i386 powerpc mips mipsel
s390 arm armel amd64 ia64 ppc64 s390x], libnss3-dev [i386 powerpc mips mipsel
s390 arm armel amd64 ia64 ppc64 s390x] , dmake (>= 1:4.11) , mono-mcs (>=
1.2.3) [i
386 amd64 ia64], mono-gmcs (>= 1.2.3) [i386 amd64 ia64], libmono-dev (>=
1.2.3) [i386 amd64 ia64], mono-utils (>= 1.2.3) [i386 amd64 ia64],
cli-common-dev (>= 0.5.7) [i386 amd64 ia64], mono-1.0-devel [i386 amd64 ia64],
mono-2.0-devel [i386 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 ,
libxslt1-dev , libcairo2-dev , kdelibs4-dev , libebook1.2-dev , libxrandr-dev ,
libhsqldb-java (>> 1.8.0.9) [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x] , bsh (>= 2.0b4) [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x] , 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) , 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)
+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
s390 amd64 ia64 ppc64 s390x], libglu1-mesa-dev [i386 powerpc s390 amd64 ia64
ppc64 s390x] , 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 mips mipsel s390 armel amd64 ia64 s390x], libgcj-common
(>= 1:4.4.0) [i386 mips mipsel s390 armel amd64 ia64 s390x] , ant (>= 1.7.0)
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], ant-optional (>=
1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] , mingw32
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] ,
libcommons-codec-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64
s390x], libcommons-httpclient-java [i386 powerpc mips mipsel s390 armel amd64
ia64 ppc64 s390x], libcommons-lang-java [i386 powerpc mips mipsel s390 armel
amd64 ia64 ppc64 s390x], libcommons-logging-java [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x] , libbase-java-openoffice.org [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x], libsac-java [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x], libxml-java-openoffice.org [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], libflute-java-openof
fice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel
s390 armel amd64 ia64 ppc64 s390x], liblayout-java-openoffice.org [i386 powerpc
mips mipsel s390 armel amd64 ia64 ppc64 s390x], libloader-java-openoffice.org
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x],
libformula-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x], librepository-java-openoffice.org [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x], libfonts-java-openoffice.org [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x], libserializer-java-openoffice.org
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] ,
libcommons-logging-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64
s390x] , iceape-dev (>= 1.1.9-5) [i386 powerpc mips mipsel s390 arm armel amd64
ia64 ppc64 s390x], libnss3-dev [i386 powerpc mips mipsel s390 arm armel amd64
ia64 p
pc64 s390x] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 amd64 ia64],
libmono-dev (>= 2.0.1) [i386 amd64 ia64], mono-utils (>= 2.0.1) [i386 amd64
ia64], cli-common-dev (>= 0.5.7) [i386 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) , libmysqlclient-dev , libmysqlcppconn-dev (>=
1.0.6~r768) [powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x)],
libmysqlcppconn-stlport-dev [i386] , libebook1.2-dev , libxrandr-dev ,
liblucene2-java (>= 2.3.2) [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x] , bsh (>= 2.0b4) [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x] , 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-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
@@ -3507,3 +3507,17 @@
OpenOffice.org without any wrapper layer such as ODBC or JDBC.
Homepage: http://dba.openoffice.org/drivers/postgresql/
+Package: openoffice.org-mysql-connector
+Section: misc
+Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
+Pre-Depends: openoffice.org-common
+Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:3.1~) ${misc:Depends}
+Suggests: mysql-server (>= 5.1)
+Homepage:
http://wiki.services.openoffice.org/wiki/Database/Drivers/MySQL_Native
+Description: MySQL Connector extension for OpenOffice.org
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ The MySQL Connectot extension allows to use the MySQL database from
+ OpenOffice.org without any wrapper layer such as ODBC or JDBC.
+
=== modified file 'rules'
--- a/rules 2009-09-21 01:08:46 +0000
+++ b/rules 2009-09-23 17:24:29 +0000
@@ -242,7 +242,7 @@
INTERNAL_STDLIBS=n
DEFAULT_IMAGE=galaxy
IMAGES:=$(DEFAULT_IMAGE) industrial crystal hicontrast tango oxygen classic
-ENABLE_MYSQLNATIVE=n
+ENABLE_MYSQLNATIVE=y
USE_SYSTEM_MYSQLCLIENT=y
USE_SYSTEM_MYSQLCPPCONN=y
