diff -Nru libreoffice-5.0.2~rc2/debian/changelog libreoffice-5.0.2/debian/changelog --- libreoffice-5.0.2~rc2/debian/changelog 2015-09-24 13:31:22.000000000 +0000 +++ libreoffice-5.0.2/debian/changelog 2015-10-09 12:37:54.000000000 +0000 @@ -1,4 +1,4 @@ -libreoffice (1:5.0.2~rc2-0ubuntu1~precise2) precise; urgency=medium +libreoffice (1:5.0.2-0ubuntu1~precise2) precise; urgency=medium * Backport from wily * debian/rules: @@ -19,21 +19,27 @@ * fix-boost-1.54-with-gcc-4.6.diff - boost.variant broken in combination with g++ 4.6.x series and C++0x - -- Rico Tzschichholz Thu, 24 Sep 2015 08:43:06 +0200 + -- Rico Tzschichholz Fri, 09 Oct 2015 13:53:13 +0200 -libreoffice (1:5.0.2~rc2-0ubuntu1~wily1~ppa1) wily; urgency=medium +libreoffice (1:5.0.2-0ubuntu1) wily; urgency=medium - * new upstream rc + * new upstream release * removed upstreamed patches + * cherry-picks from Debian: + - update shlibs.override + - bump gtk+ requirements + - move liblibreofficekitgtk.so to -gtk - -- Bjoern Michaelsen Fri, 18 Sep 2015 13:05:43 +0200 + -- Bjoern Michaelsen Thu, 01 Oct 2015 00:49:31 +0200 -libreoffice (1:5.0.1-0ubuntu2~wily1~ppa1) wily; urgency=medium +libreoffice (1:5.0.1-0ubuntu2) wily; urgency=medium - * use system libwps, libcmis, cppunit - * use system libetonyek, which is in main now (lp: #1410883) + * Build for arm64 and ppc64el. + * Build using system libraries for libcppunit, libetonyek, liborcus, + libpagemaker, libwps and libcmis. The internal copies are not updated + for at least ppc64el. - -- Bjoern Michaelsen Fri, 11 Sep 2015 09:21:37 +0200 + -- Matthias Klose Fri, 11 Sep 2015 17:22:56 +0200 libreoffice (1:5.0.1-0ubuntu1) wily; urgency=medium diff -Nru libreoffice-5.0.2~rc2/debian/control libreoffice-5.0.2/debian/control --- libreoffice-5.0.2~rc2/debian/control 2015-09-24 13:31:49.000000000 +0000 +++ libreoffice-5.0.2/debian/control 2015-10-09 12:37:31.000000000 +0000 @@ -109,7 +109,7 @@ make (>= 3.81-8.1ubuntu1), maven-repo-helper, openjdk-6-jdk (>= 6b23~pre8-2) [mips mipsel], - openjdk-7-jdk [alpha amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc powerpcspe ppc64 s390 s390x sparc], + openjdk-7-jdk [alpha amd64 arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc powerpcspe ppc64 ppc64el s390 s390x sparc], pkg-config, python, python-dev (>= 2.7), @@ -161,7 +161,7 @@ Homepage: http://www.libreoffice.org Package: libreoffice -Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Section: metapackages Depends: fonts-sil-gentium-basic, libreoffice-base, @@ -286,7 +286,7 @@ indic languages. Package: libreoffice-core -Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Depends: fontconfig, fonts-opensymbol, libreoffice-common (>> ${base-version}), @@ -472,7 +472,7 @@ the Java support for LibreOffice (Java classes, scripts, config snippets). Package: libreoffice-writer -Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Depends: libreoffice-base-core (= ${binary:Version}), libreoffice-core (= ${binary:Version}), ${misc:Depends}, @@ -492,7 +492,7 @@ This package contains the wordprocessor component for LibreOffice. Package: libreoffice-calc -Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Depends: libreoffice-base-core (= ${binary:Version}), libreoffice-core (= ${binary:Version}), ${misc:Depends}, @@ -505,7 +505,7 @@ This package contains the spreadsheet component for LibreOffice. Package: libreoffice-impress -Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Depends: libreoffice-core (= ${binary:Version}), libreoffice-draw (= ${binary:Version}), ${misc:Depends}, @@ -519,7 +519,7 @@ This package contains the presentation component for LibreOffice. Package: libreoffice-draw -Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Depends: libreoffice-core (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} @@ -531,7 +531,7 @@ This package contains the drawing component for LibreOffice. Package: libreoffice-math -Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Depends: fonts-opensymbol, libreoffice-core (= ${binary:Version}), ${misc:Depends}, @@ -543,7 +543,7 @@ This package contains the equation editor component for LibreOffice. Package: libreoffice-base-core -Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Depends: libreoffice-core (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} @@ -560,7 +560,7 @@ install libreoffice-base. Package: libreoffice-base -Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Section: database Depends: libreoffice-base-core (= ${binary:Version}), libreoffice-base-drivers (= ${binary:Version}), @@ -670,7 +670,7 @@ This package contains the "human" symbol style, default style for Ubuntu. Package: libreoffice-gtk -Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Depends: libreoffice-core (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} @@ -679,17 +679,18 @@ Enhances: libreoffice Conflicts: libgtk2.0-0 (= 2.12.10-1) [amd64], lo-menubar Provides: lo-menubar -Replaces: lo-menubar +Replaces: libreoffice-core (<< 1:5.0.2), lo-menubar Description: office productivity suite -- GTK+ integration LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. . This package contains the Gtk plugin for drawing LibreOffices widgets with Gtk+ and a Gtk/GNOMEish File Picker and print dialog when running - under GNOME. It also contains a QuickStarter for the "notification area". + under GNOME. It also contains a QuickStarter for the "notification area" + and a (basic) GTK+ document viewer widget. Package: libreoffice-gtk3 -Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Depends: libreoffice-core (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} @@ -704,7 +705,7 @@ with Gtk+ 3.0 and Gtk/GNOMEish print dialog when running under GNOME. Package: libreoffice-gnome -Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Depends: gconf2, libreoffice-core (= ${binary:Version}), libreoffice-gtk, @@ -732,7 +733,7 @@ Provides: ${python:Provides} XB-Python-Version: ${python:Versions} Section: oldlibs -Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Enhances: libreoffice Depends: libreoffice-core (= ${binary:Version}), ${misc:Depends}, @@ -753,7 +754,7 @@ Package: python3-uno Section: python -Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Enhances: libreoffice Depends: libreoffice-core (= ${binary:Version}), ${misc:Depends}, @@ -776,7 +777,7 @@ Homepage: http://udk.openoffice.org/python/python-bridge.html Package: libreoffice-officebean -Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Section: java Depends: libreoffice-core (= ${binary:Version}), ${java-common-depends}, @@ -856,7 +857,7 @@ Package: libreoffice-pdfimport Section: misc Priority: extra -Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends} Breaks: libreoffice-common (<< 1:3.5~), libreoffice-core (<< 1:3.5~) Description: PDF Import component for LibreOffice @@ -869,7 +870,7 @@ Package: libreoffice-avmedia-backend-gstreamer Section: misc Priority: optional -Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends} Replaces: libreoffice-core (<< 1:4.2~) Provides: libreoffice-avmedia-backend @@ -883,7 +884,7 @@ Package: libreoffice-avmedia-backend-vlc Section: misc Priority: optional -Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Depends: libreoffice-core, ${libvlc-dep} (>= 2.0.8), ${misc:Depends}, @@ -898,7 +899,7 @@ Package: libreoffice-sdbc-firebird Depends: libreoffice-core, ${shlibs:Depends} -Architecture: alpha amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mipsel +Architecture: alpha amd64 arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mipsel ppc64el Section: database Enhances: libreoffice-base-drivers Description: Firebird SDBC driver for LibreOffice @@ -914,7 +915,7 @@ ${java:Depends}, ${shlibs:Depends} Replaces: libreoffice-base (<< 1:4.2~) -Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Section: database Enhances: libreoffice-base-drivers Description: HSQLDB SDBC driver for LibreOffice @@ -926,14 +927,14 @@ Package: libreoffice-base-drivers Depends: libreoffice-core, ${shlibs:Depends} -Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Section: database Suggests: libjtds-java, libreoffice-mysql-connector | libmyodbc | libmysql-java, libreoffice-sdbc-postgresql | odbc-postgresql | libpg-java, libsqliteodbc | tdsodbc | mdbtools Recommends: libreoffice-sdbc-firebird, - libreoffice-sdbc-hsqldb [alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc] + libreoffice-sdbc-hsqldb [alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc] Replaces: libreoffice-base (<< 1:4.3.0-3ubuntu2~), libreoffice-core (<< 1:4.2~) Breaks: libreoffice-base (<< 1:4.3.0-3ubuntu2~) Description: Database connectivity drivers for LibreOffice @@ -1010,7 +1011,7 @@ Package: uno-libs3 Section: libs -Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Depends: ${misc:Depends}, ${shlibs:Depends} Replaces: ure (<< 1:5.0.0~rc2-1) Breaks: libreoffice-core (<< 1:4.3.0~), ure (<< 4.1.2~) @@ -1033,7 +1034,7 @@ Package: ure Section: libs -Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Depends: uno-libs3 (= ${ure:Version}), ${misc:Depends}, ${shlibs:Depends} Suggests: java5-runtime Conflicts: cli-uno-bridge (<< 1:3.0.0~dev300m22) @@ -1053,7 +1054,7 @@ Package: libreoffice-ogltrans Section: graphics Priority: extra -Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Depends: libreoffice-common, libreoffice-core, libreoffice-impress, @@ -1117,7 +1118,7 @@ Package: libreoffice-report-builder-bin Section: misc -Architecture: alpha amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Depends: libreoffice-base, libreoffice-core, ${misc:Depends}, ${shlibs:Depends} Description: LibreOffice component for building database reports -- libraries LibreOffice is a full-featured office productivity suite that provides @@ -1140,7 +1141,7 @@ Package: libreoffice-dbg Section: debug -Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Priority: extra Depends: libreoffice-core (= ${binary:Version}) | libreoffice-dev (= ${binary:Version}) | libreoffice-gnome (= ${binary:Version}) | libreoffice-kde (= ${binary:Version}) | libreoffice-calc (= ${binary:Version}) | libreoffice-base-core (= ${binary:Version}) | libreoffice-base (= ${binary:Version}) | libreoffice-impress (= ${binary:Version}) | libreoffice-draw (= ${binary:Version}) | libreoffice-writer (= ${binary:Version}) | python-uno (= ${binary:Version}) | libreoffice-ogltrans (= ${binary:Version}), ${misc:Depends} @@ -1157,7 +1158,7 @@ Package: uno-libs3-dbg Section: debug Priority: extra -Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Depends: uno-libs3 (= ${ure:Version}), ${misc:Depends} Replaces: ure-dbg (<< 4.0.3-2) Suggests: python-six @@ -1181,7 +1182,7 @@ Package: ure-dbg Section: debug Priority: extra -Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Depends: uno-libs3-dbg (= ${ure:Version}), ure (= ${ure:Version}), ${misc:Depends} @@ -1199,7 +1200,7 @@ Package: libreoffice-dev Section: devel -Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Depends: libreoffice-core (= ${binary:Version}), uno-libs3, ${idlc-cpp-depends}, @@ -1252,7 +1253,7 @@ This package contains the headers needed for using LibreOfficeKit. Package: libreoffice-kde -Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Depends: libreoffice-core (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} @@ -1276,7 +1277,7 @@ Package: libreoffice-sdbc-postgresql Section: misc -Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Depends: libreoffice-core (>= 1:3.5.0~beta), ${misc:Depends}, ${shlibs:Depends} Suggests: postgresql (>= 8.4) Breaks: ure (<< 1.5.1+OOo3.1.1-15) @@ -1291,7 +1292,7 @@ Package: libreoffice-mysql-connector Section: misc -Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends} Suggests: mariadb-server | mysql-server (>= 5.1) Conflicts: libreoffice-common (<< 1:3.5~), diff -Nru libreoffice-5.0.2~rc2/debian/control.in libreoffice-5.0.2/debian/control.in --- libreoffice-5.0.2~rc2/debian/control.in 2015-09-24 06:40:45.000000000 +0000 +++ libreoffice-5.0.2/debian/control.in 2015-10-09 12:08:23.000000000 +0000 @@ -548,14 +548,15 @@ Enhances: libreoffice Conflicts: libgtk2.0-0 (= 2.12.10-1) [amd64], lo-menubar Provides: lo-menubar -Replaces: lo-menubar +Replaces: libreoffice-core (<< 1:5.0.2), lo-menubar Description: office productivity suite -- GTK+ integration LibreOffice is a full-featured office productivity suite that provides a near drop-in replacement for Microsoft(R) Office. . This package contains the Gtk plugin for drawing LibreOffices widgets with Gtk+ and a Gtk/GNOMEish File Picker and print dialog when running - under GNOME. It also contains a QuickStarter for the "notification area". + under GNOME. It also contains a QuickStarter for the "notification area" + and a (basic) GTK+ document viewer widget. Package: libreoffice-gtk3 Architecture: %OOO_ARCHS% diff -Nru libreoffice-5.0.2~rc2/debian/rules libreoffice-5.0.2/debian/rules --- libreoffice-5.0.2~rc2/debian/rules 2015-09-24 06:44:07.000000000 +0000 +++ libreoffice-5.0.2/debian/rules 2015-10-09 12:37:18.000000000 +0000 @@ -89,7 +89,7 @@ ######### # Default package configuration # -OOO_ARCHS = alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc +OOO_ARCHS = alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc PATCHSET=$(DEB_VENDOR) BUILD_DEPS=\ autoconf,\ @@ -202,6 +202,7 @@ # system anyways if enabled SYSTEM_STUFF += libebook SYSTEM_STUFF += libabw +SYSTEM_STUFF += libpagemaker BUILD_CAIROCANVAS=y SYSTEM_STUFF += cairo CAIRO_FONTS_PATCH=y @@ -709,7 +710,7 @@ USE_VLC:=n #temp. hacks ENABLE_EVO2:=n - SYSTEM_STUFF := $(filter-out orcus, $(SYSTEM_STUFF)) + #SYSTEM_STUFF := $(filter-out orcus, $(SYSTEM_STUFF)) # libgltf-dev (0.0.2-2) is in vivid/universe, needs MIR, was shipped with LibreOffice 4.4 in vivid # libcoinor-libcoinmp-dev is in vivid/universe, needs MIR, was shipped with LibreOffice 4.4 in vivid @@ -741,7 +742,7 @@ # possible backports SYSTEM_STUFF := $(filter-out libodfgen libmwaw libetonyek libfreehand libebook libeot libabw harfbuzz, $(SYSTEM_STUFF)) SYSTEM_STUFF := $(filter-out mdds orcus libgltf coinmp libcmis glm, $(SYSTEM_STUFF)) - SYSTEM_STUFF := $(filter-out opencollada collada2gltf, $(SYSTEM_STUFF)) + SYSTEM_STUFF := $(filter-out libpagemaker opencollada collada2gltf, $(SYSTEM_STUFF)) endif endif @@ -1143,17 +1144,12 @@ IDLC_CPP_DEPENDS := ucpp endif else - ifeq "$(PRECISE_BACKPORT)" "y" - IDLC_CPP_DEPENDS := cpp-4.6 - CONFIGURE_FLAGS += --with-idlc-cpp=cpp-4.6 - else # hardcode 4.7 as 4.8 fails: # 14:17 <@caolan> ah, "build fails with cpp 4.8.0, this is fixable by passing # -P, but then idlc produces empty urd files" # trying to use cpp-4.9 instead now - IDLC_CPP_DEPENDS := cpp-4.9 - CONFIGURE_FLAGS += --with-idlc-cpp=cpp-4.9 - endif + IDLC_CPP_DEPENDS := cpp-4.6 + CONFIGURE_FLAGS += --with-idlc-cpp=cpp-4.6 endif BUILD_DEPS += , $(IDLC_CPP_DEPENDS) @@ -1381,7 +1377,7 @@ BUILD_DEPS += , libgtk2.0-dev (>= 2.10) endif ifeq "$(BUILD_GTK3)" "y" - BUILD_DEPS += , libgtk-3-dev (>= 3.2~) + BUILD_DEPS += , libgtk-3-dev (>= 3.8~) CONFIGURE_FLAGS+= --enable-gtk3 ifneq (cairo,$(findstring cairo,$(SYSTEM_STUFF))) $(error GTK3 build fails without system-cairo!!) @@ -2410,6 +2406,7 @@ ifeq "$(BUILD_GTK)" "y" mkdir -p -m755 $(PKGDIR)-gtk/$(OODIR)/share mv $(PKGDIR)-gnome/$(OODIR)/share/xdg $(PKGDIR)-gtk/$(OODIR)/share + mv $(PKGDIR)-core/$(OODIR)/program/liblibreofficekitgtk.so $(PKGDIR)-gtk/$(OODIR)/program/ ifeq "$(ENABLE_GIO)" "y" mv $(PKGDIR)-gtk/$(OODIR)/program/libucpgio1lo.so \ $(PKGDIR)-gnome/$(OODIR)/program/