./packages/libreoffice/3.3.0/experimental r2218: merge
------------------------------------------------------------
revno: 2218 [merge]
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Sun 2010-11-28 17:47:51 +0100
message:
merge
removed:
patches/postgresql-sdbc-0-7-6-b.diff
added:
scripts/install-upstream-changelogs
modified:
changelog
control
control.in
control.postgresql.in
patches/series
rules
=== modified file 'changelog'
--- a/changelog 2010-11-23 23:39:01 +0000
+++ b/changelog 2010-11-28 16:25:12 +0000
@@ -1,4 +1,6 @@
-libreoffice (1:3.3.0~beta3-3) UNRELEASED; urgency=low
+libreoffice (1:3.3.0~rc1~20101127-1) UNRELEASED; urgency=low
+
+ * update to git (20101127)
* debian/broffice.lintian-overrides: oops forgot s/broffice.org/broffice/
here...
@@ -9,10 +11,17 @@
for osl_{set,clear}Environment@UDK_3.11 (closes: #604201)
* debian/patches/smoketest-disable-db-insert-delete-seek-tests.diff:
rediff again - seems it got broken last time (closes: #603008)
- * debian/rules: don't try to add application/vnd.openofficeorg.extension to
- startcenter.desktop, it's already there, thanks Axel Beckert
+ * debian/rules:
+ - don't try to add application/vnd.openofficeorg.extension to
+ startcenter.desktop, it's already there, thanks Axel Beckert
+ - adapt for new .oxt packaging of postgresql-sdbc
+ - remove libwpd 0.9 conditional, now 0.9 is needed as 0.8 support is gone
+ * debian/control.postgresql.in: bump depends to 3.3
+ * debian/rules, debian/scripts/install-upstream-changelogs: properly install
+ the various upstream changelogs
+ * debian/control.in: remove Breaks on -sdbc-postgresql again
- -- Rene Engelhard <rene@debian.org> Wed, 24 Nov 2010 00:37:07 +0100
+ -- Rene Engelhard <rene@debian.org> Sun, 28 Nov 2010 17:22:15 +0100
libreoffice (1:3.3.0~beta3-2) experimental; urgency=low
=== modified file 'control'
--- a/control 2010-11-17 22:58:09 +0000
+++ b/control 2010-11-28 16:25:12 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <rene@debian.org>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2) [powerpc], 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, libpq-dev, po-debconf, bc, wget | curl, , 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 powerpcspe s390 kfreebsd-i386 amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc], libglu1-mesa-dev [i386 powerpc powerpcspe s390 kfreebsd-i386 amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc] , libpo
ppler-dev (>= 0.8.0) , libgraphite-dev [i386 m68k mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libcurl4-gnutls-dev , libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>= 7.2.3~) , epm , libcppunit-dev (>= 1.12) , openjdk-6-jdk [i386 powerpc powerpcspe s390 alpha amd64 armel ppc64 s390x sparc] , gcj-jdk [i386 mips mipsel s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x sparc], libgcj-common (>= 1:4.4.1) [i386 mips mipsel s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x sparc] , ant (>= 1.7.0) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], ant-optional (>= 1.7.0) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , gcc-mingw32 [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 ar
mel hppa ia64 ppc64 s390x sparc], mingw32-runtime [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libcommons-codec-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-httpclient-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-lang-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-logging-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libservlet2.5-java , libbase-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libsac-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreeb
sd-amd64 hppa ia64 ppc64 s390x sparc], libxml-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libflute-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libpentaho-reporting-flow-engine-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], liblayout-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libloader-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libformula-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], librepository-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s
390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libfonts-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libserializer-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc] , libcommons-logging-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libservlet2.5-java , xulrunner-dev [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libnss3-dev (>= 3.12.3) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , dmake (>= 1:4.11) , mono-devel (>= 2.4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64], libmono-dev (>= 2.4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64], mono-utils (>= 2.
4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64], cli-common-dev (>= 0.5.7) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64] , 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) [i386 m68k mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libebook1.2-dev [!armel] , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libhsqldb-java (>> 1.8.0.10) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 pp
c64 s390x sparc] , bsh (>= 2.0b4) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-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, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2) [powerpc], 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, libpq-dev, po-debconf, bc, wget | curl, , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , g++-4.4 (>= 4.4.2-5) [armel] , git, rsync , dpkg-dev (>= 1.15.1) , libgl1-mesa-dev [i386 powerpc powerpcspe s390 kfreebsd-i386 amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc], libglu1-mesa-dev [i386 powerpc powerpcspe s390 kfreebsd-i386 amd64 kfreebsd-amd64 ia64 ppc64 s390x s
parc] , libpoppler-dev (>= 0.8.0) , libgraphite-dev [i386 m68k mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libcurl4-gnutls-dev , libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>= 7.2.3~) , epm , libcppunit-dev (>= 1.12) , openjdk-6-jdk [i386 powerpc powerpcspe s390 alpha amd64 armel ppc64 s390x sparc] , gcj-jdk [i386 mips mipsel s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x sparc], libgcj-common (>= 1:4.4.1) [i386 mips mipsel s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x sparc] , ant (>= 1.7.0) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], ant-optional (>= 1.7.0) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , gcc-mingw32 [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfre
ebsd-amd64 armel hppa ia64 ppc64 s390x sparc], mingw32-runtime [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libcommons-codec-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-httpclient-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-lang-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-logging-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libservlet2.5-java , libbase-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libsac-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha
amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libxml-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libflute-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libpentaho-reporting-flow-engine-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], liblayout-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libloader-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libformula-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], librepository-java-openoffice.org [i386 mips mipsel powerpc
powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libfonts-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libserializer-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc] , libcommons-logging-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libservlet2.5-java , xulrunner-dev [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libnss3-dev (>= 3.12.3) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , dmake (>= 1:4.11) , mono-devel (>= 2.4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64], libmono-dev (>= 2.4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64], mono
-utils (>= 2.4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64], cli-common-dev (>= 0.5.7) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64] , 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) [i386 m68k mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libebook1.2-dev [!armel] , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libhsqldb-java (>> 1.8.0.10) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel
hppa ia64 ppc64 s390x sparc] , bsh (>= 2.0b4) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-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-Indep: fdupes, xml-core, imagemagick, , libtextcat-data-utf8 , 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~), 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), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.8.4
@@ -107,7 +107,7 @@
Architecture: i386 m68k mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc
Depends: libreoffice-common (>> ${base-version}), ttf-opensymbol (>= 1:3.0), ${shlibs:Depends}, ure (>= 1.5.1+OOo3.1.1-15), fontconfig, ${mozilla-nss-depends}, ${misc:Depends}
Conflicts: libreoffice-thesaurus, libreoffice-l10n-1.9.108, libreoffice-l10n-1.9.114, libreoffice-l10n-1.9.121, libreoffice-1.9.125, oooqs-kde, ooqstart-gnome, libreoffice-help-de (<< 2.0), libreoffice-help-en (<< 2.0), libreoffice-help-el (<< 2.0), libreoffice-help-es (<< 2.0), libreoffice-help-fr (<< 2.0), libreoffice-help-it (<< 2.0), libreoffice-help-ja (<< 2.0), libreoffice-help-ko (<< 2.0), libreoffice-help-pt-br (<< 2.0), libreoffice-help-sv (<< 2.0), libreoffice-help-tr (<< 2.0), libreoffice-help-zh-cn (<< 2.0), libreoffice-help-zh-tw (<< 2.0), libreoffice-help-2.0.0, libreoffice-help-2.0.1, libreoffice-help-2.0.2, libreoffice-help-2.0.3, libreoffice-help-2.4, libreoffice-help-3.1, libreoffice-bin, libreoffice2-core, libreoffice-crashrep, libreoffice2-hunspell, libreoffice-hunspell, libreoffice-core (<< ${binary:Version}), libreoffice-calc (<< ${binary:Version}), libreoffice-writer (<< ${binary:Version}), libreoffice-impress (<< ${binary:Version}), libreoffice-draw (
<< ${binary:Version}), libreoffice-base (<< ${binary:Version}), libreoffice-gtk (<< ${binary:Version}), libreoffice-gnome (<< ${binary:Version}), libreoffice-kde (<< ${binary:Version}), libreoffice-evolution (<< ${binary:Version}), libreoffice-filter-so52 (<< ${binary:Version}), libreoffice-officebean (<< ${binary:Version}), libreoffice-dev (<< ${binary:Version}), libcairo2 (= 1.4.8-1), libicu38 (= 3.8~d01-1), cli-uno-bridge (<< 1:3.0.0~dev300m22), libreoffice-qa-ui-tests (<< ${base-version}), libreoffice-qa-ui-tests (>= ${base-version}.1), cacao-oj6-jre, mozilla-plugin-vlc (<< 1.0)
-Breaks: myspell-ru (<< 0.99g5-8.1), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-fi (<< 0.7-17.2), myspell-cs-cz (<< 20040229-4.1), myspell-el-gr (<< 0.3-1.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), hunspell-ar (<< 0.0.0+20080110-1.1), myspell-hu (<< 0.99.4-1.2), hunspell-gl-es (<< 2.2a-6), myspell-gv (<< 0.50-8), myspell-en-au (<< 2.1-5), myspell-fa (<< 0.20070816-2), hunspell-uz (<< 0.6-3.1), hunspell-ko (<< 0.3.3-1), hunspell-se (<< 1.0~beta6.20081222-1.1), hunspell-de-med (<< 20090825-1), hunspell-en-us (<< 20070829-3), myspell-sv-se (<< 1.3.8-6-2.2), myspell-sk (<< 0.5.5a-2.1), myspell-fo (<< 0.2.36-3), myspell-nl (<< 1:1.10-3), myspell-pt-br (<< 2009.03.30-1.1), myspell-pl (<< 20090830-1), myspell-pt-pt (<< 20090309-1.1), myspell-ga (<< 2.0-19), myspell-gd (<< 0.50-7), myspell-ku (<< 0.20.0-1.1), myspell-hr (<< 20060617-2), myspell-fr-gut (<< 1:1.0-26.1), myspell-eo (<< 2.1.2000.02.25-41), myspell-de-de-oldspell (<< 1:2-25.1), my
spell-da (<< 1.6.18-1.1), myspell-es (<< 1.10-7), myspell-de-at (<< 20071211-2), myspell-de-ch (<< 20071211-2), myspell-de-de (<< 20071211-2), hunspell-de-at (<< 20071211-2), hunspell-de-ch (<< 20071211-2), hunspell-de-de (<< 20071211-2), myspell-ca (<< 0.6-8), myspell-tl (<< 0.4-0-5), myspell-ne (<< 1.0-4.1), myspell-fr (<< 1.4-25), myspell-hy (<< 0.10.1-1.1), myspell-en-us (<< 1:3.1.0-3), myspell-en-gb (<< 1:3.1.0-3), myspell-en-za (<< 1:3.1.0-3), myspell-af (<< 1:3.1.0-3), myspell-it (<< 1:3.1.0-3), myspell-sw (<< 1:3.1.0-3), myspell-th (<< 1:3.1.0-3), hunspell-en-ca (<< 1:3.1.0-3), hunspell-ne (<< 1:3.1.0-3), hunspell-da (<< 1:3.1.0-3), hunspell-fr (<< 1:3.1.0-3), hunspell-vi (<< 1:3.1.0-3), hunspell-hu (<< 1:3.1.0-3), hunspell-sr (<< 1:3.1.0-3), hunspell-sh (<< 1:3.1.0-3), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), libreoffice-hyphenation-hr (<< 20060617-2), libreoffice-hyphenation-pl (<< 1:3.0a-3)
, libreoffice-hyphenation-sh (<< 1:3.1.0-3), libreoffice-hyphenation-sr (<< 1:3.1.0-3), libreoffice-hyphenation-de (<< 1:3.1.0-3), libreoffice-hyphenation-hu (<< 1:3.1.0-3), libreoffice-hyphenation-it (<< 1:3.1.0-3), libreoffice-hyphenation-sl (<< 1:3.1.0-3), libreoffice-hyphenation-af (<< 1:3.1.0-3), libreoffice-hyphenation-zu (<< 1:3.1.0-3), libreoffice-hyphenation-fr (<< 1:3.1.0-3), libreoffice-thesaurus-it (<< 2.0.7.gh.deb1-1.1), libreoffice-thesaurus-en-au (<< 2.1-5), libreoffice-thesaurus-pl (<< 1.5-3), libreoffice-thesaurus-en-us (<< 1:3.1.0-3), libreoffice-thesaurus-cs (<< 1:3.1.0-3), libreoffice-thesaurus-sk (<< 1:3.1.0-3), libreoffice-thesaurus-ru (<< 1:3.1.0-3), libreoffice-thesaurus-ne (<< 1:3.1.0-3), libreoffice-thesaurus-hu (<< 1:3.1.0-3), libreoffice-thesaurus-fr (<< 1:3.1.0-3), libreoffice-style-industrial, libreoffice-sdbc-postgresql
+Breaks: myspell-ru (<< 0.99g5-8.1), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-fi (<< 0.7-17.2), myspell-cs-cz (<< 20040229-4.1), myspell-el-gr (<< 0.3-1.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), hunspell-ar (<< 0.0.0+20080110-1.1), myspell-hu (<< 0.99.4-1.2), hunspell-gl-es (<< 2.2a-6), myspell-gv (<< 0.50-8), myspell-en-au (<< 2.1-5), myspell-fa (<< 0.20070816-2), hunspell-uz (<< 0.6-3.1), hunspell-ko (<< 0.3.3-1), hunspell-se (<< 1.0~beta6.20081222-1.1), hunspell-de-med (<< 20090825-1), hunspell-en-us (<< 20070829-3), myspell-sv-se (<< 1.3.8-6-2.2), myspell-sk (<< 0.5.5a-2.1), myspell-fo (<< 0.2.36-3), myspell-nl (<< 1:1.10-3), myspell-pt-br (<< 2009.03.30-1.1), myspell-pl (<< 20090830-1), myspell-pt-pt (<< 20090309-1.1), myspell-ga (<< 2.0-19), myspell-gd (<< 0.50-7), myspell-ku (<< 0.20.0-1.1), myspell-hr (<< 20060617-2), myspell-fr-gut (<< 1:1.0-26.1), myspell-eo (<< 2.1.2000.02.25-41), myspell-de-de-oldspell (<< 1:2-25.1), my
spell-da (<< 1.6.18-1.1), myspell-es (<< 1.10-7), myspell-de-at (<< 20071211-2), myspell-de-ch (<< 20071211-2), myspell-de-de (<< 20071211-2), hunspell-de-at (<< 20071211-2), hunspell-de-ch (<< 20071211-2), hunspell-de-de (<< 20071211-2), myspell-ca (<< 0.6-8), myspell-tl (<< 0.4-0-5), myspell-ne (<< 1.0-4.1), myspell-fr (<< 1.4-25), myspell-hy (<< 0.10.1-1.1), myspell-en-us (<< 1:3.1.0-3), myspell-en-gb (<< 1:3.1.0-3), myspell-en-za (<< 1:3.1.0-3), myspell-af (<< 1:3.1.0-3), myspell-it (<< 1:3.1.0-3), myspell-sw (<< 1:3.1.0-3), myspell-th (<< 1:3.1.0-3), hunspell-en-ca (<< 1:3.1.0-3), hunspell-ne (<< 1:3.1.0-3), hunspell-da (<< 1:3.1.0-3), hunspell-fr (<< 1:3.1.0-3), hunspell-vi (<< 1:3.1.0-3), hunspell-hu (<< 1:3.1.0-3), hunspell-sr (<< 1:3.1.0-3), hunspell-sh (<< 1:3.1.0-3), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), libreoffice-hyphenation-hr (<< 20060617-2), libreoffice-hyphenation-pl (<< 1:3.0a-3)
, libreoffice-hyphenation-sh (<< 1:3.1.0-3), libreoffice-hyphenation-sr (<< 1:3.1.0-3), libreoffice-hyphenation-de (<< 1:3.1.0-3), libreoffice-hyphenation-hu (<< 1:3.1.0-3), libreoffice-hyphenation-it (<< 1:3.1.0-3), libreoffice-hyphenation-sl (<< 1:3.1.0-3), libreoffice-hyphenation-af (<< 1:3.1.0-3), libreoffice-hyphenation-zu (<< 1:3.1.0-3), libreoffice-hyphenation-fr (<< 1:3.1.0-3), libreoffice-thesaurus-it (<< 2.0.7.gh.deb1-1.1), libreoffice-thesaurus-en-au (<< 2.1-5), libreoffice-thesaurus-pl (<< 1.5-3), libreoffice-thesaurus-en-us (<< 1:3.1.0-3), libreoffice-thesaurus-cs (<< 1:3.1.0-3), libreoffice-thesaurus-sk (<< 1:3.1.0-3), libreoffice-thesaurus-ru (<< 1:3.1.0-3), libreoffice-thesaurus-ne (<< 1:3.1.0-3), libreoffice-thesaurus-hu (<< 1:3.1.0-3), libreoffice-thesaurus-fr (<< 1:3.1.0-3), libreoffice-style-industrial
Provides: libreoffice-bundled, libreoffice2-core, libreoffice-java, libreoffice2-hunspell, libreoffice-hunspell, libreoffice-headless
Replaces: libreoffice-bin, libreoffice (<< 1.9), libreoffice-gtk (<< 2.0.3+2.0.4m179), libreoffice2-core, libreoffice-java, libreoffice2-hunspell, libreoffice-hunspell, libreoffice-common (<< 1:3.0.1~rc1-2), libreoffice-calc (<< 2.2.1~oof680m15-2), libreoffice-headless (<< 1:3.0.0~dev300m26), libreoffice-filter-binfilter (<< 1:3.1.0-5)
Description: office productivity suite -- arch-dependent files
@@ -241,7 +241,6 @@
Architecture: i386 m68k mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc
Section: database
Depends: libreoffice-core (= ${binary:Version}), libreoffice-base-core (= ${binary:Version}), ${shlibs:Depends}, ${java-runtime-depends}, ${base-hsqldb-depends}, ${java-common-depends}, ${misc:Depends}
-Breaks: libreoffice-sdbc-postgresql (<< 1:0.7.6+OOo3.2.0-4~)
Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools, libmysql-java | libpg-java | libjtds-java, libreoffice-gcj, libreoffice-report-builder
Replaces: libreoffice-core (<< 2.0.1), libreoffice-common (<< 1.9.113-0pre1), libreoffice-bin (<< 1.9), libreoffice-debian-files, libreoffice2-base (<< ${binary:Version}), libreoffice-java, libreoffice-java-common (= 1:2.3.1-2~bpo40+1), libreoffice-java-common (= 1:2.4.0-4~bpo40+1), libreoffice-java-common (= 1:2.4.1-3~bpo40+1), libreoffice-java-common (= 2.2.0-6~bpo.1), libreoffice-java-common (= 2.2.1-1~bpo.1), libreoffice-java-common (= 2.2.1-9~bpo40+1), libreoffice-calc (<< 1:3.2.0~rc1), openoffice.org-base (<< 1:3.3.0~)
Conflicts: libreoffice-debian-files, libreoffice2-base (<< ${binary:Version}), libreoffice-common (= 2.0.4-4), libreoffice-report-builder (<< 1.2.0~), libreoffice-report-builder-bin (<< 1:3.2.0~)
=== modified file 'control.in'
--- a/control.in 2010-11-17 18:01:45 +0000
+++ b/control.in 2010-11-27 21:26:00 +0000
@@ -242,7 +242,7 @@
libreoffice-qa-ui-tests (>= ${base-version}.1),
cacao-oj6-jre,
mozilla-plugin-vlc (<< 1.0)
-Breaks: myspell-ru (<< 0.99g5-8.1), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-fi (<< 0.7-17.2), myspell-cs-cz (<< 20040229-4.1), myspell-el-gr (<< 0.3-1.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), hunspell-ar (<< 0.0.0+20080110-1.1), myspell-hu (<< 0.99.4-1.2), hunspell-gl-es (<< 2.2a-6), myspell-gv (<< 0.50-8), myspell-en-au (<< 2.1-5), myspell-fa (<< 0.20070816-2), hunspell-uz (<< 0.6-3.1), hunspell-ko (<< 0.3.3-1), hunspell-se (<< 1.0~beta6.20081222-1.1), hunspell-de-med (<< 20090825-1), hunspell-en-us (<< 20070829-3), myspell-sv-se (<< 1.3.8-6-2.2), myspell-sk (<< 0.5.5a-2.1), myspell-fo (<< 0.2.36-3), myspell-nl (<< 1:1.10-3), myspell-pt-br (<< 2009.03.30-1.1), myspell-pl (<< 20090830-1), myspell-pt-pt (<< 20090309-1.1), myspell-ga (<< 2.0-19), myspell-gd (<< 0.50-7), myspell-ku (<< 0.20.0-1.1), myspell-hr (<< 20060617-2), myspell-fr-gut (<< 1:1.0-26.1), myspell-eo (<< 2.1.2000.02.25-41), myspell-de-de-oldspell (<< 1:2-25.1), my
spell-da (<< 1.6.18-1.1), myspell-es (<< 1.10-7), myspell-de-at (<< 20071211-2), myspell-de-ch (<< 20071211-2), myspell-de-de (<< 20071211-2), hunspell-de-at (<< 20071211-2), hunspell-de-ch (<< 20071211-2), hunspell-de-de (<< 20071211-2), myspell-ca (<< 0.6-8), myspell-tl (<< 0.4-0-5), myspell-ne (<< 1.0-4.1), myspell-fr (<< 1.4-25), myspell-hy (<< 0.10.1-1.1), myspell-en-us (<< 1:3.1.0-3), myspell-en-gb (<< 1:3.1.0-3), myspell-en-za (<< 1:3.1.0-3), myspell-af (<< 1:3.1.0-3), myspell-it (<< 1:3.1.0-3), myspell-sw (<< 1:3.1.0-3), myspell-th (<< 1:3.1.0-3), hunspell-en-ca (<< 1:3.1.0-3), hunspell-ne (<< 1:3.1.0-3), hunspell-da (<< 1:3.1.0-3), hunspell-fr (<< 1:3.1.0-3), hunspell-vi (<< 1:3.1.0-3), hunspell-hu (<< 1:3.1.0-3), hunspell-sr (<< 1:3.1.0-3), hunspell-sh (<< 1:3.1.0-3), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), libreoffice-hyphenation-hr (<< 20060617-2), libreoffice-hyphenation-pl (<< 1:3.0a-3)
, libreoffice-hyphenation-sh (<< 1:3.1.0-3), libreoffice-hyphenation-sr (<< 1:3.1.0-3), libreoffice-hyphenation-de (<< 1:3.1.0-3), libreoffice-hyphenation-hu (<< 1:3.1.0-3), libreoffice-hyphenation-it (<< 1:3.1.0-3), libreoffice-hyphenation-sl (<< 1:3.1.0-3), libreoffice-hyphenation-af (<< 1:3.1.0-3), libreoffice-hyphenation-zu (<< 1:3.1.0-3), libreoffice-hyphenation-fr (<< 1:3.1.0-3), libreoffice-thesaurus-it (<< 2.0.7.gh.deb1-1.1), libreoffice-thesaurus-en-au (<< 2.1-5), libreoffice-thesaurus-pl (<< 1.5-3), libreoffice-thesaurus-en-us (<< 1:3.1.0-3), libreoffice-thesaurus-cs (<< 1:3.1.0-3), libreoffice-thesaurus-sk (<< 1:3.1.0-3), libreoffice-thesaurus-ru (<< 1:3.1.0-3), libreoffice-thesaurus-ne (<< 1:3.1.0-3), libreoffice-thesaurus-hu (<< 1:3.1.0-3), libreoffice-thesaurus-fr (<< 1:3.1.0-3), libreoffice-style-industrial, libreoffice-sdbc-postgresql
+Breaks: myspell-ru (<< 0.99g5-8.1), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-fi (<< 0.7-17.2), myspell-cs-cz (<< 20040229-4.1), myspell-el-gr (<< 0.3-1.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), hunspell-ar (<< 0.0.0+20080110-1.1), myspell-hu (<< 0.99.4-1.2), hunspell-gl-es (<< 2.2a-6), myspell-gv (<< 0.50-8), myspell-en-au (<< 2.1-5), myspell-fa (<< 0.20070816-2), hunspell-uz (<< 0.6-3.1), hunspell-ko (<< 0.3.3-1), hunspell-se (<< 1.0~beta6.20081222-1.1), hunspell-de-med (<< 20090825-1), hunspell-en-us (<< 20070829-3), myspell-sv-se (<< 1.3.8-6-2.2), myspell-sk (<< 0.5.5a-2.1), myspell-fo (<< 0.2.36-3), myspell-nl (<< 1:1.10-3), myspell-pt-br (<< 2009.03.30-1.1), myspell-pl (<< 20090830-1), myspell-pt-pt (<< 20090309-1.1), myspell-ga (<< 2.0-19), myspell-gd (<< 0.50-7), myspell-ku (<< 0.20.0-1.1), myspell-hr (<< 20060617-2), myspell-fr-gut (<< 1:1.0-26.1), myspell-eo (<< 2.1.2000.02.25-41), myspell-de-de-oldspell (<< 1:2-25.1), my
spell-da (<< 1.6.18-1.1), myspell-es (<< 1.10-7), myspell-de-at (<< 20071211-2), myspell-de-ch (<< 20071211-2), myspell-de-de (<< 20071211-2), hunspell-de-at (<< 20071211-2), hunspell-de-ch (<< 20071211-2), hunspell-de-de (<< 20071211-2), myspell-ca (<< 0.6-8), myspell-tl (<< 0.4-0-5), myspell-ne (<< 1.0-4.1), myspell-fr (<< 1.4-25), myspell-hy (<< 0.10.1-1.1), myspell-en-us (<< 1:3.1.0-3), myspell-en-gb (<< 1:3.1.0-3), myspell-en-za (<< 1:3.1.0-3), myspell-af (<< 1:3.1.0-3), myspell-it (<< 1:3.1.0-3), myspell-sw (<< 1:3.1.0-3), myspell-th (<< 1:3.1.0-3), hunspell-en-ca (<< 1:3.1.0-3), hunspell-ne (<< 1:3.1.0-3), hunspell-da (<< 1:3.1.0-3), hunspell-fr (<< 1:3.1.0-3), hunspell-vi (<< 1:3.1.0-3), hunspell-hu (<< 1:3.1.0-3), hunspell-sr (<< 1:3.1.0-3), hunspell-sh (<< 1:3.1.0-3), myspell-lv (<< 0.7.3-3.1), myspell-et (<< 1:20030606-12.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<< 2.0.10-3.1), libreoffice-hyphenation-hr (<< 20060617-2), libreoffice-hyphenation-pl (<< 1:3.0a-3)
, libreoffice-hyphenation-sh (<< 1:3.1.0-3), libreoffice-hyphenation-sr (<< 1:3.1.0-3), libreoffice-hyphenation-de (<< 1:3.1.0-3), libreoffice-hyphenation-hu (<< 1:3.1.0-3), libreoffice-hyphenation-it (<< 1:3.1.0-3), libreoffice-hyphenation-sl (<< 1:3.1.0-3), libreoffice-hyphenation-af (<< 1:3.1.0-3), libreoffice-hyphenation-zu (<< 1:3.1.0-3), libreoffice-hyphenation-fr (<< 1:3.1.0-3), libreoffice-thesaurus-it (<< 2.0.7.gh.deb1-1.1), libreoffice-thesaurus-en-au (<< 2.1-5), libreoffice-thesaurus-pl (<< 1.5-3), libreoffice-thesaurus-en-us (<< 1:3.1.0-3), libreoffice-thesaurus-cs (<< 1:3.1.0-3), libreoffice-thesaurus-sk (<< 1:3.1.0-3), libreoffice-thesaurus-ru (<< 1:3.1.0-3), libreoffice-thesaurus-ne (<< 1:3.1.0-3), libreoffice-thesaurus-hu (<< 1:3.1.0-3), libreoffice-thesaurus-fr (<< 1:3.1.0-3), libreoffice-style-industrial
Provides: libreofficeVER-bundled,
libreoffice2-core,
libreoffice-java,
@@ -489,7 +489,6 @@
${base-hsqldb-depends},
${java-common-depends},
${misc:Depends}
-Breaks: libreoffice-sdbc-postgresql (<< 1:0.7.6+OOo3.2.0-4~)
Suggests: unixodbc,
libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools,
libmysql-java | libpg-java | libjtds-java,
=== modified file 'control.postgresql.in'
--- a/control.postgresql.in 2010-10-12 00:40:55 +0000
+++ b/control.postgresql.in 2010-11-27 18:14:10 +0000
@@ -1,7 +1,7 @@
Package: libreofficeVER-sdbc-postgresql
Section: misc
Architecture: %OOO_BASE_ARCHS%
-Depends: ${shlibs:Depends}, libreofficeVER-core (>> 1:2.3.0~oog680m1),
+Depends: ${shlibs:Depends}, libreofficeVER-core (>> 1:3.3~),
${misc:Depends}
Conflicts: libreofficeVER-java-common (<< 2.3.0~src680m212), libreofficeVER-gcj (<< 2.3.0~src680m212), ure (<< 1.5.1+OOo3.1.1-15)
Suggests: postgresql
=== removed file 'patches/postgresql-sdbc-0-7-6-b.diff'
--- a/patches/postgresql-sdbc-0-7-6-b.diff 2010-11-16 19:33:41 +0000
+++ b/patches/postgresql-sdbc-0-7-6-b.diff 1970-01-01 00:00:00 +0000
@@ -1,98 +0,0 @@
-diff --git a/patches/postgresql/sdbc-postgresql.diff b/patches/postgresql/sdbc-postgresql.diff
-index f60fb4e..0b978e3 100644
---- libreoffice-3.3.0/libreoffice-build-3-2-99-3/patches/postgresql/sdbc-postgresql.diff
-+++ libreoffice-3.3.0/libreoffice-build-3-2-99-3/patches/postgresql/sdbc-postgresql.diff
-@@ -1,6 +1,5 @@
- ---
-- .../source/drivers/postgresql/DataAccess.xcu | 16 +
-- connectivity/source/drivers/postgresql/makefile.mk | 224 ++
-+ connectivity/source/drivers/postgresql/makefile.mk | 214 ++
- .../source/drivers/postgresql/postgresql-sdbc.uno | 2 +
- .../source/drivers/postgresql/postgresql.xcu | 50 +
- .../source/drivers/postgresql/pq_allocator.hxx | 225 ++
-@@ -70,8 +69,7 @@
- .../source/drivers/postgresql/pq_xview.hxx | 133 ++
- .../source/drivers/postgresql/pq_xviews.cxx | 304 +++
- .../source/drivers/postgresql/pq_xviews.hxx | 118 ++
-- 71 files changed, 21690 insertions(+), 0 deletions(-)
-- create mode 100644 connectivity/source/drivers/postgresql/DataAccess.xcu
-+ 70 files changed, 21664 insertions(+), 0 deletions(-)
- create mode 100644 connectivity/source/drivers/postgresql/makefile.mk
- create mode 100644 connectivity/source/drivers/postgresql/postgresql-sdbc.uno
- create mode 100644 connectivity/source/drivers/postgresql/postgresql.xcu
-@@ -143,35 +141,12 @@
- create mode 100644 connectivity/source/drivers/postgresql/pq_xviews.cxx
- create mode 100644 connectivity/source/drivers/postgresql/pq_xviews.hxx
-
--diff --git connectivity/source/drivers/postgresql/DataAccess.xcu connectivity/source/drivers/postgresql/DataAccess.xcu
--new file mode 100644
--index 0000000..6553971
----- /dev/null
--+++ connectivity/source/drivers/postgresql/DataAccess.xcu
--@@ -0,0 +1,16 @@
--+<?xml version="1.0" encoding="UTF-8"?>
--+<oor:node xmlns:oor="http://openoffice.org/2001/registry"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; oor:name="DataAccess" oor:package="org.openoffice.Office">
--+ <node oor:name="UserDefinedDriverSettings">
--+ <node oor:name="Postgresql Driver" oor:op="replace">
--+ <prop oor:name="DriverPageDisplayName">
--+ <value>Postgresql-SDBC Driver V PQ_SDBC_MAJOR.PQ_SDBC_MINOR.PQ_SDBC_MICRO</value>
--+ </prop>
--+ <prop oor:name="DriverTypeDisplayName">
--+ <value>postgresql</value>
--+ </prop>
--+ <prop oor:name="DriverDsnPrefix">
--+ <value>sdbc:postgresql:</value>
--+ </prop>
--+ </node>
--+ </node>
--+</oor:node>
--\ No newline at end of file
- diff --git connectivity/source/drivers/postgresql/makefile.mk connectivity/source/drivers/postgresql/makefile.mk
- new file mode 100644
- index 0000000..1afe9c1
- --- /dev/null
- +++ connectivity/source/drivers/postgresql/makefile.mk
--@@ -0,0 +1,224 @@
-+@@ -0,0 +1,214 @@
- +#*************************************************************************
- +#
- +# $RCSfile: makefile.mk,v $
-@@ -255,7 +230,7 @@ index 0000000..1afe9c1
- +
- +PQ_SDBC_MAJOR=0
- +PQ_SDBC_MINOR=7
--+PQ_SDBC_MICRO=6a
-++PQ_SDBC_MICRO=6b
- +.IF "$(SYSTEM_POSTGRESQL)" == "YES"
- +POSTGRESQL_MAJOR=`pg_config --version | awk '{ print $$2 }' | cut -d. -f1`
- +POSTGRESQL_MINOR=`pg_config --version | awk '{ print $$2 }' | cut -d. -f2`
-@@ -367,7 +342,6 @@ index 0000000..1afe9c1
- +
- +
- +$(DLLDEST)$/$(DRIVERNAME): \
--+ $(DLLDEST)$/DataAccess.xcu \
- + $(DLLDEST)$/postgresql.xcu \
- + $(DLLDEST)$/$(SHL1TARGET)$(DLLPOST) \
- + $(DLLDEST)$/$(SHL2TARGET)$(DLLPOST) \
-@@ -377,21 +351,12 @@ index 0000000..1afe9c1
- + $(SHL1TARGET)$(DLLPOST) \
- + $(SHL2TARGET)$(DLLPOST) \
- + $(SHL1TARGET)$(INI_EXT) \
--+ DataAccess.xcu \
- + postgresql.xcu
- +
- +$(DLLDEST)$/postgresql.xcu : postgresql.xcu
- + -rm -f $@
- + cat postgresql.xcu > $@
- +
--+$(DLLDEST)$/DataAccess.xcu : DataAccess.xcu
--+ -rm -f $@
--+ cat DataAccess.xcu | \
--+ sed s/PQ_SDBC_MAJOR/$(PQ_SDBC_MAJOR)/ | \
--+ sed s/PQ_SDBC_MINOR/$(PQ_SDBC_MINOR)/ | \
--+ sed s/PQ_SDBC_MICRO/$(PQ_SDBC_MICRO)/ > $@
--+
--+
- +strip :
- +.IF "$(GUI)"!="WNT"
- + strip $(DLLDEST)$/$(SHL1TARGET)$(DLLPOST) $(DLLDEST)$/$(SHL2TARGET)$(DLLPOST)
=== modified file 'patches/series'
--- a/patches/series 2010-11-16 19:33:41 +0000
+++ b/patches/series 2010-11-27 18:06:41 +0000
@@ -2,4 +2,3 @@
splash-progressbarcolor.diff
buildfix-patches.diff
hack-no-rm-fr-of-smoketest-userconfig.diff
-postgresql-sdbc-0-7-6-b.diff
=== modified file 'rules'
--- a/rules 2010-11-26 21:02:07 +0000
+++ b/rules 2010-11-28 16:47:51 +0000
@@ -82,7 +82,7 @@
STAMP_DIR=debian/stampdir
TARFILE_LOCATION=$(CURDIR)/ext-sources
export TARFILE_LOCATION
-USE_SOURCE_TARBALLS=y
+USE_SOURCE_TARBALLS=n
ifeq "$(DISTREL)" "lenny"
LENNY_BACKPORT=y
@@ -171,15 +171,12 @@
USE_SYSTEM_MDDS=y
USE_SYSTEM_VIGRA=y
USE_EXTERNAL_CXXLIBS=y
-USE_LIBWPD9=y
-ifeq "$(USE_LIBWPD9)" "n"
-LIBWPD8_MINVER= (>= 0.8.3-3)
-endif
USE_SYSTEM_SABLOT=n
USE_LIBXSLT=y
USE_EXTERNAL_MYTHES=y
USE_SYSTEM_ICU=y
ICU_MINVER= (>= 4.0)
+USE_SYSTEM_LIBWPD=y
USE_SYSTEM_LIBWPG=y
USE_SYSTEM_LIBWPS=y
USE_SYSTEM_XMLSEC=n
@@ -393,6 +390,9 @@
DEBSRC_VERSION=1.0
USE_SYSTEM_REDLAND=n
USE_SYSTEM_TEXTCAT_DATA=n
+ USE_SYSTEM_LIBWPD=n
+ USE_SYSTEM_LIBWPG=n
+ USE_SYSTEM_LIBWPS=n
endif
# the archive only accepts bzip2 compressed members on 3.0 (quilt)
@@ -1123,13 +1123,10 @@
endif
ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
- ifeq "$(USE_LIBWPD9)" "y"
+ ifeq "$(USE_SYSTEM_LIBWPD)" "y"
BUILD_DEPS += , libwpd-dev (>= 0.9.0)
- CONFIGURE_FLAGS += --with-unstable-wp
- else
- BUILD_DEPS += , libwpd8-dev $(LIBWPD8_MINVER)
- endif
CONFIGURE_FLAGS+= --with-system-libwpd
+ endif
ifeq "$(USE_SYSTEM_SABLOT)" "y"
BUILD_DEPS += , libsablot0-dev (>= 1.0.2-4)
CONFIGURE_FLAGS += --with-system-sablot
@@ -1139,17 +1136,11 @@
CONFIGURE_FLAGS += --with-system-mythes
endif
ifeq "$(USE_SYSTEM_LIBWPS)" "y"
- BUILD_DEPS += , libwps-dev
- ifeq "$(USE_LIBWPD9)" "y"
- BUILD_DEPS += (>= 0.2.0)
- endif
+ BUILD_DEPS += , libwps-dev (>= 0.2.0)
CONFIGURE_FLAGS += --with-system-libwps
endif
ifeq "$(USE_SYSTEM_LIBWPG)" "y"
- BUILD_DEPS += , libwpg-dev
- ifeq "$(USE_LIBWPD9)" "y"
- BUILD_DEPS += (>= 0.2.0)
- endif
+ BUILD_DEPS += , libwpg-dev (>= 0.2.0)
CONFIGURE_FLAGS += --with-system-libwpg
endif
endif
@@ -3031,9 +3022,9 @@
ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
rm -rf $(PKGDIR)-sdbc-postgresql
- mkdir -p $(PKGDIR)-sdbc-postgresql/$(OOBRANDDIR)/share/extensions/postgresql-sdbc-$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g).zip
- cd $(PKGDIR)-sdbc-postgresql/$(OOBRANDDIR)/share/extensions/postgresql-sdbc-$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g).zip && \
- unzip $(CURDIR)/$(SOURCE_TREE)/connectivity/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/lib/postgresql-sdbc-$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g).zip
+ mkdir -p $(PKGDIR)-sdbc-postgresql/$(OOBRANDDIR)/share/extensions/postgresql-sdbc-$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g)
+ cd $(PKGDIR)-sdbc-postgresql/$(OOBRANDDIR)/share/extensions/postgresql-sdbc-$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g) && \
+ unzip $(CURDIR)/$(SOURCE_TREE)/connectivity/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/lib/postgresql-sdbc-$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g).oxt
endif
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
@@ -3621,11 +3612,12 @@
fi; \
done; \
done
- if [ -s $(OOO_BUILD_TREE)/ChangeLog ]; then \
- dh_installchangelogs -s -k $(OOO_BUILD_TREE)/ChangeLog; \
- else \
- dh_installchangelogs -s -k; \
- fi
+ dh_installchangelogs -s -k
+ifeq "$(SOURCE_TARBALLS)" "y"
+ for i in pkg in $(ARCH_DEP_PACKAGES) ; do \
+ debian/scripts/install-upstream-changelogs $$pkg $(OOO_BUILD_TARBALL_VERSION)
+ done
+endif
dh_installmime -s
dh_installmenu -s
ifeq "$(BUILD_JARS_NATIVE)" "y"
@@ -3770,7 +3762,7 @@
ifeq "$(PACKAGE_BASE)" "y"
ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
dh_gencontrol -plibreoffice$(VER)-sdbc-postgresql -- \
- -v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g | sed -e s/a$$//)+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
+ -v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g | sed -e s/b$$//)+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
endif
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
dh_gencontrol -plibreoffice$(VER)-mysql-connector -- \
@@ -3847,11 +3839,12 @@
ln -sf openoffice.1.gz $$i.gz; \
fi; \
done
- if [ -s $(OOO_BUILD_TREE)/ChangeLog ]; then \
- dh_installchangelogs -i -k $(OOO_BUILD_TREE)/ChangeLog; \
- else \
- dh_installchangelogs -i -k; \
- fi
+ dh_installchangelogs -i -k
+ifeq "$(SOURCE_TARBALLS)" "y"
+ for i in pkg in $(ARCH_INDEP_PACKAGES) ; do \
+ debian/scripts/install-upstream-changelogs $$pkg $(OOO_BUILD_TARBALL_VERSION)
+ done
+endif
dh_installmime -i
dh_lintian -i
dh_bugfiles -i -A
=== added file 'scripts/install-upstream-changelogs'
--- a/scripts/install-upstream-changelogs 1970-01-01 00:00:00 +0000
+++ b/scripts/install-upstream-changelogs 2010-11-27 18:20:06 +0000
@@ -0,0 +1,83 @@
+#!/bin/sh
+
+pkg=$1
+v=$2
+
+for m in artwork base bootstrap calc components extensions extras \
+ filters help impress l10n libs-core libs-extern libs-extern-sys \
+ libs-gui postprocess sdk testing ure writer; do \
+ if echo $pkg | grep -q $m; then
+ if [ "$m" = "l10n" -o "$m" = "help" ]; then
+ continue;
+ fi
+ install_cls="$m"
+ fi
+ if echo $pkg | grep -q l10n; then
+ install_cls="$install_cls l10n"
+ fi
+ if echo $pkg | grep -q help; then
+ install_cls="$install_cls help"
+ fi
+ if echo $pkg | grep -q style; then
+ install_cls="$install_cls artwork"
+ fi
+ if [ "$pkg" = "libreoffice-common" -o "$pkg" = "libreoffice-core" ]; then
+ install_cls="$install_cls components"
+ fi
+ if [ "$pkg" = "libreoffice-common" ]; then
+ install_cls="$install_cls extras"
+ fi
+ if [ "$pkg" = "libreoffice-common" -o "$pkg" = "libreoffice-core" ] || \
+ echo "$pkg" | grep -q filter; then
+ install_cls="$install_cls filters"
+ fi
+ if [ "$pkg" = "libreoffice-core" ]; then
+ install_cls="$install_cls libs-core libs-extern libs-extern-sys libs-gui"
+ fi
+ if [ "$pkg" = "libreoffice-dev" -o "$pkg" = "libreoffice-dev-doc" ]; then
+ install_cls="$install_cls sdk"
+ fi
+ if [ "$pkg" = "python-uno" ] || [ "$pkg" = "uno-libs3" ]; then
+ install_cls="$install_cls ure"
+ fi
+ if [ "$pkg" = "libreoffice-officebean" ]; then
+ install_cls="$install_cls components"
+ fi
+ if [ "$pkg" = "mozilla-libreoffice" ]; then
+ install_cls="$install_cls components"
+ fi
+ if [ "$pkg" = "libreoffice-ogltrans" ]; then
+ install_cls="$install_cls impress"
+ fi
+ if [ "$pkg" = "libreoffice-wiki-publisher" -o \
+ "$pkg" = "libreoffice-report-builder" -o \
+ "$pkg" = "libreoffice-report-builder-bin" -o \
+ "$pkg" = "libreoffice-presentation-minimizer" -o \
+ "$pkg" = "libreoffice-presenter-console" -o \
+ "$pkg" = "libreoffice-pdfimport" -o \
+ "$pkg" = "libreoffice-mysql-connector" ]; then
+ install_cls="$install_cls extensions"
+ fi
+ if [ "$pkg" = "ttf-opensymbol" ]; then
+ install_cls="$install_cls extras"
+ fi
+ if [ "$pkg" = "libreoffice-gtk" -o "$pkg" = "libreoffice-kde" ]; then
+ install_cls="$install_cls libs-gui"
+ fi
+ if [ "$pkg" = "libreoffice-gnome" -o "$pkg" = "libreoffice-kab" -o \
+ "$pkg" = "libreoffice-evolution" ]; then
+ install_cls="$install_cls libs-core"
+ fi
+
+ for c in $install_cls; do
+ # we need to extract them from the tarball as we can't use them
+ # from the tree. Due to the path the same it only gets the last
+ # one unpacked there.
+ tar xfvj sources/libreoffice-$m-$v.tar.bz2 \
+ libreoffice-$m-$v/ChangeLog
+ mkdir -p debian/$pkg/usr/share/doc/$pkg
+ install -m644 libreoffice-$m-$v/ChangeLog \
+ debian/$pkg/usr/share/doc/$pkg/changelog.$m
+ rm -rf libreoffice-$m-$v
+ done
+done
Reply to: