./packages/openofficeorg/3.2/experimental r1729: merge
------------------------------------------------------------
revno: 1729 [merge]
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Tue 2009-12-08 09:17:05 +0100
message:
merge
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2009-12-07 01:29:11 +0000
+++ b/changelog 2009-12-08 08:17:05 +0000
@@ -5,6 +5,9 @@
* ooo-build
- update (d77ba25e20ddb34be9edbc3c1947d8433dff060d)
- makes "Always allow saving of document" configurable (closes: #478130)
+ - add support for building with internal mysql-connector-cpp (as
+ upstream does) to ooo-build infrastructure; disable
+ debian-mysqlc-build-against-stlport-hack.diff for now
- open-url-support-iceanimals.diff: support ice{ape,dove,weasel}
in open-url (closes: #543652)
- src: add OOO320 GSIs from ftp.linux.cz
@@ -13,7 +16,9 @@
- re-enable sparc
- re-enable eo
- build-depend on libmysqlcppconn*-dev (>= 1.1.0~r791) to build against
- version with fixed visibility of (e.g.) SQLException (closes: #558240)
+ version with fixed visibility of (e.g.) SQLException
+ This closes: #558240 for !i386 at least.
+ Build with internal libmysqlcppconn on i386 for now...
-- Rene Engelhard <rene@debian.org> Sun, 06 Dec 2009 19:11:45 +0100
=== modified file 'control'
--- a/control 2009-12-04 00:35:53 +0000
+++ b/control 2009-12-08 08:17:05 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <halls@debian.org>, Rene Engelhard <rene@debian.org>
-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, 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] , dpkg-dev (>= 1.14.11) , 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 [powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x sparc] , libcurl4-openssl-dev , libss
l-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 sparc], libgcj-common (>= 1:4.4.1) [i386 mips mipsel s390 armel amd64 ia64 s390x sparc] , ant (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], ant-optional (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] , mingw32 [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] , libcommons-codec-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libcommons-httpclient-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libcommons-lang-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libcommons-logging-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] , libbase-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libsac-java [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libxml-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libflute-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], liblayout-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libloader-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libformula-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], librepository-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libfonts-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libserializer-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] , libcommons-logging-java [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] , xulrunner-dev [i386 powerpc mips mipsel s390 arm armel amd64 ia64 ppc64 s390x sparc], libnss3-dev (>= 3.12.3) [i386 powerpc mips mipsel s390 arm armel amd64 ia64 ppc64 s390x sparc] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 amd64 ia64 sparc], libmono-dev (>= 2.0.1) [i386 amd64 ia64 sparc], mono-utils (>= 2.0.1) [i386 amd64 ia64 sparc], cli-common-dev (>= 0.5.7) [i386 amd64 ia64 sparc] , 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 , libqt4-dev (>= 4.5) , libmysqlclient-dev , libmysqlcppconn-dev (>= 1.1.0~r791) [powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x sparc], libmysqlcppconn-stlport-dev (>= 1.1.0~r791) [i386] , libebook1.2-dev , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] , bsh (>= 2.0b4) [i386 powerpc mips mipsel s390 armel amd64 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 , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev , libgconf2-dev , gcc-4.4, g++-4.4 , 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, libjpeg62-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] , dpkg-dev (>= 1.14.11) , 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 [powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x sparc] , libcurl4-openssl-dev , libss
l-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 sparc], libgcj-common (>= 1:4.4.1) [i386 mips mipsel s390 armel amd64 ia64 s390x sparc] , ant (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], ant-optional (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] , mingw32 [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] , libcommons-codec-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libcommons-httpclient-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libcommons-lang-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libcommons-logging-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] , libbase-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libsac-java [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libxml-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libflute-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], liblayout-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libloader-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libformula-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], librepository-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libfonts-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libserializer-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] , libcommons-logging-java [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] , xulrunner-dev [i386 powerpc mips mipsel s390 arm armel amd64 ia64 ppc64 s390x sparc], libnss3-dev (>= 3.12.3) [i386 powerpc mips mipsel s390 arm armel amd64 ia64 ppc64 s390x sparc] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 amd64 ia64 sparc], libmono-dev (>= 2.0.1) [i386 amd64 ia64 sparc], mono-utils (>= 2.0.1) [i386 amd64 ia64 sparc], cli-common-dev (>= 0.5.7) [i386 amd64 ia64 sparc] , 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 , libqt4-dev (>= 4.5) , libmysqlclient-dev , libmysqlcppconn-dev (>= 1.1.0~r791) [powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x sparc] , libebook1.2-dev , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s39
0x sparc] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] , bsh (>= 2.0b4) [i386 powerpc mips mipsel s390 armel amd64 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 , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev , libgconf2-dev , gcc-4.4, g++-4.4 , 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), base-files (= 5)
Standards-Version: 3.8.3
XS-Python-Version: current
=== modified file 'rules'
--- a/rules 2009-12-04 17:28:59 +0000
+++ b/rules 2009-12-08 08:17:05 +0000
@@ -349,6 +349,7 @@
endif
ifeq ($(ARCH),$(findstring $(ARCH),$(OOO_STLPORT_ARCHS)))
USE_SYSTEM_GRAPHITE=n
+ USE_SYSTEM_MYSQLCPPCONN=n
endif
ifeq "$(ENABLE_OPENGL)" "y"
@@ -979,7 +980,8 @@
endif
ifeq "$(USE_SYSTEM_MYSQLCPPCONN)" "y"
CONFIGURE_FLAGS += --with-system-mysql-cppconn
- BUILD_DEPS += , libmysqlcppconn-dev $(MYSQLCPPCONN_MINVER) [$(filter-out $(OOO_STLPORT_ARCHS),$(OOO_ARCHS))], libmysqlcppconn-stlport-dev $(MYSQLCPPCONN_MINVER) [$(OOO_STLPORT_ARCHS)]
+ BUILD_DEPS += , libmysqlcppconn-dev $(MYSQLCPPCONN_MINVER) [$(filter-out $(OOO_STLPORT_ARCHS),$(OOO_ARCHS))]
+ #BUILD_DEPS += , libmysqlcppconn-stlport-dev $(MYSQLCPPCONN_MINVER) [$(OOO_STLPORT_ARCHS)]
endif
endif
Reply to: