./packages/openofficeorg/3.2/experimental r1735: merge
------------------------------------------------------------
revno: 1735 [merge]
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Sun 2009-12-13 01:01:27 +0100
message:
merge
added:
shlibs.local.in
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2009-12-10 19:19:23 +0000
+++ b/changelog 2009-12-13 00:01:27 +0000
@@ -10,11 +10,26 @@
* debian/rules:
- re-enable eo
- enable hppa, use gcj-jdk
+
+ * merge 1:3.1.1-9 and 1:3.1.1-10
+
+ -- Rene Engelhard <rene@debian.org> Thu, 10 Dec 2009 20:18:53 +0100
+
+openoffice.org (1:3.1.1-10) UNRELEASED; urgency=low
+
+ * ooo-build:
+ - update (6929a9d4285be22b2e6d682bab6d0c5bca2e8fa5)
+ - mysqlcppconn-mysqlclient-SONAME.diff: use libmysqlcppconn.so.16 instead
+ of libmysqlcppconn.so also in the internal mysqlcppconn copy...
+
+ * debian/rules:
- only build-depend on (gcc-)mingw32 when we actually enable the SDK
-
- * merge 1:3.1.1-9
-
- -- Rene Engelhard <rene@debian.org> Thu, 10 Dec 2009 20:18:53 +0100
+ - build-depend on kdelibs5-dev (>= 4:4.3.4) when building against KDE4
+ - when building with internal mysqlcppconn, add explicit dep on
+ libmysqlclient. Together with the new patch above this closes: #560788
+ * debian/shlibs.local.in: force a kdebase-runtime >= 4:4.3.4 dependency
+
+ -- Rene Engelhard <rene@debian.org> Sat, 12 Dec 2009 23:48:05 +0100
openoffice.org (1:3.1.1-9) unstable; urgency=low
=== modified file 'control'
--- a/control 2009-12-10 19:19:23 +0000
+++ b/control 2009-12-13 00:01:27 +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 hppa] , libcurl4-openssl-dev ,
libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>= 6.0.7~) , openjdk-6-jdk [i386 powerpc s390 armel amd64 ppc64 s390x sparc] , gcj-jdk [i386 mips mipsel s390 armel amd64 ia64 s390x sparc hppa], libgcj-common (>= 1:4.4.1) [i386 mips mipsel s390 armel amd64 ia64 s390x sparc hppa] , ant (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], ant-optional (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] , gcc-mingw32 [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] , libcommons-codec-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libcommons-httpclient-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libcommons-lang-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libcommons-logging-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] , libbase-java-openoffic
e.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libsac-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libxml-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libflute-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], liblayout-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libloader-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libformula-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], librepository-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libfonts-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc
64 s390x sparc hppa], libserializer-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] , libcommons-logging-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] , xulrunner-dev [i386 powerpc mips mipsel s390 arm armel amd64 ia64 ppc64 s390x sparc hppa], libnss3-dev (>= 3.12.3) [i386 powerpc mips mipsel s390 arm armel amd64 ia64 ppc64 s390x sparc hppa] , 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 hppa] , libebook1.2-dev , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] , bsh (>= 2.0b4) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] , 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 hppa] , libcurl4-openssl-dev ,
libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>= 6.0.7~) , openjdk-6-jdk [i386 powerpc s390 armel amd64 ppc64 s390x sparc] , gcj-jdk [i386 mips mipsel s390 armel amd64 ia64 s390x sparc hppa], libgcj-common (>= 1:4.4.1) [i386 mips mipsel s390 armel amd64 ia64 s390x sparc hppa] , ant (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], ant-optional (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] , gcc-mingw32 [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] , libcommons-codec-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libcommons-httpclient-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libcommons-lang-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libcommons-logging-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] , libbase-java-openoffic
e.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libsac-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libxml-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libflute-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], liblayout-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libloader-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libformula-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], librepository-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa], libfonts-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc
64 s390x sparc hppa], libserializer-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] , libcommons-logging-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] , xulrunner-dev [i386 powerpc mips mipsel s390 arm armel amd64 ia64 ppc64 s390x sparc hppa], libnss3-dev (>= 3.12.3) [i386 powerpc mips mipsel s390 arm armel amd64 ia64 ppc64 s390x sparc hppa] , 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 (>= 4:4.3.4) , libqt4-dev (>= 4.5) , libmysqlclient-dev , libmysqlcppconn-dev (>= 1.1.0~r791)
[powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x sparc hppa] , libebook1.2-dev , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] , bsh (>= 2.0b4) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] , 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-10 19:19:23 +0000
+++ b/rules 2009-12-13 00:01:27 +0000
@@ -170,6 +170,7 @@
endif
ifeq "$(KDE_VER)" "4"
QT_MINVER= (>= 4.5)
+ KDELIBS_MINVER= (>= 4:4.3.4)
endif
BUILD_DBG_PACKAGE=y
USE_SYSTEM_BSH=y
@@ -334,6 +335,7 @@
HYPH_DIR=/usr/share/myspell/dicts
THES_DIR=/usr/share/myspell/dicts
MOZILLA=iceape
+ ENABLE_MYSQLNATIVE=n
endif
#############
@@ -3279,6 +3281,7 @@
dh_makeshlibs -puno-libs3 -V"ure (>= $(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }'))" -- -c0
dh_makeshlibs -n -pure -V"ure (>= $(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }'))"
dh_installdeb -s
+ cp debian/shlibs.local.in debian/shlibs.local
ifeq "$(USE_SYSTEM_ICU)" "n"
cat debian/shlibs.override.icu >> debian/shlibs.local
endif
@@ -3319,6 +3322,13 @@
$(SOURCE_TREE)/mysqlc/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/lib/mysqlc.uno.so \
$(SOURCE_TREE)/mysqlcppconn/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/lib/libmysqlcppconn.so \
> debian/openoffice.org$(VER)-mysql-connector.substvars
+ ifeq "$(USE_SYSTEM_MYSQLCPPCONN)" "n"
+ # add mysqlclient dependency; it apparently is only dlopen()ed in
+ # the internal case.. (And in the external case we have a dep on
+ # libmysqlcppconn4 which deps on libmysqlclient16 already)
+ perl -pi -e 's/(shlibs:Depends=.*$$)/$$1, $(shell cat /var/lib/dpkg/info/libmysqlclient16.shlibs | grep _r | cut -d" " -f3,4,5)/' \
+ debian/openoffice.org$(VER)-mysql-connector.substvars
+ endif
endif
ifeq "$(ENABLE_MINIMIZER)" "y"
LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program" \
=== added file 'shlibs.local.in'
--- a/shlibs.local.in 1970-01-01 00:00:00 +0000
+++ b/shlibs.local.in 2009-12-12 18:33:46 +0000
@@ -0,0 +1,29 @@
+libkde3support 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
+libkunittest 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
+libkdeui 5 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
+libkparts 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
+libkdefakes 5 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
+libthreadweaver 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
+libkdesu 5 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
+libknotifyconfig 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
+libkhtml 5 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
+libkjsapi 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
+libkntlm 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
+libkrosscore 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
+libkdnssd 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
+libkpty 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
+libnepomuk 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
+libkio 5 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
+libsolid 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
+libkfile 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
+libkrossui 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
+libkjs 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
+libkjsembed 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
+libkutils 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
+libkdecore 5 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
+libkrossqtsplugin 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
+ktexteditor_python encoding kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
+libkimproxy 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
+libknewstuff2 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
+libkmediaplayer 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
+libktexteditor 4 kdelibs5 (>= 4:4.3.4), kdebase-runtime (>= 4:4.3.4)
Reply to: