------------------------------------------------------------
revno: 1895
committer: Rene Engelhard <[email protected]>
branch nick: unstable
timestamp: Mon 2010-03-29 17:05:29 +0200
message:
actually system.mysqlcpp.diff does apply...
modified:
changelog
control
patches/series
rules
=== modified file 'changelog'
--- a/changelog 2010-03-29 14:23:47 +0000
+++ b/changelog 2010-03-29 15:05:29 +0000
@@ -18,6 +18,7 @@
* debian/shell-lib-extensions.sh: handle non-existant basis-link
(closes: #561498)
* debian/rules:
+ - re-enable system-mysqlcppconn (also in the STLport case)
- re-enable armel, disable arch-dep extensions for it now, though
- fix build with 1.0 source format. Add missing uuencode for the extra
"3.0 (quilt)" components. Use "normal" quilt for patching, add build-dep
=== modified file 'control'
--- a/control 2010-03-29 12:53:07 +0000
+++ b/control 2010-03-29 15:05:29 +0000
@@ -3,7 +3,7 @@
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, libjpeg-dev, libxml2-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, po-debconf, , g++ (>> 4.3.0) [s390], gcc
(>> 4.3.0) [s390] , g++-4.4 (>= 4.4.2-5) [armel] , dpkg-dev (>= 1.15.1) ,
libgl1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64 s390x sparc],
libglu1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64 s390x sparc] ,
libpoppler-dev (>= 0.8.0) , libgraphite-dev [i386 m68k mips mipsel powerpc s390
alpha amd64 armel hppa ia64 ppc64
s390x sparc] , libcurl4-gnutls-dev , libssl-dev , libdb-dev , python-central
(>= 0.5) , python-dev, python-all , debhelper (>= 7.2.3~) , openjdk-6-jdk [i386
powerpc s390 alpha amd64 armel ppc64 s390x sparc] , gcj-jdk [i386 mips mipsel
s390 alpha amd64 armel hppa ia64 s390x sparc], libgcj-common (>= 1:4.4.1) [i386
mips mipsel s390 alpha amd64 armel hppa ia64 s390x sparc] , ant (>= 1.7.0)
[i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc],
ant-optional (>= 1.7.0) [i386 mips mipsel powerpc s390 alpha amd64 armel hppa
ia64 ppc64 s390x sparc] , gcc-mingw32 [i386 mips mipsel powerpc s390 alpha
amd64 armel hppa ia64 ppc64 s390x sparc], mingw32-runtime [i386 mips mipsel
powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc] ,
libcommons-codec-java [i386 mips mipsel powerpc s390 alpha amd64 armel hppa
ia64 ppc64 s390x sparc], libcommons-httpclient-java [i386 mips mipsel powerpc
s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-lang-java
[i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc],
libcommons-logging-java [i386 mips mipsel powerpc s390 alpha amd64 armel hppa
ia64 ppc64 s390x sparc] , libservlet2.5-java , libbase-java-openoffice.org
[i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc],
libsac-java [i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64
s390x sparc], libxml-java-openoffice.org [i386 mips mipsel powerpc s390 alpha
amd64 armel hppa ia64 ppc64 s390x sparc], libflute-java-openoffice.org [i386
mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 mips mipsel powerpc
s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc],
liblayout-java-openoffice.org [i386 mips mipsel powerpc s390 alpha amd64 armel
hppa ia64 ppc64 s390x sparc], libloader-java-openoffice.org [i386 mips mipsel
powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc],
libformula-java-openoff
ice.org [i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x
sparc], librepository-java-openoffice.org [i386 mips mipsel powerpc s390 alpha
amd64 armel hppa ia64 ppc64 s390x sparc], libfonts-java-openoffice.org [i386
mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc],
libserializer-java-openoffice.org [i386 mips mipsel powerpc s390 alpha amd64
armel hppa ia64 ppc64 s390x sparc] , libcommons-logging-java [i386 mips mipsel
powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc] ,
libservlet2.5-java , xulrunner-dev [i386 mips mipsel powerpc s390 alpha amd64
armel hppa ia64 ppc64 s390x sparc], libnss3-dev (>= 3.12.3) [i386 mips mipsel
powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc] , dmake (>= 1:4.11)
, mono-devel (>= 2.4.2.3) [i386 amd64 ia64], libmono-dev (>= 2.4.2.3) [i386
amd64 ia64], mono-utils (>= 2.4.2.3) [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 (>= 1.38) ,
libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev ,
libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev (>= 4:4.3.4)
, libqt4-dev (>= 4.5) , libmysqlclient-dev , libebook1.2-dev , libxrandr-dev ,
liblucene2-java (>= 2.3.2) [i386 mips mipsel powerpc s390 alpha amd64 armel
hppa ia64 ppc64 s390x sparc] , libhsqldb-java (>> 1.8.0.10) [i386 mips mipsel
powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc] , bsh (>= 2.0b4)
[i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc] ,
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-gnutls-dev , librdf0-dev (>=
1.0.8) , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev , libgconf2-dev ,
libldap2-dev
+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, libjpeg-dev, libxml2-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, po-debconf, , g++ (>> 4.3.0) [s390], gcc
(>> 4.3.0) [s390] , g++-4.4 (>= 4.4.2-5) [armel] , dpkg-dev (>= 1.15.1) ,
libgl1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64 s390x sparc],
libglu1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64 s390x sparc] ,
libpoppler-dev (>= 0.8.0) , libgraphite-dev [i386 m68k mips mipsel powerpc s390
alpha amd64 armel hppa ia64 ppc64
s390x sparc] , libcurl4-gnutls-dev , libssl-dev , libdb-dev , python-central
(>= 0.5) , python-dev, python-all , debhelper (>= 7.2.3~) , openjdk-6-jdk [i386
powerpc s390 alpha amd64 armel ppc64 s390x sparc] , gcj-jdk [i386 mips mipsel
s390 alpha amd64 armel hppa ia64 s390x sparc], libgcj-common (>= 1:4.4.1) [i386
mips mipsel s390 alpha amd64 armel hppa ia64 s390x sparc] , ant (>= 1.7.0)
[i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc],
ant-optional (>= 1.7.0) [i386 mips mipsel powerpc s390 alpha amd64 armel hppa
ia64 ppc64 s390x sparc] , gcc-mingw32 [i386 mips mipsel powerpc s390 alpha
amd64 armel hppa ia64 ppc64 s390x sparc], mingw32-runtime [i386 mips mipsel
powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc] ,
libcommons-codec-java [i386 mips mipsel powerpc s390 alpha amd64 armel hppa
ia64 ppc64 s390x sparc], libcommons-httpclient-java [i386 mips mipsel powerpc
s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-lang-java
[i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc],
libcommons-logging-java [i386 mips mipsel powerpc s390 alpha amd64 armel hppa
ia64 ppc64 s390x sparc] , libservlet2.5-java , libbase-java-openoffice.org
[i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc],
libsac-java [i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64
s390x sparc], libxml-java-openoffice.org [i386 mips mipsel powerpc s390 alpha
amd64 armel hppa ia64 ppc64 s390x sparc], libflute-java-openoffice.org [i386
mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 mips mipsel powerpc
s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc],
liblayout-java-openoffice.org [i386 mips mipsel powerpc s390 alpha amd64 armel
hppa ia64 ppc64 s390x sparc], libloader-java-openoffice.org [i386 mips mipsel
powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc],
libformula-java-openoff
ice.org [i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x
sparc], librepository-java-openoffice.org [i386 mips mipsel powerpc s390 alpha
amd64 armel hppa ia64 ppc64 s390x sparc], libfonts-java-openoffice.org [i386
mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc],
libserializer-java-openoffice.org [i386 mips mipsel powerpc s390 alpha amd64
armel hppa ia64 ppc64 s390x sparc] , libcommons-logging-java [i386 mips mipsel
powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc] ,
libservlet2.5-java , xulrunner-dev [i386 mips mipsel powerpc s390 alpha amd64
armel hppa ia64 ppc64 s390x sparc], libnss3-dev (>= 3.12.3) [i386 mips mipsel
powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc] , dmake (>= 1:4.11)
, mono-devel (>= 2.4.2.3) [i386 amd64 ia64], libmono-dev (>= 2.4.2.3) [i386
amd64 ia64], mono-utils (>= 2.4.2.3) [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 (>= 1.38) ,
libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev ,
libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev (>= 4:4.3.4)
, libqt4-dev (>= 4.5) , libmysqlclient-dev , libmysqlcppconn-dev (>=
1.1.0~r791) [m68k mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64
s390x sparc] , libebook1.2-dev , libxrandr-dev , liblucene2-java (>= 2.3.2)
[i386 mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc] ,
libhsqldb-java (>> 1.8.0.10) [i386 mips mipsel powerpc s390 alpha amd64 armel
hppa ia64 ppc64 s390x sparc] , bsh (>= 2.0b4) [i386 mips mipsel powerpc s390
alpha amd64 armel hppa ia64 ppc64 s390x sparc] , 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-gnutls-dev , librdf0-dev (>= 1.0.8) , libgtk2.0-dev (>= 2.10) ,
libgnomevfs2-dev
, libgconf2-dev , libldap2-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), graphicsmagick-imagemagick-compat (<<
1.3.9~), ant (= 1.8.0-1) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel],
ant (= 1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (=
1.8.0-3) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], base-files (= 5)
Standards-Version: 3.8.4
XS-Python-Version: >= 2.4
=== modified file 'patches/series'
--- a/patches/series 2010-03-29 12:53:07 +0000
+++ b/patches/series 2010-03-29 15:05:29 +0000
@@ -2,3 +2,4 @@
update-mysqlc.diff
cws-linuxaxp01.diff
redland-remove-patches.diff
+system-mysqlcpp.diff
=== modified file 'rules'
--- a/rules 2010-03-29 14:08:31 +0000
+++ b/rules 2010-03-29 15:05:29 +0000
@@ -256,11 +256,9 @@
DEFAULT_IMAGE=galaxy
IMAGES:=$(DEFAULT_IMAGE) industrial crystal hicontrast tango oxygen classic
ENABLE_MYSQLNATIVE=y
+# cannot be disabled, unless you have a internal MySQL somewhere :-)
USE_SYSTEM_MYSQLCLIENT=y
-# for some reason does not work on i386 even with the new version.
-# Use internal mysqlcppconn on all archs for consistency (asked for by
-# the security team)
-USE_SYSTEM_MYSQLCPPCONN=n
+USE_SYSTEM_MYSQLCPPCONN=y
MYSQLCPPCONN_MINVER= (>= 1.1.0~r791)
DICT_DIR=/usr/share/hunspell
HYPH_DIR=/usr/share/hyphen
@@ -370,7 +368,7 @@
# with STLport. Not possible without patch.
ifeq ($(ARCH),$(findstring $(ARCH),$(OOO_STLPORT_ARCHS)))
# USE_SYSTEM_GRAPHITE=n
- USE_SYSTEM_MYSQLCPPCONN=n
+# USE_SYSTEM_MYSQLCPPCONN=n
endif
ifeq "$(ENABLE_OPENGL)" "y"
@@ -1053,7 +1051,9 @@
ifeq "$(USE_SYSTEM_MYSQLCPPCONN)" "y"
CONFIGURE_FLAGS += --with-system-mysql-cppconn
BUILD_DEPS += , libmysqlcppconn-dev $(MYSQLCPPCONN_MINVER)
[$(filter-out $(OOO_STLPORT_ARCHS),$(OOO_ARCHS))]
- #BUILD_DEPS += , libmysqlcppconn-stlport-dev $(MYSQLCPPCONN_MINVER)
[$(OOO_STLPORT_ARCHS)]
+# ifeq "$(USE_STLPORT)" "y"
+ ADDITIONAL_SECTIONS += SystemMySQLWithSTLport
+# endif
endif
endif
