[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.3-5-65-gca0042a
The following commit has been merged in the debian-experimental-3.6 branch:
commit ca0042a0364b917a1a2dbc541f2043281765ef54
Merge: ddc6cabc53b0f8c7b91ec382ce1e1b6bf6d8285b f031ba59c33d93b1dc4497d118f750d13a175d02
Author: Rene Engelhard <rene@debian.org>
Date: Sun May 27 17:34:22 2012 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-3.6
diff --combined changelog
index f0fce3e,77c7a7a..27a79df
--- a/changelog
+++ b/changelog
@@@ -1,24 -1,40 +1,55 @@@
+libreoffice (1:3.6.0~alpha0~git20120527-1) UNRELEASED; urgency=low
+
+ * new upstream snapshot
+ - fixes splashscreen location in multi-monitor setups
+ (closes: #657444, #431473)
+
+ * debian/patches/build-dont-run-slowcheck.diff: as name says
+
+ * debian/rules:
+ - new conditionals for: doxygen, libcdr, liblcms2
+ - remove liblucene2-java stuff; now clucene is used
+ - build-depend on libxml2-utils, xmllint now needed
+
+ -- Rene Engelhard <rene@debian.org> Thu, 03 May 2012 13:44:05 +0200
+
- libreoffice (1:3.5.3-3) UNRELEASED; urgency=low
+ libreoffice (1:3.5.3-5) unstable; urgency=low
+ * debian/rules:
+ - don't specify --with-system-mozilla-headers if not building
+ the nsplugin...
+
+ -- Rene Engelhard <rene@debian.org> Tue, 22 May 2012 14:56:19 +0200
+
+ libreoffice (1:3.5.3-4) unstable; urgency=low
+
+ * debian/rules:
+ - really disable -gcj package completely (not just empty package)
+ - surrender and disable mozilla plugin. broken again for whatever
+ non-LO reason.
+
+ -- Rene Engelhard <rene@debian.org> Mon, 21 May 2012 18:19:22 +0200
+
+ libreoffice (1:3.5.3-3) unstable; urgency=low
+
+ [ Rene Engelhard ]
* debian/patches/ignore-sc_cellrangesbase-fails.diff:
make .IGNORE actually work
-
- -- Rene Engelhard <rene@debian.org> Tue, 08 May 2012 11:37:43 +0200
+ * debian/patches/wiki-publisher-add-missing-xsls.diff:
+ add missing .xsls for -wiki-publisher
+ * debian/rules:
+ - (temporarily) stop building -gcj even on kfreebsd-* to be able to get into
+ testing (otherwise gcc-defaults is blocking...)
+ * debian/mysqlcppconn-mysqlclient-SONAME.diff: move ...
+ * debian/mysqlcppconn-libmysqlclient-SONAME.diff: ... and dynamically determine
+ libmysqlclient_r.so.XX in internal mysqlcppconn
+
+ [ Andreas Beckmann ]
+ * debian/shell-lib-extension.sh: set HOME to $INSTDIR also for
+ unopkg list --bundled (Closes: #669271). Most probably also
+ closes: #619263 as $HOME isn't touched anymore.
+
+ -- Rene Engelhard <rene@debian.org> Tue, 15 May 2012 00:22:05 +0200
libreoffice (1:3.5.3-2) unstable; urgency=low
diff --combined control
index 8f31ee2,d22aa0e..5e035e7
--- a/control
+++ b/control
@@@ -3,7 -3,7 +3,7 @@@ Section: editor
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <rene@debian.org>
- Build-Depends: dpkg-dev (>= 1.16.1), 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, libcups2-dev, libarchive-zip-perl, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, libxml-parser-perl, gperf, po-debconf, bc, wget | curl, gcc-4.4 [mips mipsel], g++-4.4 [mips mipsel], libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], doxygen, libpoppler-dev (>= 0.8.0), libpoppler-private-dev, libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!alpha !armel !sparc], libexttextcat-dev (>= 3.1.1), libjpeg-dev, libxml2-dev, libxml2-utils, libxslt1-dev, libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev, libxrender-dev, libpng12-dev, libssl-dev, librsvg2-dev, libdb-dev, python (>= 2.6.6-3+squeeze4), pyth
on-dev (>= 2.6), python3-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), gdb, junit4 (>= 4.8.2-2), openjdk-6-jdk (>= 6b23~pre8-2) [alpha amd64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc], openjdk-7-jdk [ia64], gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386], ant (>= 1.7.0), ant-optional (>= 1.7.0), g++-mingw-w64-i686 [i386 amd64], libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, libbase-java [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libsac-java [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libflute-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebs
d-amd64 !kfreebsd-i386], libpentaho-reporting-flow-engine-java (>= 0.9.4) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>= 0.2.10) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libloader-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libformula-java (>= 1.1.7) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], librepository-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libserializer-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, javahelper (>= 0.37~), libnss3-dev (>= 3.12.3), xulrunner-dev [!s390x], dmake (>= 1:4.11), libhunspell-dev (>= 1.1.5-2
), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev (>= 0.5.0), libvigraimpex-dev, libsampleicc-dev, libicc-utils-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libvisio-dev, libcdr-dev, libcmis-dev, liblcms2-dev, libicu-dev (>= 4.0), libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4:4.8), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~), libebook1.2-dev [!armel !armhf !powerpc !powerpcspe !ppc64], libpq-dev (>= 9.0~), libxrandr-dev, 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.70), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libglib2.0-dev (>= 2.15.0), libgconf2-dev, liborbit2-dev, gettext, make (>= 3.81-8.2), libldap2-dev
-Build-Depends: dpkg-dev (>= 1.16.1), 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, libcups2-dev, libarchive-zip-perl, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, libxml-parser-perl, gperf, po-debconf, bc, wget | curl, gcc-4.4 [mips mipsel], g++-4.4 [mips mipsel], libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libpoppler-private-dev, libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!alpha !armel !sparc], libexttextcat-dev (>= 3.1.1), libjpeg-dev, libxml2-dev, libxslt1-dev, libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev, libxrender-dev, libpng12-dev, libssl-dev, librsvg2-dev, libdb-dev, python (>= 2.6.6-3+squeeze4), python-dev (>= 2.6), python3
-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), gdb, junit4 (>= 4.8.2-2), openjdk-6-jdk (>= 6b23~pre8-2) [alpha amd64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc], openjdk-7-jdk [ia64], gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386], ant (>= 1.7.0), ant-optional (>= 1.7.0), g++-mingw-w64-i686 [i386 amd64], libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, libbase-java [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libsac-java [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libflute-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386],
libpentaho-reporting-flow-engine-java (>= 0.9.4) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>= 0.2.10) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libloader-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libformula-java (>= 1.1.7) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], librepository-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libserializer-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, javahelper (>= 0.37~), libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>=
4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev (>= 0.5.0), libvigraimpex-dev, libsampleicc-dev, libicc-utils-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libvisio-dev, libcmis-dev, libicu-dev (>= 4.0), libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4:4.8), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~), libebook1.2-dev [!armel !armhf !powerpc !powerpcspe !ppc64], libpq-dev (>= 9.0~), 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.70), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libglib2.0-dev (>= 2.15.0), libgconf2-dev, liborbit2-dev, gettext, make (>= 3.81-8.2), libldap2-dev
++Build-Depends: dpkg-dev (>= 1.16.1), 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, libcups2-dev, libarchive-zip-perl, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, libxml-parser-perl, gperf, po-debconf, bc, wget | curl, gcc-4.4 [mips mipsel], g++-4.4 [mips mipsel], libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], doxygen, libpoppler-dev (>= 0.8.0), libpoppler-private-dev, libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!alpha !armel !sparc], libexttextcat-dev (>= 3.1.1), libjpeg-dev, libxml2-dev, libxml2-utils, libxslt1-dev, libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev, libxrender-dev, libpng12-dev, libssl-dev, librsvg2-dev, libdb-dev, python (>= 2.6.6-3+squeeze4), pyth
on-dev (>= 2.6), python3-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), gdb, junit4 (>= 4.8.2-2), openjdk-6-jdk (>= 6b23~pre8-2) [alpha amd64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc], openjdk-7-jdk [ia64], gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386], ant (>= 1.7.0), ant-optional (>= 1.7.0), g++-mingw-w64-i686 [i386 amd64], libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, libbase-java [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libsac-java [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libflute-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebs
d-amd64 !kfreebsd-i386], libpentaho-reporting-flow-engine-java (>= 0.9.4) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>= 0.2.10) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libloader-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libformula-java (>= 1.1.7) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], librepository-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libserializer-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, javahelper (>= 0.37~), libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4
), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev (>= 0.5.0), libvigraimpex-dev, libsampleicc-dev, libicc-utils-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libvisio-dev, libcdr-dev, libcmis-dev, liblcms2-dev, libicu-dev (>= 4.0), libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4:4.8), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~), libebook1.2-dev [!armel !armhf !powerpc !powerpcspe !ppc64], libpq-dev (>= 9.0~), libxrandr-dev, 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.70), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libglib2.0-dev (>= 2.15.0), libgconf2-dev, liborbit2-dev, gettext, make (>= 3.81-8.2), 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], libc0.1-dev (= 2.13-26) [kfreebsd-i386 kfreebsd-amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, 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 kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-2) [hppa kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-3) [hppa kfreebsd-i386 kfreebsd-amd64], g++-4.6 (= 4.6.1-10), g++-4.6 (= 4.6.1-11), gcc (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64], g++ (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64], base-files (= 6.0), base-files (= 6.0squeeze1), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.9.1
@@@ -3113,40 -3113,6 +3113,6 @@@ Description: LibreOffice UNO runtime en
.
This package contains the (detached) debug symbols for the URE.
- Package: libreoffice-gcj
- Architecture: hppa kfreebsd-amd64 kfreebsd-i386
- Section: java
- Depends: ${shlibs:Depends}, gcj-jre, libreoffice-core (= ${binary:Version}), libreoffice-java-common (= ${source:Version}), ${java:Depends}, ${java-gcj-depends}, ${misc:Depends}
- Enhances: libreoffice-writer, libreoffice-base
- Description: office productivity suite -- Java libraries for GIJ
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the .jars from libreoffice-java-common compiled to
- native to make the Java features of LibreOffice faster when using gij.
- .
- This package has NO effect with Suns/Blackdowns/IBMs/etc. JDK.
-
- Package: mozilla-libreoffice
- Section: net
- Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 sparc kfreebsd-amd64 kfreebsd-i386
- Enhances: iceape-browser,
- iceweasel,
- mozilla-browser,
- firefox,
- libreoffice,
- libreoffice-core
- Depends: ${shlibs:Depends}, libreoffice-core (>= 1:3.5.0~beta~), ${misc:Depends}
- Recommends: iceweasel | firefox | iceape-browser | konqueror-nsplugins, libreoffice-writer, libreoffice-calc, libreoffice-draw, libreoffice-impress, libreoffice-math, libreoffice-base
- Conflicts: mozilla-openoffice.org (<< 1:3.3.0~)
- Replaces: mozilla-openoffice.org
- Description: office productivity suite -- Mozilla plugin
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains a Mozilla/Netscape compatible plugin which can handle
- all OOo documents.
-
Package: libreoffice-ogltrans
Section: graphics
Priority: extra
diff --combined patches/series
index 5c7d11e,473592a..42d4e78
--- a/patches/series
+++ b/patches/series
@@@ -4,26 -4,38 +4,26 @@@ gcj-safe-jni-h-include.dif
jurt-soffice-location.diff
split-binfilters-and-evo.diff
debian-debug.diff
-rhino-build-optional.diff
+#rhino-build-optional.diff
disable-dynamic-list-cpp.diff
fix-system-lpsolve-build.diff
install-fixes.diff
-smoketest-only-en-US.diff
mention-java-common-package.diff
help-msg-add-package-info.diff
sensible-lomua.diff
sensible-browser.diff
reportdesign-mention-package.diff
jdbc-driver-classpaths.diff
- mysqlcppconn-mysqlclient-SONAME.diff
+ mysqlcppconn-libmysqlclient-SONAME.diff
make-pyuno-work-with-system-wide-module-install.diff
-search-usr-share-for-images.diff
+#search-usr-share-for-images.diff
make-package-modules-not-suck.diff
-fix-ARM-detection-in-set-soenv.diff
-propagate-gb_FULLDEPS.diff
-disable-unoapi-subsequentcheck-for-now.diff
+#disable-unoapi-subsequentcheck-for-now.diff
mediwiki-oor-replace.diff
pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
debian-hardened-buildflags.diff
gtk3-hack-explicit-gmodule.diff
-gcc-4.7.diff
-gcc-4.7-i386.diff
-gcc-4.7-amd64.diff
-tests-fix-build-with-jdk7.diff
-lp-926940-visio-mime-for-draw.diff
-gcc-4.4.diff
-lp-904212-add-missing-mimetypes-to-impress.desktop.diff
+pyuno-py3-module.diff
+#tests-fix-build-with-jdk7.diff
ignore-sc_cellrangesbase-fails.diff
-mozilla-profile-absolute-paths.diff
-more-robust-nss-initialization.diff
-fix-bean.diff
-wiki-publisher-add-missing-xsls.diff
+build-dont-run-slowcheck.diff
diff --combined rules
index c44ed70,56a642d..33c2801
--- a/rules
+++ b/rules
@@@ -65,7 -65,7 +65,7 @@@ SOURCE_TREE=
STAMP_DIR=debian/stampdir
TARFILE_LOCATION=$(CURDIR)/src
export TARFILE_LOCATION
-USE_SOURCE_TARBALLS=y
+USE_SOURCE_TARBALLS=n
USE_GIT_TARBALLS=n
ifeq "$(USE_GIT_TARBALLS)" "y"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
@@@ -155,7 -155,6 +155,7 @@@ SYSTEM_STUFF += ic
ICU_MINVER= (>= 4.0)
SYSTEM_STUFF += libwpd libwpg libwps
SYSTEM_STUFF += libvisio
+SYSTEM_STUFF += libcdr
#SYSTEM_STUFF += xmlsec
BUILD_CAIROCANVAS=y
SYSTEM_STUFF += cairo
@@@ -188,6 -187,7 +188,6 @@@ ifeq "$(ENABLE_JAVA)" "y
# It does *NOT* fail with _plain_ saxon 9.0.0.8 built with OOos build.xml
# for UOF, but still for e.g. M$.
#SYSTEM_STUFF += saxon
- SYSTEM_STUFF += lucene
endif
SYSTEM_STUFF += lpsolve
USE_SHARED_LPSOLVE=y
@@@ -199,7 -199,6 +199,7 @@@ NEON_SECTYPE=gnutl
NEONSONR=27
SYSTEM_STUFF += redland
PACKAGE_SDK=y
+PACKAGE_SDK_DOCS=y
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(JDK)" "openjdk"
RUN_MAKE_CHECK=y
@@@ -259,7 -258,10 +259,10 @@@ ENABLE_GCONF=
ENABLE_GIO=y
ENABLE_RANDR=y
ifeq "$(BUILD_GTK)" "y"
- PACKAGE_NSPLUGIN=y
+ PACKAGE_NSPLUGIN=n
+ ifeq "$(PACKAGE_NSPLUGIN)" "y"
+ SYSTEM_STUFF += mozilla-headers
+ endif
endif
PACKAGE_BASE=y
ENABLE_GRAPHITE=y
@@@ -296,11 -298,7 +299,10 @@@ SYSTEM_STUFF += d
SYSTEM_STUFF += poppler
SYSTEM_STUFF += libpng
SYSTEM_STUFF += nss
- SYSTEM_STUFF += mozilla-headers
SYSTEM_STUFF += sampleicc
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=661703
+#SYSTEM_STUFF += clucene
+SYSTEM_STUFF += lcms2
PACKAGE_UNOWINREG_DLL=y
ifeq "$(DEB_VENDOR)" "Debian"
BUILD_UNOWINREG_DLL=y
@@@ -455,7 -453,7 +457,7 @@@ ifeq (ia64,$(findstring ia64,$(OOO_OPEN
endif
ifneq (,$(filter $(DEB_HOST_ARCH),$(OOO_GCJ_ARCHS)))
- BUILD_JARS_NATIVE=y
+ BUILD_JARS_NATIVE=n
endif
ifeq "$(PACKAGE_NSPLUGIN)" "y"
@@@ -492,7 -490,7 +494,7 @@@ endi
# Debian Squeeze
ifeq "$(SQUEEZE_BACKPORT)" "y"
BUGS=mailto:debian-backports@lists.debian.org
- SYSTEM_STUFF := $(filter-out libwpd libwpg libwps mythes mdds libexttextcat graphite jfreereport libvisio poppler libcmis, $(SYSTEM_STUFF))
+ SYSTEM_STUFF := $(filter-out libwpd libwpg libwps mythes mdds libexttextcat graphite jfreereport libvisio poppler libcmis libcdr, $(SYSTEM_STUFF))
JUNIT_MIN_VER=
PARALLEL_BUILD=n
ENABLE_PDFIMPORT=n
@@@ -521,13 -519,6 +523,13 @@@ endi
ifneq "$(PACKAGE_SDK)" "y"
CONFIGURE_FLAGS += --disable-odk
+ ifneq "$(PACKAGE_SDK_DOCS)" "y"
+ CONFIGURE_FLAGS += --without-doxygen
+ endif
+else
+ ifeq "$(PACKAGE_SDK_DOCS)" "y"
+ BUILD_DEPS += , doxygen
+ endif
endif
ifneq "$(ENABLE_MINIMIZER)" "y"
@@@ -574,7 -565,7 +576,7 @@@ ifneq (,$(filter jpeg, $(SYSTEM_STUFF))
BUILD_DEPS += , libjpeg-dev
endif
ifneq (,$(filter libxml, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libxml2-dev
+ BUILD_DEPS += , libxml2-dev, libxml2-utils
BUILD_DEPS += , libxslt1-dev
DBG_DBG_SUGGESTS+= , libxslt1-dbg
endif
@@@ -946,10 -937,6 +948,10 @@@ ifneq (,$(filter sampleicc, $(SYSTEM_ST
BUILD_DEPS += , libsampleicc-dev, libicc-utils-dev
endif
+ifneq (,$(filter clucene, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libclucene-dev
+endif
+
ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
ifneq (,$(filter libwpd, $(SYSTEM_STUFF)))
BUILD_DEPS += , libwpd-dev (>= 0.9.0)
@@@ -969,19 -956,12 +971,19 @@@
ifneq (,$(filter libvisio, $(SYSTEM_STUFF)))
BUILD_DEPS += , libvisio-dev
endif
+ ifneq (,$(filter libcdr, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libcdr-dev
+ endif
ifneq (,$(filter libcmis, $(SYSTEM_STUFF)))
BUILD_DEPS += , libcmis-dev
endif
endif
CONFIGURE_FLAGS += --with-external-thes-dir=$(THES_DIR)
+ifneq (,$(filter lcms2, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , liblcms2-dev
+endif
+
ifneq (,$(filter icu, $(SYSTEM_STUFF)))
BUILD_DEPS += , libicu-dev $(ICU_MINVER)
endif
@@@ -1020,7 -1000,11 +1022,11 @@@ endi
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
CONFIGURE_FLAGS += --enable-ext-mysql-connector
ifneq (,$(filter mysql, $(SYSTEM_STUFF)))
+ ifneq (,$(filter mysql-cppconn, $(SYSTEM_STUFF)))
BUILD_DEPS += , libmysqlclient-dev
+ else
+ BUILD_DEPS += , libmysqlclient-dev (>= 5.5~)
+ endif
endif
ifneq (,$(filter mysql-cppconn, $(SYSTEM_STUFF)))
BUILD_DEPS += , libmysqlcppconn-dev $(MYSQLCPPCONN_MINVER)
@@@ -1074,6 -1058,13 +1080,6 @@@ ifneq "$(BUILD_PYUNO)" "y
endif
ifeq "$(ENABLE_JAVA)" "y"
- ifneq (,$(filter lucene, $(SYSTEM_STUFF)))
- BUILD_DEPS += , liblucene2-java (>= 2.3.2)$(OOO_NO_JAVA_ARCHS)
- LUCENE_DEPENDS = liblucene2-java (>= 2.3.2)
- # safety measure; e.g. lucene 2.9 index cannot be handled by lucene 2.4
- LUCENE_CONFLICTS = liblucene2-java (<< $(shell dpkg -l liblucene2-java | grep ^ii | awk '{ print $$3 }' | cut -d. -f1,2)~)
- CONFIGURE_FLAGS += --with-lucene-core-jar=/usr/share/java/lucene-core.jar --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar
- endif
ifneq (,$(filter hsqldb, $(SYSTEM_STUFF)))
BUILD_DEPS += , libhsqldb-java $(HSQLDB_MINVER)$(OOO_NO_JAVA_ARCHS)
BASE_HSQLDB_DEPENDS = libhsqldb-java $(HSQLDB_MINVER), libhsqldb-java (<< $(HSQLDB_TOONEWVER)~)
@@@ -1394,8 -1385,12 +1400,12 @@@ endi
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
>> debian/control < debian/control.ure.in
ifeq "$(ENABLE_JAVA)" "y"
+ ifneq "$(OOO_GCJ_JDK_ARCHS)" ""
+ ifeq "$(BUILD_JARS_NATIVE)" "y"
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
>> debian/control < debian/control.gcj.in
+ endif
+ endif
endif
ifneq "$(OOO_NSPLUGIN_ARCHS)" ""
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
@@@ -1619,8 -1614,11 +1629,8 @@@ ifeq "$(BUILD_PYUNO)" "y
# then...
rm -rf $(SOURCE_TREE)/pyuno-py3
cp -ra $(SOURCE_TREE)/pyuno $(SOURCE_TREE)/pyuno-py3
- cd $(SOURCE_TREE)/pyuno-py3; \
- rm -rf $(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT); \
- . $(CURDIR)/$(SOURCE_TREE)/Env.Host.sh; \
- PATH=$(BUILD_PATH) PYTHON=$(PYTHON3) PYTHON_CFLAGS=$(shell pkg-config --cflags python-$(PY3MAJOR).$(PY3MINOR)mu) PYTHON_LIBS=$(shell pkg-config --libs python-$(PY3MAJOR).$(PY3MINOR)mu) \
- ../solenv/bin/build.pl # NO DELIVER!
+ rm -rf pyuno-py3/$(shell make -s cmd cmd="env | grep OUTPATH\= | cut -d= -f2" | grep -v custom)$(shell make -s cmd cmd="env | grep PROEXT\= | cut -d= -f2" | grep -v custom)
+ $(MAKE) cmd cmd="cd pyuno-py3; PYTHON=$(PYTHON3) PYTHON_CFLAGS=$(shell pkg-config --cflags python-$(PY3MAJOR).$(PY3MINOR)mu) PYTHON_LIBS=$(shell pkg-config --libs python-$(PY3MAJOR).$(PY3MINOR)mu) ../solenv/bin/build.pl"
endif
endif
@@@ -1676,6 -1674,7 +1686,6 @@@ $(STAMP_DIR)/install: $(STAMP_DIR)/buil
# install LibreOffice.
cd $(SOURCE_TREE)/; \
- . $(CURDIR)/$(SOURCE_TREE)/Env.Host.sh; \
PATH=$(BUILD_PATH) \
DESTDIR=$(CURDIR)/debian/tmp \
$(MAKE) distro-pack-install
@@@ -2191,7 -2190,7 +2201,7 @@@ ifeq "$(BUILD_PYUNO)" "y
| sed -e "s/$(PYMAJOR).$(PYMINOR)/$(PY3MAJOR).$(PY3MINOR)/" \
> debian/python3-uno/$(OODIR)/program/pythonloader.unorc
for i in pyuno.so pythonloader.uno.so libpyuno.so; do \
- install -m644 $(SOURCE_TREE)/pyuno-py3/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/lib/$$i \
+ install -m644 $(SOURCE_TREE)/pyuno-py3/$(shell make -s cmd cmd="env | grep OUTPATH\= | cut -d= -f2" | grep -v custom)$(shell make -s cmd cmd="env | grep PROEXT\= | cut -d= -f2" | grep -v custom)/lib/$$i \
debian/python3-uno/$(OODIR)/program/$$i; \
done
cp debian/python-uno/$(OODIR)/program/pythonloader.py \
@@@ -2270,7 -2269,7 +2280,7 @@@ ifeq "$(PACKAGE_SDK)" "y
# install gsicheck into -dev
mkdir -p $(PKGDIR)-dev/$(OODIR)/program
- install -m755 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/bin/gsicheck \
+ install -m755 $(SOURCE_TREE)/solver/$(shell make -s cmd cmd="env | grep OUTPATH\= | cut -d= -f2" | grep -v custom)$(shell make -s cmd cmd="env | grep PROEXT\= | cut -d= -f2" | grep -v custom)/bin/gsicheck \
$(PKGDIR)-dev/$(OODIR)/program/gsicheck.bin
( \
echo '#! /bin/sh'; \
@@@ -2306,7 -2305,7 +2316,7 @@@ ifeq "$(PACKAGE_SDK)" "y
ifeq "$(ENABLE_JAVA)" "y"
# install the UNO Java sources for e.g. eclipse
mkdir -p $(CURDIR)/$(PKGDIR)-dev/usr/share/java
- cd $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin && \
+ cd $(SOURCE_TREE)/solver/$(shell make -s cmd cmd="env | grep OUTPATH\= | cut -d= -f2" | grep -v custom)$(shell make -s cmd cmd="env | grep PROEXT\= | cut -d= -f2" | grep -v custom)/pck && \
for i in juh jurt jut ridl unoloader; do \
cp $${i}_src.zip \
$(CURDIR)/$(PKGDIR)-dev/usr/share/java; \
@@@ -2360,9 -2359,9 +2370,9 @@@ endi
#ifeq "$(PACKAGE_SDK)" "y"
# # install gengal stuff into -dev
# mkdir -p $(PKGDIR)-dev/$(OODIR)/program
-# install -m755 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin/gengal \
+# install -m755 $(SOURCE_TREE)/svx/$(shell make -s cmd cmd="env | grep OUTPATH\= | cut -d= -f2" | grep -v custom)$(shell make -s cmd cmd="env | grep PROEXT\= | cut -d= -f2" | grep -v custom)/bin/gengal \
# $(PKGDIR)-dev/$(OODIR)/program/gengal
-# install -m755 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin/gengal.bin \
+# install -m755 $(SOURCE_TREE)/svx/$(shell make -s cmd cmd="env | grep OUTPATH\= | cut -d= -f2" | grep -v custom)$(shell make -s cmd cmd="env | grep PROEXT\= | cut -d= -f2" | grep -v custom)/bin/gengal.bin \
# $(PKGDIR)-dev/$(OODIR)/program/gengal.bin
#endif
@@@ -2747,7 -2746,7 +2757,7 @@@ endi
#ifeq "$(PACKAGE_SDK)" "y"
# # install gengal stuff into -dev
# mkdir -p $(PKGDIR)-dev/$(OODIR)/program
-# install -m644 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin/gengalrc \
+# install -m644 $(SOURCE_TREE)/svx/$(shell make -s cmd cmd="env | grep OUTPATH\= | cut -d= -f2" | grep -v custom)$(shell make -s cmd cmd="env | grep PROEXT\= | cut -d= -f2" | grep -v custom)/bin/gengalrc \
# $(PKGDIR)-common/$(OODIR)/program/gengalrc
#endif
touch $@
@@@ -2893,6 -2892,7 +2903,6 @@@ endi
-V'java-common-depends=$(JAVA_COMMON_DEPENDS) $(JAVA_COMMON_DEPENDS_VERSION)' \
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
-V'java-gcj-depends=$(JAVA_GCJ_DEPENDS)' \
- -V'lucene-depends=$(LUCENE_DEPENDS)' \
-V'Binary-Version=$(BINARY_VERSION)' \
-V'ooo-binfilter-dep=$(OOO_BINFILTER_DEP)' \
-V'ooo-officebean-dep=$(OOO_OFFICEBEAN_DEP)' \
@@@ -2923,7 -2923,7 +2933,7 @@@ endi
ifeq "$(PACKAGE_BASE)" "y"
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
dh_gencontrol -plibreoffice$(VER)-mysql-connector -- \
- -v$(shell grep "<version" $(SOURCE_TREE)/mysqlc/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/misc/description.xml | perl -pi -e 's,<version value=\"(.*)\" />,\1,; s/^\s+//; s/\s+$$//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
+ -v$(shell grep "<version" $(SOURCE_TREE)/mysqlc/$(shell make -s cmd cmd="env | grep OUTPATH\= | cut -d= -f2" | grep -v custom)$(shell make -s cmd cmd="env | grep PROEXT\= | cut -d= -f2" | grep -v custom)/misc/description.xml | perl -pi -e 's,<version value=\"(.*)\" />,\1,; s/^\s+//; s/\s+$$//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
endif
endif
endif
@@@ -3005,7 -3005,9 +3015,7 @@@ endi
dh_compress -i -X.py -X.mk -X.sxd -X.xcd.sample
dh_installdeb -i
ifeq "$(ENABLE_JAVA)" "y"
- # the help recommends lucene. this is enough. no need for a hard depend in
- # -common, IMHO
- jh_depends -i -Xlibreoffice$(VER)-gcj -Xlibreoffice$(VER)-dbg -Xliblucene2-java
+ jh_depends -i -Xlibreoffice$(VER)-gcj -Xlibreoffice$(VER)-dbg
endif
dh_gencontrol -i $(DEBHELPER_OPTIONS) \
-Nlibreoffice$(VER)-report-builder \
@@@ -3020,6 -3022,8 +3030,6 @@@
-V'bsh-depends=$(BSH_DEPENDS)' \
-V'java-common-depends=$(JAVA_COMMON_DEPENDS)' \
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
- -V'lucene-depends=$(LUCENE_DEPENDS)' \
- -V'lucene-conflicts=$(LUCENE_CONFLICTS)' \
-V'textcat-data-recommends=$(TEXTCAT_DATA_RECOMMENDS)' \
-V'Binary-Version=$(BINARY_VERSION)' \
-V'ooo-binfilter-dep=$(OOO_BINFILTER_DEP)' \
@@@ -3032,6 -3036,7 +3042,6 @@@ endi
ifeq "$(ENABLE_MEDIAWIKI)" "y"
dh_gencontrol -plibreoffice$(VER)-wiki-publisher -- \
-V'mediawiki-jar-depends=$(MEDIAWIKI_JAR_DEPENDS)' \
- -V'lucene-depends=$(LUCENE_DEPENDS)' \
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
-v$(shell grep "<version" $(SOURCE_TREE)/swext/mediawiki/src/description.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
endif
@@@ -3040,7 -3045,7 +3050,7 @@@ ifeq "$(ENABLE_REPORTDESIGN)" "y
-V'base-version=$(BASE_VERSION)' \
-V'report-builder-jar-depends=$(REPORT_BUILDER_JAR_DEPENDS)' \
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
- -v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep "<version" $(SOURCE_TREE)/reportbuilder/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/misc/description.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
+ -v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep "<version" $(SOURCE_TREE)/reportbuilder/$(shell make -s cmd cmd="env | grep OUTPATH\= | cut -d= -f2" | grep -v custom)$(shell make -s cmd cmd="env | grep PROEXT\= | cut -d= -f2" | grep -v custom)/misc/description.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
endif
dh_gencontrol -popenoffice.org-dtd-officedocument1.0 -- \
-v$(shell echo `echo $(BINARY_VERSION) | cut -d: -f1` + 1 | bc):1.0+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
--
LibreOffice packaging repository
Reply to: