[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.3.3-3-28-g65c0a34
The following commit has been merged in the master branch:
commit 65c0a34b1b6b950ba006ecf8e619a37e22b1e5e1
Author: Rene Engelhard <rene@debian.org>
Date: Mon Aug 15 11:25:14 2011 +0000
fix up sdbc-postgresql, re-enable
diff --git a/changelog b/changelog
index c1c4f25..97caa48 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,8 @@ libreoffice (1:3.3.3-5) UNRELEASED; urgency=low
* debian/patches/update-debian-opt.diff: call dpkg-buildflags correctly
* debian/patches/fix-bridges-cpp-uno-depends.diff: fix mising depends in
bridges' build.lst which can cause FTBFS on s390(x), arm, ia64, hppa, alpha
+ * debian/patches/fdo35784.diff: add patch from fdo35784, thanks lmamane
+ * debian/patches/disable-sdbc-postgresql.diff: remove
* debian/changelog: mention VU#953183/CVE-2011-2685 in 1:3.3.3-1
* debian/control.in:
@@ -16,6 +18,7 @@ libreoffice (1:3.3.3-5) UNRELEASED; urgency=low
- try gcj again on mipsel, stay with OpenJDK for mips
- on sid (and when building with debug), compress -dbg with xz; make bzip2
compression unconditional
+ - re-enable -sdbc-postgresql
* debian/source.lintian-overrides:
- override new libreoffice source: dh_pycentral-is-obsolete line 3214
and libreoffice source: dh_python-is-obsolete line 3223
@@ -25,7 +28,7 @@ libreoffice (1:3.3.3-5) UNRELEASED; urgency=low
- gconf also needs liborbit2-dev
- bump libebook so name to allow for libebook-1.2.so-11 too
- -- Rene Engelhard <rene@debian.org> Thu, 11 Aug 2011 22:25:52 +0200
+ -- Rene Engelhard <rene@debian.org> Mon, 15 Aug 2011 10:52:15 +0000
libreoffice (1:3.3.3-4) unstable; urgency=low
diff --git a/control b/control
index 8b51106..a4bfb6b 100644
--- a/control
+++ b/control
@@ -3,7 +3,7 @@ Section: editors
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <rene@debian.org>
-Build-Depends: lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], 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, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, po-debconf, bc, wget | curl, libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libgraphite-dev, libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev, libssl-dev, libdb-dev, dpkg-dev (>= 1.15.1), python (>= 2.6.6-3+squeeze4), python-dev, debhelper (>= 7.2.3~), epm, libcppunit-dev (>= 1.12), openjdk-6-jdk [alpha amd64 armel armhf i386 mips powerpc powerpcspe ppc64 s390 s390x sparc], gcj-n
ative-helper [!powerpc !powerpcspe !ppc64], libgcj-common (>= 1:4.4.1) [!powerpc !powerpcspe !ppc64], ant (>= 1.7.0), ant-optional (>= 1.7.0), gcc-mingw32, mingw32-runtime, libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java, libservlet2.5-java, libbase-java-openoffice.org [!armel], libsac-java [!armel], libxml-java-openoffice.org [!armel], libflute-java-openoffice.org [!armel], libpentaho-reporting-flow-engine-java-openoffice.org [!armel], liblayout-java-openoffice.org [!armel], libloader-java-openoffice.org [!armel], libformula-java-openoffice.org [!armel], librepository-java-openoffice.org [!armel], libfonts-java-openoffice.org [!armel], libserializer-java-openoffice.org [!armel], libcommons-logging-java, libservlet2.5-java, javahelper (>= 0.37~), xulrunner-dev, libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), mono-devel (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libmono-dev (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-a
md64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], cli-common-dev (>= 0.5.7) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev, libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), 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), libebook1.2-dev [!armel], libxrandr-dev, liblucene2-java (>= 2.3.2), libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4), 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, liborbit2-dev, libldap2-dev
+Build-Depends: lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], 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, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, po-debconf, bc, wget | curl, libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libgraphite-dev, libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev, libssl-dev, libdb-dev, dpkg-dev (>= 1.15.1), python (>= 2.6.6-3+squeeze4), python-dev, debhelper (>= 7.2.3~), epm, libcppunit-dev (>= 1.12), openjdk-6-jdk [alpha amd64 armel armhf i386 mips powerpc powerpcspe ppc64 s390 s390x sparc], gcj-n
ative-helper [!powerpc !powerpcspe !ppc64], libgcj-common (>= 1:4.4.1) [!powerpc !powerpcspe !ppc64], ant (>= 1.7.0), ant-optional (>= 1.7.0), gcc-mingw32, mingw32-runtime, libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java, libservlet2.5-java, libbase-java-openoffice.org [!armel], libsac-java [!armel], libxml-java-openoffice.org [!armel], libflute-java-openoffice.org [!armel], libpentaho-reporting-flow-engine-java-openoffice.org [!armel], liblayout-java-openoffice.org [!armel], libloader-java-openoffice.org [!armel], libformula-java-openoffice.org [!armel], librepository-java-openoffice.org [!armel], libfonts-java-openoffice.org [!armel], libserializer-java-openoffice.org [!armel], libcommons-logging-java, libservlet2.5-java, javahelper (>= 0.37~), xulrunner-dev, libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), mono-devel (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libmono-dev (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-a
md64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], cli-common-dev (>= 0.5.7) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev, libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), 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), libebook1.2-dev [!armel], libpq-dev, libxrandr-dev, liblucene2-java (>= 2.3.2), libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4), 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, liborbit2-dev, libldap2-dev
Build-Depends-Indep: fdupes, xml-core, imagemagick, fontforge
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~), qt3-dev-tools, ant (= 1.8.0-1) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mipsel], ant (= 1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mipsel], ant (= 1.8.0-3) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mipsel], libmdds-dev (>= 0.4.0), base-files (= 6.0), base-files (= 6.0squeeze1), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.9.1
@@ -3364,6 +3364,20 @@ Description: office productivity suite -- KDE integration
* konqueror / kmail
* libreoffice-kab: KDE Addressbook support
+Package: libreoffice-sdbc-postgresql
+Section: misc
+Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Depends: ${shlibs:Depends}, libreoffice-core, ${misc:Depends}
+Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
+Suggests: postgresql
+Description: LibreOffice extension for PostgreSQL SDBC driver
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ The PostgreSQL SDBC Driver allows one to use the PostgreSQL database from
+ LibreOffice without any wrapper layer such as ODBC or JDBC.
+Homepage: http://dba.openoffice.org/drivers/postgresql/
+
Package: libreoffice-mysql-connector
Section: misc
Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
diff --git a/patches/disable-sdbc-postgresql.diff b/patches/disable-sdbc-postgresql.diff
deleted file mode 100644
index 77b5640..0000000
--- a/patches/disable-sdbc-postgresql.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/patches/dev300/apply b/patches/dev300/apply
-index dd51188..6e09796 100644
---- libreoffice-3.4.0/libreoffice-build/patches/dev300/apply
-+++ libreoffice-3.4.0/libreoffice-build/patches/dev300/apply
-@@ -66,7 +66,7 @@
- # Slackware
- Slackware : LinuxCommon, SlackwareOnly, NotDebian, Mono, msaccess
- # Debian
--DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split, PostgreSQL, PowerPC
-+DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split, PowerPC
- Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only, HPPA, AXP, kFreeBSD
- DebianEtch : DebianBase, DebianOnly, DebianEtchOnly, Debian32Only
- # Ubuntu
diff --git a/patches/fdo35784.diff b/patches/fdo35784.diff
new file mode 100644
index 0000000..fa2aa5a
--- /dev/null
+++ b/patches/fdo35784.diff
@@ -0,0 +1,35 @@
+commit d3b1a2d5b3515b53d210de0a0535acaf3cf4c2a7
+Author: Lionel Elie Mamane <lionel@mamane.lu>
+Date: Mon Aug 15 11:44:11 2011 +0200
+
+ [PATCH] fdo#35784 minimal fix
+
+ Fake DatabaseMetaData::getImportedKeys: we can get away with not giving column names if we give zero data rows
+
+diff --git a/patches/postgresql/sdbc-postgresql.diff b/patches/postgresql/sdbc-postgresql.diff
+index 0b978e3..649d1c0 100644
+--- libreoffice-3.3.3/libreoffice-build/patches/postgresql/sdbc-postgresql.diff
++++ libreoffice-3.3.3/libreoffice-build/patches/postgresql/sdbc-postgresql.diff
+@@ -2955,7 +2955,7 @@ new file mode 100644
+ index 0000000..b3c18d8
+ --- /dev/null
+ +++ connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+-@@ -0,0 +1,2164 @@
++@@ -0,0 +1,2162 @@
+ +/*************************************************************************
+ + *
+ + * $RCSfile: pq_databasemetadata.cxx,v $
+@@ -4654,11 +4654,9 @@ index 0000000..b3c18d8
+ +// makeAny( resolveColumnNames(foreignMap, xRow->getString(8) ) ) );
+ +
+ +// }
+-+ // fake the getImportedKey() function call in
+-+ // dbaccess/source/ui/relationdesigin/RelationController.cxx
+-+ // it seems to be the only place in the office, where this function is needed
+++ // LEM TODO: full "real" implementation
+ + return new SequenceResultSet(
+-+ m_refMutex, *this, Sequence< OUString >(), Sequence< Sequence< Any > > (1), m_pSettings->tc );
+++ m_refMutex, *this, Sequence< OUString >(), Sequence< Sequence< Any > > (), m_pSettings->tc );
+ +}
+ +
+ +::com::sun::star::uno::Reference< XResultSet > DatabaseMetaData::getExportedKeys(
diff --git a/patches/mips-openjdk-jre-paths.diff b/patches/mips-openjdk-jre-paths.diff
index 55740c1..4ec3025 100644
--- a/patches/mips-openjdk-jre-paths.diff
+++ b/patches/mips-openjdk-jre-paths.diff
@@ -34,8 +34,8 @@
# Slackware
Slackware : LinuxCommon, SlackwareOnly, NotDebian, Mono, msaccess
# Debian
--DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split, PowerPC
-+DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split, PowerPC, MIPS
+-DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split, PostgreSQL, PowerPC
++DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split, PostgreSQL, PowerPC, MIPS
Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only, HPPA, AXP, kFreeBSD
DebianEtch : DebianBase, DebianOnly, DebianEtchOnly, Debian32Only
# Ubuntu
diff --git a/patches/series b/patches/series
index e56a7b4..1454acd 100644
--- a/patches/series
+++ b/patches/series
@@ -10,7 +10,6 @@ no-minimaltoc.diff
update-debian-opt.diff
gcc4.6.0.diff
odk-jni-include.diff
-disable-sdbc-postgresql.diff
disable-optional-outplace-ole.diff
jurt-soffice-location.diff
disable-rhino.diff
@@ -18,3 +17,4 @@ bsh-hardcode-path.diff
mips-openjdk-jre-paths.diff
libebook-1.2.so.11.diff
fix-bridges-cpp-uno-depends.diff
+fdo35784.diff
diff --git a/rules b/rules
index f4fc6e9..66bf044 100755
--- a/rules
+++ b/rules
@@ -252,8 +252,7 @@ else
ENABLE_REPORTDESIGN=n
ENABLE_MEDIAWIKI=n
endif
-# NOTE: if enabling this, disable debian/patches/disable-sdbc-postgresql.diff!
-ENABLE_SDBC_POSTGRESQL=n
+ENABLE_SDBC_POSTGRESQL=y
ENABLE_MINIMIZER=y
ENABLE_PRESENTER_CONSOLE=y
ENABLE_PDFIMPORT=y
--
LibreOffice packaging repository
Reply to: