[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.3_rc2-1-19-g2449e93
The following commit has been merged in the debian-experimental-3.6 branch:
commit 2449e93a285bb6de1f4a46047d65fe185cd31cbd
Merge: fd25acce60656854c71712a2c8d45c027fef0819 da775b4af68ae073e671e5ccc8bebf6796febe29
Author: Rene Engelhard <rene@debian.org>
Date: Wed Oct 31 18:11:56 2012 +0100
Merge remote-tracking branch 'origin/debian-experimental-3.5' into debian-experimental-3.6
diff --combined changelog
index ce7a178,c6db22c..bd6c64e
--- a/changelog
+++ b/changelog
@@@ -1,17 -1,31 +1,23 @@@
-libreoffice (1:3.5.7-1) UNRELEASED; urgency=low
-
- * new upstream release
- - caches fontconfig font substitutions (closes: #681308)
+libreoffice (1:3.6.3~rc2-2) UNRELEASED; urgency=low
+ * debian/patches/poppler_0_2*.diff: fix build of sdext with poppler
+ 0.21.0 and fix the test with 0.20.x, thanks Pino Toscano
+
- * debian/rules:
- - use generic python3.pc instead of pythonX.Y(mu).pc
- - hack around broken "*" directory in debian/tmp/pkg on kfreebsd-*
- extremely slowing down the install target...
- - document truth and remove alpha from supported architectures
- - fix typo in finding gcj dir detection, thanks Rico Tzschichholz
- - don't add version from librsvg*.shlibs (as for libebook) as we
- dlopen() it anyway.
+ * merge from Ubuntu:
+ - fix quoting of PYTHON_{CFLAGS,LIBS} (Matthias Klose)
+
+ * debian/rules:
+ - mention CVE-2012-4233 in 1:3.6.1~rc2-1's changelog
+ * debian/control.in:
- - remove obsolete sharutils, po-debconf and wget | curl build-deps
+ - recommend fonts-liberation instead of ttf-liberation
+ (closes: #691949)
- -- Rene Engelhard <rene@debian.org> Mon, 22 Oct 2012 19:20:07 +0200
+ -- Rene Engelhard <rene@debian.org> Sun, 28 Oct 2012 14:33:55 +0100
-libreoffice (1:3.5.4+dfsg-3) unstable; urgency=high
+libreoffice (1:3.6.3~rc2-1) experimental; urgency=low
+
+ * new upstream release candidate
- * debian/patches/ca-XV-update.diff: update ca-XV translations, thanks
- Jordi Mallach
- * debian/patches/CVE-2012-4233.diff: fix CVE-2012-4233.diff/HTB23106
* debian/patches/soffice-bashisms.diff: fix bashism in soffice for
valgrinding (closes: #690717)
* debian/patches/he-lucida-sans-unicode.diff: Update default Hebrew font
@@@ -20,138 -34,30 +26,138 @@@
search paths (closes: #677601)
* debian/rules:
+ - fix upstream README(_en-US) install for binary-indep packages
+ - fix typo in finding gcj dir detection, thanks Rico Tzschichholz
+
+ -- Rene Engelhard <rene@debian.org> Fri, 26 Oct 2012 15:47:02 +0200
+
+libreoffice (1:3.6.3~rc1-1) experimental; urgency=low
+
+ * new upstream release candidate
+
+ [ Rene Engelhard ]
+ * debian/patches/sensible-lomua.diff: add patch from Dave Steele to
+ make senddoc.sh default to standard mailto handler (closes: #687228)
+
+ * debian/rules:
+ - try again with gcc 4.6 for mips* since apparently testtools/smoketest
+ now work..
+ - document truth and remove alpha from supported architectures
- exclude .desktop from dh_link call to get absolute symlinks
(closes: #690336)
- -- Rene Engelhard <rene@debian.org> Mon, 22 Oct 2012 19:20:07 +0200
+ [ Bjoern Michaelsen ]
+ * make metapackage explicit in short description
+
+ -- Rene Engelhard <rene@debian.org> Sun, 14 Oct 2012 17:07:23 +0200
+
+libreoffice (1:3.6.2~rc1-1) experimental; urgency=low
+
+ * new upstream release candidate
+ - waits for InternalIPC::ProcessingDone in oosplash (closes: #681185)
+
+ * debian/patches/disable-flaky-unoapi-tests.diff: disable flaky
+ toolkit and sc.ScAccessible* unoapi tests
+ * debian/patches/gcj-safe-jni-h-include.diff: add missing -I...
+ * debian/control.in:
+ - make -core break libreoffice-common (<< 1:3.6.1~rc1) as "unopkg sync"
+ ran in the triggers is gone (closes: #686666)
+ * debian/rules:
+ - fix native-jars dependeny to depend on install-common ...
+ - ... but as this doesn't build then disable it for now...
+ - hack around broken "*" directory in debian/tmp/pkg on kfreebsd-*
+ extremely slowing down the install target...
+ - use xz compression for all binary packages (closes: #687041)
+
+ -- Rene Engelhard <rene@debian.org> Fri, 14 Sep 2012 11:01:04 +0200
+
+libreoffice (1:3.6.1-1) experimental; urgency=low
+
+ * LibreOffice 3.6.1 final release (identical to rc2)
+
+ * debian/rules:
+ - work around possible failure install-common target with missing
+ ca-XV .dirs/.install...
+
+ -- Rene Engelhard <rene@debian.org> Mon, 27 Aug 2012 18:47:58 +0200
+
+libreoffice (1:3.6.1~rc2-1) experimental; urgency=low
-libreoffice (1:3.5.4+dfsg-2) unstable; urgency=low
+ * new upstream release candidate
+ - fixes CVE-2012-4233 / HTB23106
- * use xz compression for all binary packages (closes: #687041)
+ * debian/patches/debian-debug.diff: patch new gb_SYMBOLS in unxgcc.mk to
+ make ENABLE_SYMBOLS=SMALL (-g1) working again..
+ * debian/patches/debian/patches/kfrebsd-add-missing-P_SEP.diff: fix Java build
+ on kfreebsd (non-broken CLASSPATH)
- -- Rene Engelhard <rene@debian.org> Sun, 09 Sep 2012 14:45:20 +0200
+ * src/2ab442d169156f34c379c968f3f482dd-zlib-1.2.7.tar.bz2: remove
+ zlib-1.2.7/doc/rfc195{0,1,2}.txt (closes: #685133)
-libreoffice (1:3.5.4+dfsg-1) unstable; urgency=low
+ * debian/rules:
+ - save some space/build time: build only with en-US in build-arch first
+ and build sdext/mysqlc (localized help/descriptions) manually with all
+ languages after make check; remove buildd special-casing for
+ languages
+ * debian/control.fonts.in: remove ttf-opensymbol transitional package
+ * debian/control.in:
+ - remove obsolete sharutils, po-debconf and wget | curl build-deps
- * src/c735eab2d659a96e5a594c9e8541ad63-zlib-1.2.5.tar.gz: remove
- zlib-1.2.5/doc/rfc195{0,1,2}.txt (closes: #685133)
+ -- Rene Engelhard <rene@debian.org> Thu, 23 Aug 2012 22:34:27 +0200
+
+libreoffice (1:3.6.1~rc1-2) experimental; urgency=low
* debian/rules:
- - fix python3-dev builddep to >= 3.2; 3.1 had a different naming of
- the .pc (without "mu")
+ - revert "build-depend against libpng-dev instead of libpng12-dev"
+ as it breaks on the buildds which install the libpng from experimental
+ (fails GTK3 pkg-config test) (reopens: #662411)
+ - fix build and install targets to prevent build-arch be called under
+ fakeroot, thanks rleigh for the hints
+
+ -- Rene Engelhard <rene@debian.org> Sat, 18 Aug 2012 11:09:34 +0200
+
+libreoffice (1:3.6.1~rc1-1) experimental; urgency=low
+
+ * new upstream release candidate
+ - fixes splashscreen location in multi-monitor setups
+ (closes: #657444, #431473)
+ - caches fontconfig font substitutions (closes: #631308)
+ - fixes dot handling in KDE File Picker (closes: #645946)
+
+ * debian/patches/build-dont-run-checks.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
+ - build-depend on liboost-date-time-date, we now link to boost...
+ - build-depend against libpng-dev instead of libpng12-dev
+ (closes: #662411)
+ - remove squeeze-backports stuff, add wheezy-backports
+ - install upstreams README(_en-US) (closes: #676340)
+ - clean up some warnings:
+ + readd /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/libfakeroot
+ to LD_LIBRARY_PATH for dh_shlibdeps
+ + don't run jh_depends -i/-a, use -p for each package, otherwise it
+ gets confused by help.jar/s*.jar which is just zips, no "real" jar
+ - switch to default-jdk, b-d on default-jdk (>= 1:1.7-48) on ia64 and
+ check for "OpenJDK" in tests yes/no clause for JDK=default
+ - add ENABLE_HELP conditional now that we have --without-help; also
+ add the new --disable-extensions and --disable-database-connectivity to
+ their respective places
+ - split build into build-{arch,indep}
+ - use generic python3.pc instead of pythonX.Y(mu).pc
+ * debian/uno-libs3.symbols: update
* debian/libreoffice-common.links.in:
- s/libreofficeoasis/libreoffice-oasis/, thanks Jakub Wilk
(closes: #683784)
+ * debian/shell-lib-extensions.sh, debian/rules,
+ debian/libreoffice-common.lintian.overrides.in: unopkg sync not
+ necessary anymore; remove. javasettingsunopkginstall.xml also gone
+ * debian/*.p*.in, debian/*.triggers.in: remove obsolete triggers and
+ sync_extensions calls (closes: #677146)
- -- Rene Engelhard <rene@debian.org> Fri, 17 Aug 2012 14:45:26 +0200
+ -- Rene Engelhard <rene@debian.org> Wed, 15 Aug 2012 13:52:20 +0200
libreoffice (1:3.5.4-7) unstable; urgency=high
diff --combined control
index c5e699c,331b343..78ff716
--- a/control
+++ b/control
@@@ -3,9 -3,9 +3,9 @@@ 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, 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, bc,, 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) [!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-de
v (>= 1.12), gdb, junit4 (>= 4.8.2-2), openjdk-6-jdk (>= 6b23~pre8-2) [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 [!hppa !kfreebsd-amd64 !kfreebsd-i386], libsac-java [!hppa !kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libflute-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libpentaho-reporting-flow-engine-java (>= 0.9.4) [!hppa !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>= 0.2.10) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libloader-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-
i386], libformula-java (>= 1.1.7) [!hppa !kfreebsd-amd64 !kfreebsd-i386], librepository-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libserializer-java (>= 1.1.6) [!hppa !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, 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-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~)
+Build-Depends: dpkg-dev (>= 1.16.1), lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, 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, bc,, 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) [!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), python-dev (>= 2.6), python3-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), gdb, junit4 (>= 4.
8.2-2), default-jdk, default-jdk (>= 1:1.7-48) [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], 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), libboost-date-time-dev (>= 1.38), libmdds-dev (>= 0.5.0), libvigraimpex-dev, libclucene-dev (>= 2.3.3.4-2), 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 (>= 0.2.1), 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, libpq-dev (>= 9.0~), libxrandr-dev,
libhsqldb-java (>> 1.8.0.10), 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, doxygen, libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, libbase-java [!hppa !kfreebsd-amd64 !kfreebsd-i386], libsac-java [!hppa !kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libflute-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libpentaho-reporting-flow-engine-java (>= 0.9.4) [!hppa !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>= 0.2.10) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libloader-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libformula-java (>= 1.1.7) [!hppa !kfreebsd-amd64 !kfreebsd-i386], librepository-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libserializer-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, bsh (>= 2.0
b4), 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], g++-4.7 (<< 4.7.1-3), base-files (= 7.0), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.9.1
XS-Python-Version: current
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
@@@ -16,10 -16,10 +16,10 @@@ Homepage: http://www.libreoffice.or
Package: libreoffice
Architecture: amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Section: metapackages
-Depends: libreoffice-core (= ${binary:Version}), libreoffice-writer, libreoffice-calc, libreoffice-impress, libreoffice-draw, libreoffice-math, libreoffice-base, libreoffice-report-builder-bin [!hppa !kfreebsd-amd64 !kfreebsd-i386], ttf-dejavu, ttf-sil-gentium-basic, libreoffice-filter-mobiledev, ${lucene-depends}, ${java-common-depends}, ${misc:Depends}
+Depends: libreoffice-core (= ${binary:Version}), libreoffice-writer, libreoffice-calc, libreoffice-impress, libreoffice-draw, libreoffice-math, libreoffice-base, libreoffice-report-builder-bin [!hppa !kfreebsd-amd64 !kfreebsd-i386], ttf-dejavu, ttf-sil-gentium-basic, libreoffice-filter-mobiledev, ${java-common-depends}, ${misc:Depends}
- Recommends: ttf-liberation | ttf-mscorefonts-installer, libpaper-utils
+ Recommends: fonts-liberation | ttf-mscorefonts-installer, libpaper-utils
Suggests: hunspell-dictionary, myspell-dictionary, libreoffice-help-${help-l10n-virtual-version}, libreoffice-l10n-${help-l10n-virtual-version}, unixodbc, cups-bsd, libsane, hyphen-hyphenation-patterns, mythes-thesaurus, libreoffice-grammarcheck, libxrender1, libgl1, libreoffice-gnome | libreoffice-kde, iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser, ${java-runtime-depends}, openclipart-libreoffice, pstoedit, imagemagick | graphicsmagick-imagemagick-compat, ${gstreamer-plugins-suggests}, ${libldap-suggests}, ${ooo-binfilter-dep}, ${ooo-officebean-dep}
-Description: office productivity suite
+Description: office productivity suite (metapackage)
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
@@@ -92,10 -92,9 +92,10 @@@ Architecture: amd64 armel armhf hppa i3
Depends: libreoffice-common (>> ${base-version}), fonts-opensymbol, ${shlibs:Depends}, fontconfig, ${misc:Depends}
Pre-Depends: ure (>= 1.5.1+OOo3.1.1-15)
Conflicts: 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}), libreoffice-style-crystal (<< 1:3.3.0-1), libreoffice-style-oxygen (<< 1:3.3.0-1), libreoffice-style-tango (<< 1:3.3.0-1), libreoffice-style-hicontrast (<< 1:3.3.0-1), libreoffice-style-galaxy (<< 1:3.3.0-1), libreoffice-style-andromeda (<< 1:3.3.0-1), libcairo2 (= 1.4.8-1), libicu38 (= 3.8~d01-1), cli-uno-bridge (<< 1:3.0.0~dev300m22), 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), m
yspell-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-filter-binfilter (<< 1:3.4.1~), libreoffice-evolution (<< 1:3.4.1~), li
breoffice-kab (<< 1:3.4.1~), libreoffice-sdbc-postgresql (<< 0.8.1~), mozilla-libreoffice (<< 1:3.5.0~beta~)
+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), m
yspell-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-filter-binfilter (<< 1:3.4.1~), libreoffice-evolution (<< 1:3.4.1~), li
breoffice-kab (<< 1:3.4.1~), libreoffice-sdbc-postgresql (<< 0.8.1~), mozilla-libreoffice (<< 1:3.5.0~beta~),
+ libreoffice-common (<< 1:3.6.1~rc1)
Provides: libreoffice-bundled
-Replaces: libreoffice-calc (<< 1:3.3.2-5)
+Replaces: libreoffice-calc (<< 1:3.3.2-5), ure (<< 1:3.6.1-2), uno-libs3 (<< 1:3.6.1-2)
Description: office productivity suite -- arch-dependent files
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@@ -2604,8 -2603,9 +2604,8 @@@ Package: libreoffice-help-en-u
Replaces: libreoffice-common (<< 1:3.0.0~dev300m28)
Architecture: all
Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-en, ${lucene-depends}, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-en, ${java-common-depends}
Depends: libreoffice-writer | language-support-translations-en, ${misc:Depends}
-Conflicts: ${lucene-conflicts}
Provides: libreoffice-help-${help-l10n-virtual-version}
Description: office productivity suite -- English_american help
LibreOffice is a full-featured office productivity suite that provides
@@@ -2617,8 -2617,9 +2617,8 @@@
Package: libreoffice-help-ca
Architecture: all
Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-ca, ${lucene-depends}, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-ca, ${java-common-depends}
Depends: libreoffice-writer | language-support-translations-ca, libreoffice-l10n-ca, ${misc:Depends}
-Conflicts: ${lucene-conflicts}
Provides: libreoffice-help-${help-l10n-virtual-version}
Description: office productivity suite -- Catalan help
LibreOffice is a full-featured office productivity suite that provides
@@@ -2630,8 -2631,9 +2630,8 @@@
Package: libreoffice-help-cs
Architecture: all
Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-cs, ${lucene-depends}, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-cs, ${java-common-depends}
Depends: libreoffice-writer | language-support-translations-cs, libreoffice-l10n-cs, ${misc:Depends}
-Conflicts: ${lucene-conflicts}
Provides: libreoffice-help-${help-l10n-virtual-version}
Description: office productivity suite -- Czech help
LibreOffice is a full-featured office productivity suite that provides
@@@ -2643,8 -2645,9 +2643,8 @@@
Package: libreoffice-help-da
Architecture: all
Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-da, ${lucene-depends}, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-da, ${java-common-depends}
Depends: libreoffice-writer | language-support-translations-da, libreoffice-l10n-da, ${misc:Depends}
-Conflicts: ${lucene-conflicts}
Provides: libreoffice-help-${help-l10n-virtual-version}
Description: office productivity suite -- Danish help
LibreOffice is a full-featured office productivity suite that provides
@@@ -2656,8 -2659,9 +2656,8 @@@
Package: libreoffice-help-de
Architecture: all
Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-de, ${lucene-depends}, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-de, ${java-common-depends}
Depends: libreoffice-writer | language-support-translations-de, libreoffice-l10n-de, ${misc:Depends}
-Conflicts: ${lucene-conflicts}
Provides: libreoffice-help-${help-l10n-virtual-version}
Description: office productivity suite -- German help
LibreOffice is a full-featured office productivity suite that provides
@@@ -2669,8 -2673,9 +2669,8 @@@
Package: libreoffice-help-dz
Architecture: all
Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-dz, ${lucene-depends}, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-dz, ${java-common-depends}
Depends: libreoffice-writer | language-support-translations-dz, libreoffice-l10n-dz, ${misc:Depends}
-Conflicts: ${lucene-conflicts}
Provides: libreoffice-help-${help-l10n-virtual-version}
Description: office productivity suite -- Dzongkha help
LibreOffice is a full-featured office productivity suite that provides
@@@ -2682,8 -2687,9 +2682,8 @@@
Package: libreoffice-help-el
Architecture: all
Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-el, ${lucene-depends}, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-el, ${java-common-depends}
Depends: libreoffice-writer | language-support-translations-el, libreoffice-l10n-el, ${misc:Depends}
-Conflicts: ${lucene-conflicts}
Provides: libreoffice-help-${help-l10n-virtual-version}
Description: office productivity suite -- Greek help
LibreOffice is a full-featured office productivity suite that provides
@@@ -2695,8 -2701,9 +2695,8 @@@
Package: libreoffice-help-en-gb
Architecture: all
Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-en, ${lucene-depends}, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-en, ${java-common-depends}
Depends: libreoffice-writer | language-support-translations-en, libreoffice-l10n-en-gb, ${misc:Depends}
-Conflicts: ${lucene-conflicts}
Provides: libreoffice-help-${help-l10n-virtual-version}
Description: office productivity suite -- English_british help
LibreOffice is a full-featured office productivity suite that provides
@@@ -2708,8 -2715,9 +2708,8 @@@
Package: libreoffice-help-es
Architecture: all
Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-es, ${lucene-depends}, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-es, ${java-common-depends}
Depends: libreoffice-writer | language-support-translations-es, libreoffice-l10n-es, ${misc:Depends}
-Conflicts: ${lucene-conflicts}
Provides: libreoffice-help-${help-l10n-virtual-version}
Description: office productivity suite -- Spanish help
LibreOffice is a full-featured office productivity suite that provides
@@@ -2721,8 -2729,9 +2721,8 @@@
Package: libreoffice-help-et
Architecture: all
Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-et, ${lucene-depends}, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-et, ${java-common-depends}
Depends: libreoffice-writer | language-support-translations-et, libreoffice-l10n-et, ${misc:Depends}
-Conflicts: ${lucene-conflicts}
Provides: libreoffice-help-${help-l10n-virtual-version}
Description: office productivity suite -- Estonian help
LibreOffice is a full-featured office productivity suite that provides
@@@ -2734,8 -2743,9 +2734,8 @@@
Package: libreoffice-help-eu
Architecture: all
Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-eu, ${lucene-depends}, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-eu, ${java-common-depends}
Depends: libreoffice-writer | language-support-translations-eu, libreoffice-l10n-eu, ${misc:Depends}
-Conflicts: ${lucene-conflicts}
Provides: libreoffice-help-${help-l10n-virtual-version}
Description: office productivity suite -- Basque help
LibreOffice is a full-featured office productivity suite that provides
@@@ -2747,8 -2757,9 +2747,8 @@@
Package: libreoffice-help-fi
Architecture: all
Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-fi, ${lucene-depends}, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-fi, ${java-common-depends}
Depends: libreoffice-writer | language-support-translations-fi, libreoffice-l10n-fi, ${misc:Depends}
-Conflicts: ${lucene-conflicts}
Provides: libreoffice-help-${help-l10n-virtual-version}
Description: office productivity suite -- Finnish help
LibreOffice is a full-featured office productivity suite that provides
@@@ -2760,8 -2771,9 +2760,8 @@@
Package: libreoffice-help-fr
Architecture: all
Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-fr, ${lucene-depends}, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-fr, ${java-common-depends}
Depends: libreoffice-writer | language-support-translations-fr, libreoffice-l10n-fr, ${misc:Depends}
-Conflicts: ${lucene-conflicts}
Provides: libreoffice-help-${help-l10n-virtual-version}
Description: office productivity suite -- French help
LibreOffice is a full-featured office productivity suite that provides
@@@ -2773,8 -2785,9 +2773,8 @@@
Package: libreoffice-help-gl
Architecture: all
Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-gl, ${lucene-depends}, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-gl, ${java-common-depends}
Depends: libreoffice-writer | language-support-translations-gl, libreoffice-l10n-gl, ${misc:Depends}
-Conflicts: ${lucene-conflicts}
Provides: libreoffice-help-${help-l10n-virtual-version}
Description: office productivity suite -- Galician help
LibreOffice is a full-featured office productivity suite that provides
@@@ -2786,8 -2799,9 +2786,8 @@@
Package: libreoffice-help-hi
Architecture: all
Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-hi, ${lucene-depends}, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-hi, ${java-common-depends}
Depends: libreoffice-writer | language-support-translations-hi, libreoffice-l10n-hi, ${misc:Depends}
-Conflicts: ${lucene-conflicts}
Provides: libreoffice-help-${help-l10n-virtual-version}
Description: office productivity suite -- Hindi help
LibreOffice is a full-featured office productivity suite that provides
@@@ -2799,8 -2813,9 +2799,8 @@@
Package: libreoffice-help-hu
Architecture: all
Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-hu, ${lucene-depends}, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-hu, ${java-common-depends}
Depends: libreoffice-writer | language-support-translations-hu, libreoffice-l10n-hu, ${misc:Depends}
-Conflicts: ${lucene-conflicts}
Provides: libreoffice-help-${help-l10n-virtual-version}
Description: office productivity suite -- Hungarian help
LibreOffice is a full-featured office productivity suite that provides
@@@ -2812,8 -2827,9 +2812,8 @@@
Package: libreoffice-help-it
Architecture: all
Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-it, ${lucene-depends}, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-it, ${java-common-depends}
Depends: libreoffice-writer | language-support-translations-it, libreoffice-l10n-it, ${misc:Depends}
-Conflicts: ${lucene-conflicts}
Provides: libreoffice-help-${help-l10n-virtual-version}
Description: office productivity suite -- Italian help
LibreOffice is a full-featured office productivity suite that provides
@@@ -2825,8 -2841,9 +2825,8 @@@
Package: libreoffice-help-ja
Architecture: all
Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-ja, ${lucene-depends}, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-ja, ${java-common-depends}
Depends: libreoffice-writer | language-support-translations-ja, libreoffice-l10n-ja, ${misc:Depends}
-Conflicts: ${lucene-conflicts}
Provides: libreoffice-help-${help-l10n-virtual-version}
Description: office productivity suite -- Japanese help
LibreOffice is a full-featured office productivity suite that provides
@@@ -2838,8 -2855,9 +2838,8 @@@
Package: libreoffice-help-km
Architecture: all
Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-km, ${lucene-depends}, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-km, ${java-common-depends}
Depends: libreoffice-writer | language-support-translations-km, libreoffice-l10n-km, ${misc:Depends}
-Conflicts: ${lucene-conflicts}
Provides: libreoffice-help-${help-l10n-virtual-version}
Description: office productivity suite -- Khmer help
LibreOffice is a full-featured office productivity suite that provides
@@@ -2851,8 -2869,9 +2851,8 @@@
Package: libreoffice-help-ko
Architecture: all
Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-ko, ${lucene-depends}, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-ko, ${java-common-depends}
Depends: libreoffice-writer | language-support-translations-ko, libreoffice-l10n-ko, ${misc:Depends}
-Conflicts: ${lucene-conflicts}
Provides: libreoffice-help-${help-l10n-virtual-version}
Description: office productivity suite -- Korean help
LibreOffice is a full-featured office productivity suite that provides
@@@ -2864,8 -2883,9 +2864,8 @@@
Package: libreoffice-help-nl
Architecture: all
Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-nl, ${lucene-depends}, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-nl, ${java-common-depends}
Depends: libreoffice-writer | language-support-translations-nl, libreoffice-l10n-nl, ${misc:Depends}
-Conflicts: ${lucene-conflicts}
Provides: libreoffice-help-${help-l10n-virtual-version}
Description: office productivity suite -- Dutch help
LibreOffice is a full-featured office productivity suite that provides
@@@ -2877,8 -2897,9 +2877,8 @@@
Package: libreoffice-help-om
Architecture: all
Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-om, ${lucene-depends}, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-om, ${java-common-depends}
Depends: libreoffice-writer | language-support-translations-om, libreoffice-l10n-om, ${misc:Depends}
-Conflicts: ${lucene-conflicts}
Provides: libreoffice-help-${help-l10n-virtual-version}
Description: office productivity suite -- Oromo help
LibreOffice is a full-featured office productivity suite that provides
@@@ -2890,8 -2911,9 +2890,8 @@@
Package: libreoffice-help-pl
Architecture: all
Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-pl, ${lucene-depends}, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-pl, ${java-common-depends}
Depends: libreoffice-writer | language-support-translations-pl, libreoffice-l10n-pl, ${misc:Depends}
-Conflicts: ${lucene-conflicts}
Provides: libreoffice-help-${help-l10n-virtual-version}
Description: office productivity suite -- Polish help
LibreOffice is a full-featured office productivity suite that provides
@@@ -2903,8 -2925,9 +2903,8 @@@
Package: libreoffice-help-pt
Architecture: all
Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-pt, ${lucene-depends}, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-pt, ${java-common-depends}
Depends: libreoffice-writer | language-support-translations-pt, libreoffice-l10n-pt, ${misc:Depends}
-Conflicts: ${lucene-conflicts}
Provides: libreoffice-help-${help-l10n-virtual-version}
Description: office productivity suite -- Portuguese help
LibreOffice is a full-featured office productivity suite that provides
@@@ -2916,8 -2939,9 +2916,8 @@@
Package: libreoffice-help-pt-br
Architecture: all
Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-pt, ${lucene-depends}, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-pt, ${java-common-depends}
Depends: libreoffice-writer | language-support-translations-pt, libreoffice-l10n-pt-br, ${misc:Depends}
-Conflicts: ${lucene-conflicts}
Provides: libreoffice-help-${help-l10n-virtual-version}
Description: office productivity suite -- Portuguese_brazilian help
LibreOffice is a full-featured office productivity suite that provides
@@@ -2929,8 -2953,9 +2929,8 @@@
Package: libreoffice-help-ru
Architecture: all
Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-ru, ${lucene-depends}, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-ru, ${java-common-depends}
Depends: libreoffice-writer | language-support-translations-ru, libreoffice-l10n-ru, ${misc:Depends}
-Conflicts: ${lucene-conflicts}
Provides: libreoffice-help-${help-l10n-virtual-version}
Description: office productivity suite -- Russian help
LibreOffice is a full-featured office productivity suite that provides
@@@ -2942,8 -2967,9 +2942,8 @@@
Package: libreoffice-help-sk
Architecture: all
Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-sk, ${lucene-depends}, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-sk, ${java-common-depends}
Depends: libreoffice-writer | language-support-translations-sk, libreoffice-l10n-sk, libreoffice-help-cs, ${misc:Depends}
-Conflicts: ${lucene-conflicts}
Provides: libreoffice-help-${help-l10n-virtual-version}
Description: office productivity suite -- Slovak help
LibreOffice is a full-featured office productivity suite that provides
@@@ -2955,8 -2981,9 +2955,8 @@@
Package: libreoffice-help-sl
Architecture: all
Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-sl, ${lucene-depends}, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-sl, ${java-common-depends}
Depends: libreoffice-writer | language-support-translations-sl, libreoffice-l10n-sl, ${misc:Depends}
-Conflicts: ${lucene-conflicts}
Provides: libreoffice-help-${help-l10n-virtual-version}
Description: office productivity suite -- Slovenian help
LibreOffice is a full-featured office productivity suite that provides
@@@ -2968,8 -2995,9 +2968,8 @@@
Package: libreoffice-help-sv
Architecture: all
Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-sv, ${lucene-depends}, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-sv, ${java-common-depends}
Depends: libreoffice-writer | language-support-translations-sv, libreoffice-l10n-sv, ${misc:Depends}
-Conflicts: ${lucene-conflicts}
Provides: libreoffice-help-${help-l10n-virtual-version}
Description: office productivity suite -- Swedish help
LibreOffice is a full-featured office productivity suite that provides
@@@ -2981,8 -3009,9 +2981,8 @@@
Package: libreoffice-help-zh-cn
Architecture: all
Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-zh, ${lucene-depends}, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-zh, ${java-common-depends}
Depends: libreoffice-writer | language-support-translations-zh, libreoffice-l10n-zh-cn, ${misc:Depends}
-Conflicts: ${lucene-conflicts}
Provides: libreoffice-help-${help-l10n-virtual-version}
Description: office productivity suite -- Chinese_simplified help
LibreOffice is a full-featured office productivity suite that provides
@@@ -2994,8 -3023,9 +2994,8 @@@
Package: libreoffice-help-zh-tw
Architecture: all
Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-zh, ${lucene-depends}, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-zh, ${java-common-depends}
Depends: libreoffice-writer | language-support-translations-zh, libreoffice-l10n-zh-tw, ${misc:Depends}
-Conflicts: ${lucene-conflicts}
Provides: libreoffice-help-${help-l10n-virtual-version}
Description: office productivity suite -- Chinese_traditional help
LibreOffice is a full-featured office productivity suite that provides
@@@ -3084,6 -3114,20 +3084,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: libreoffice-ogltrans
Section: graphics
Priority: extra
@@@ -3104,6 -3148,7 +3104,6 @@@ Architecture: al
Pre-Depends: ${java-runtime-depends}
Depends: ${mediawiki-jar-depends}, libreoffice-core (>= 1:3.4~), libreoffice-java-common, ${java:Depends}, ${misc:Depends}
Enhances: libreoffice-writer
-Recommends: ${lucene-depends}
Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
Suggests: mediawiki
Description: LibreOffice extension for working with MediaWiki articles
@@@ -3213,6 -3258,15 +3213,6 @@@ Description: OpenSymbol TrueType fon
LibreOffice. This font contains symbols (like fonts as Wingdings(tm)),
bullets (needed for bullets in LibreOffice) and non-latin character
-Package: ttf-opensymbol
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: fonts-opensymbol
-Description: transitional package for fonts-opensymbol
- This package is a transitiional package for font-opensymbol.
- It can be removed when fonts-opensymbol is installed.
-
Package: libreoffice-dbg
Section: debug
Architecture: amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
diff --combined control.in
index 88b8a7c,a4616eb..a327aaf
--- a/control.in
+++ b/control.in
@@@ -36,7 -36,7 +36,7 @@@ Build-Depends: dpkg-dev (>= 1.16.1)
bc,
%BUILD_DEPS%
Build-Depends-Indep: fdupes, xml-core, imagemagick %BUILD_DEPS_INDEP%
-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) [%OOO_GCJ_JDK_ARCHS%], ant (= 1.8.0-2) [%OOO_GCJ_JDK_ARCHS%], ant (= 1.8.0-3) [%OOO_GCJ_JDK_ARCHS%], 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]
+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) [%OOO_GCJ_JDK_ARCHS%], ant (= 1.8.0-2) [%OOO_GCJ_JDK_ARCHS%], ant (= 1.8.0-3) [%OOO_GCJ_JDK_ARCHS%], 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], g++-4.7 (<< 4.7.1-3)
Standards-Version: 3.9.1
XS-Python-Version: @PYTHON_VERSION@
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
@@@ -58,9 -58,10 +58,9 @@@ Depends: libreofficeVER-core (= ${binar
ttf-dejavu,
ttf-sil-gentium-basic,
libreofficeVER-filter-mobiledev,
- ${lucene-depends},
${java-common-depends},
${misc:Depends}
- Recommends: ttf-liberation | ttf-mscorefonts-installer, libpaper-utils
+ Recommends: fonts-liberation | ttf-mscorefonts-installer, libpaper-utils
Suggests: hunspell-dictionary,
myspell-dictionary,
libreofficeVER-help-${help-l10n-virtual-version},
@@@ -83,7 -84,7 +83,7 @@@
${libldap-suggests},
${ooo-binfilter-dep},
${ooo-officebean-dep}
-Description: office productivity suite
+Description: office productivity suite (metapackage)
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
@@@ -182,10 -183,9 +182,10 @@@ Conflicts: libreofficeVER-unbundled
cli-uno-bridge (<< 1:3.0.0~dev300m22),
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), m
yspell-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-filter-binfilter (<< 1:3.4.1~), libreoffice-evolution (<< 1:3.4.1~), li
breoffice-kab (<< 1:3.4.1~), libreoffice-sdbc-postgresql (<< 0.8.1~), mozilla-libreoffice (<< 1:3.5.0~beta~)
+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), m
yspell-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-filter-binfilter (<< 1:3.4.1~), libreoffice-evolution (<< 1:3.4.1~), li
breoffice-kab (<< 1:3.4.1~), libreoffice-sdbc-postgresql (<< 0.8.1~), mozilla-libreoffice (<< 1:3.5.0~beta~),
+ libreoffice-common (<< 1:3.6.1~rc1)
Provides: libreofficeVER-bundled
-Replaces: libreofficeVER-calc (<< 1:3.3.2-5)
+Replaces: libreofficeVER-calc (<< 1:3.3.2-5), ure (<< 1:3.6.1-2), uno-libs3 (<< 1:3.6.1-2)
Description: office productivity suite -- arch-dependent files
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
diff --combined patches/series
index 327adf4,e9a9f00..a4826a9
--- a/patches/series
+++ b/patches/series
@@@ -4,10 -4,11 +4,10 @@@ 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
@@@ -16,17 -17,25 +16,19 @@@ reportdesign-mention-package.dif
jdbc-driver-classpaths.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
mediwiki-oor-replace.diff
pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
debian-hardened-buildflags.diff
gtk3-hack-explicit-gmodule.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
ignore-sc_cellrangesbase-fails.diff
-fix-Test-BigPtrArray-on-64bit-bigendian.diff
-CVE-2012-2665-binfilter.diff
-ca-XV-update.diff
+build-dont-run-checks.diff
+#disable-broken-sdext_pdfimport-cppunit-test-for-now.diff
+disable-flaky-unoapi-tests.diff
soffice-bashisms.diff
he-lucida-sans-unicode.diff
ure-no-etc-opt-ure.diff
+ poppler_0_20_x.diff
+ poppler_0_21_0.diff
--
LibreOffice packaging repository
Reply to: