[libreoffice] 02/02: Merge remote-tracking branch 'origin/master' into debian-experimental-5.1
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit dd8f7953644a3d55e8829170ef6bc1ba0dd64ceb
Merge: b8dae81 8454b93
Author: Rene Engelhard <rene@debian.org>
Date: Mon Feb 8 07:50:12 2016 +0100
Merge remote-tracking branch 'origin/master' into debian-experimental-5.1
Conflicts:
changelog
control
rules
changelog | 4 ++--
control | 64 +++++++++++++++++++++++++++++++--------------------------------
rules | 7 ++-----
3 files changed, 35 insertions(+), 40 deletions(-)
diff --cc changelog
index 0eae2c7,4613d4c..551f746
--- a/changelog
+++ b/changelog
@@@ -10,38 -9,19 +10,38 @@@ libreoffice (1:5.1.1~rc1~git20160205-1
-I$JAVA_HOME/include/linux to JAVAINC for kFreeBSD to find jni_md.h
* debian/rules:
- - build-depend on default-jdk (>= 2:1.8-55) on sparc64 to go sure
- - update/clean up up JAVA_RUNTIME_DEPENDS: move gcj-jre after all the
- openjdks and add openjdk-8-jre
+ - remove sparc64 again, we're actually not ported
* debian/libreoffice-common.maintscript:
rm_conffile /etc/bash_completion.d/libreoffice.sh
* debian/scripts/gid2pkgdirs.sh: adapt for bash_completion move and install
without .sh
+ * debian/libreoffice-common.{pre,post}{rm,inst}.in: remove long obsolete
+ (3.4, OOo->LO) maintainer script snippets
+
+ -- Rene Engelhard <rene@debian.org> Sat, 19 Dec 2015 01:50:15 +0100
+
+libreoffice (1:5.1.0~rc3-1) experimental; urgency=medium
+
+ * New upstream release candidate
+
+ * debian/patches/gcc-6.diff: backport gcc 6 compile/test fixes from master
+ (closes: #811686)
+ * debian/patches/GCC-6-PR69273-workaround.diff: add gcc 6 ICE workaround
+ from Stephan Bergmann
+
+ * debian/rules:
+ - -officebean is a arch-dep package, move pom generation and mh_*
+ calls for it to install-arch...
+ - adapt for changed debhelper internals to make out -dbgsym hacks work
+ again and build-depend on debhelper >= 9.20160115
+ - update/clean up up JAVA_RUNTIME_DEPENDS: move gcj-jre after all the
+ openjdks and add openjdk-8-jre
- -- Rene Engelhard <rene@debian.org> Fri, 05 Feb 2016 12:14:51 +0100
+ -- Rene Engelhard <rene@debian.org> Mon, 08 Feb 2016 07:44:09 +0100
-libreoffice (1:5.0.5~rc1-1) unstable; urgency=medium
+libreoffice (1:5.1.0~rc2-1) experimental; urgency=medium
- * New upstream release candidate
+ * New upstream release candidate
* debian/patches/disable-db-tests.diff,
debian/patches/smoketest-disable-extension-tests.diff: make apply again...
diff --cc control
index d679869,57403bb..1b2624c
--- a/control
+++ b/control
@@@ -13,15 -13,14 +13,14 @@@ Build-Depends: ant (>= 1.7.0) [!mips64]
bzip2,
coinor-libcoinmp-dev (>= 1.7.6+dfsg1-2),
coinor-libcoinutils-dev (>= 2.9.15-3.1),
- debhelper (>= 7.2.3~),
- default-jdk,
+ debhelper (>= 9.20160115),
default-jdk (>= 1:1.7-48) [ia64],
default-jdk (>= 2:1.7-52.1) [kfreebsd-amd64 kfreebsd-i386],
- default-jdk (>= 2:1.8-55) [sparc64],
+ default-jdk [!mips64],
dh-python,
- dpkg-dev (>= 1.16.1),
+ dpkg-dev (>= 1.18.2~),
fastjar,
- firebird-dev (>= 2.5.2.26540.ds4-2) [!hppa !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64],
- firebird-dev (>= 2.5.2.26540.ds4-2) [!hppa !mips !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc],
++ firebird-dev (>= 2.5.2.26540.ds4-2) [!hppa !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc],
flex (>= 2.3.35),
fontconfig,
fonts-crosextra-carlito,
@@@ -193,10 -192,10 +192,10 @@@ Bugs: mailto:debian-openoffice@lists.de
Homepage: http://www.libreoffice.org
Package: libreoffice
- Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
-Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
++Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
Section: metapackages
Depends: fonts-sil-gentium-basic,
- libreoffice-base,
+ libreoffice-base [!mips64],
libreoffice-calc,
libreoffice-core (= ${binary:Version}),
libreoffice-draw,
@@@ -318,7 -318,7 +317,7 @@@ Description: office productivity suite
indic languages.
Package: libreoffice-core
- Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
-Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
++Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
Depends: fontconfig,
fonts-opensymbol,
libreoffice-common (>> ${base-version}),
@@@ -493,8 -493,8 +492,8 @@@ Description: office productivity suite
the Java support for LibreOffice (Java classes, scripts, config snippets).
Package: libreoffice-writer
- Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
-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}),
++Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
+Depends: libreoffice-base-core (= ${binary:Version}) [!mips64],
libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
@@@ -513,8 -513,8 +512,8 @@@ Description: office productivity suite
This package contains the wordprocessor component for LibreOffice.
Package: libreoffice-calc
- Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
-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}),
++Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
+Depends: libreoffice-base-core (= ${binary:Version}) [!mips64],
libreoffice-core (= ${binary:Version}),
${lpsolve-dep},
${misc:Depends},
@@@ -527,7 -527,7 +526,7 @@@ Description: office productivity suite
This package contains the spreadsheet component for LibreOffice.
Package: libreoffice-impress
- Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
-Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
++Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
Depends: libreoffice-core (= ${binary:Version}),
libreoffice-draw (= ${binary:Version}),
${misc:Depends},
@@@ -541,7 -541,7 +540,7 @@@ Description: office productivity suite
This package contains the presentation component for LibreOffice.
Package: libreoffice-draw
- Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
-Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
++Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
@@@ -552,7 -552,7 +551,7 @@@ Description: office productivity suite
This package contains the drawing component for LibreOffice.
Package: libreoffice-math
- Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
-Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
++Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
Depends: fonts-opensymbol,
libreoffice-core (= ${binary:Version}),
${misc:Depends},
@@@ -564,7 -564,7 +563,7 @@@ Description: office productivity suite
This package contains the equation editor component for LibreOffice.
Package: libreoffice-base-core
- Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
-Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
++Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
@@@ -581,7 -581,7 +580,7 @@@ Description: office productivity suite
install libreoffice-base.
Package: libreoffice-base
- Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
-Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
++Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
Section: database
Depends: libreoffice-base-core (= ${binary:Version}),
libreoffice-base-drivers (= ${binary:Version}),
@@@ -677,7 -677,7 +676,7 @@@ Description: office productivity suite
enabled in the LibreOffice option menu.
Package: libreoffice-gtk
- Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
-Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
++Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
@@@ -691,11 -692,13 +690,11 @@@ Description: office productivity suite
.
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"
- and a (basic) GTK+ document viewer widget.
+ under GNOME. It also contains a QuickStarter for the "notification area".
Package: libreoffice-gnome
- Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
-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}),
++Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
+Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Recommends: ${gnome-gtk-recommends}
@@@ -717,7 -720,7 +716,7 @@@ Description: office productivity suite
Package: python3-uno
Section: python
- Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
-Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
++Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
Enhances: libreoffice
Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
@@@ -737,7 -740,7 +736,7 @@@ Description: Python-UNO bridg
Homepage: http://udk.openoffice.org/python/python-bridge.html
Package: libreoffice-officebean
- Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
-Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
++Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
Section: java
Depends: libreoffice-core (= ${binary:Version}),
${java-common-depends},
@@@ -817,7 -820,7 +816,7 @@@ Description: JavaScript script support
Package: libreoffice-pdfimport
Section: misc
Priority: extra
- Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
-Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
++Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el 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
@@@ -829,7 -832,7 +828,7 @@@
Package: libreoffice-avmedia-backend-gstreamer
Section: misc
- Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
-Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
++Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
Replaces: libreoffice-core (<< 1:4.2~)
Provides: libreoffice-avmedia-backend
@@@ -842,7 -845,7 +841,7 @@@ Description: GStreamer backend for Libr
Package: libreoffice-avmedia-backend-vlc
Section: misc
- Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
-Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
++Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
Depends: libreoffice-core,
${libvlc-dep} (>= 2.0.8),
${misc:Depends},
@@@ -874,7 -877,7 +873,7 @@@ Depends: libreoffice-core
${misc:Depends},
${shlibs:Depends}
Replaces: libreoffice-base (<< 1:4.2~)
- Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
-Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
++Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
Section: database
Enhances: libreoffice-base-drivers
Description: HSQLDB SDBC driver for LibreOffice
@@@ -886,14 -889,14 +885,14 @@@
Package: libreoffice-base-drivers
Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
- Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
-Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
++Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 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 arm64 armel armhf i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc]
- libreoffice-sdbc-hsqldb [alpha amd64 arm64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc]
++ libreoffice-sdbc-hsqldb [alpha amd64 arm64 armel armhf i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc]
Replaces: libreoffice-base (<< 1:4.3.0-3), libreoffice-core (<< 1:4.2~)
Breaks: libreoffice-base (<< 1:4.3.0-3)
Description: Database connectivity drivers for LibreOffice
@@@ -4075,7 -4020,7 +4074,7 @@@ Description: office productivity suite
Package: uno-libs3
Section: libs
- Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
-Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
++Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el 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~)
@@@ -4098,7 -4043,7 +4097,7 @@@ Description: LibreOffice UNO runtime en
Package: ure
Section: libs
- Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
-Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
++Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el 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)
@@@ -4120,7 -4065,7 +4119,7 @@@ Description: LibreOffice UNO runtime en
Package: libreoffice-ogltrans
Section: graphics
Priority: extra
- Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
-Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
++Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
Depends: libreoffice-common,
libreoffice-core,
libreoffice-impress,
@@@ -4183,7 -4129,7 +4182,7 @@@ Description: LibreOffice component for
Package: libreoffice-report-builder-bin
Section: misc
- Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386
-Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386
++Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386
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
@@@ -4205,9 -4151,68 +4204,9 @@@ 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: libreoffice-dbg
-Section: debug
-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}) | python3-uno (= ${binary:Version}) | libreoffice-ogltrans (= ${b [...]
- ${misc:Depends}
-Recommends: gdb, ure-dbg, ${python-six-recommends}
-Suggests: ${dbg-dbg-suggests}
-Pre-Depends: dpkg (>= 1.15.6)
-Description: office productivity suite -- debug symbols
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the debug symbols of all LibreOffice and
- LibreOffice SDK components.
-
-Package: uno-libs3-dbg
-Section: debug
-Priority: extra
-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)
-Recommends: gdb, ${python-six-recommends}
-Description: LibreOffice UNO runtime environment -- public shared library debug symbols
- The Uno Runtime Environment (URE) is the well-known UNO component model
- of LibreOffice, packaged up as an individual product.
- .
- It offers you a flexible, low-overhead component model that is most ideal
- for (but not limited to) combining in one application components written in
- different computer languages, and developed by different parties. You can use
- it to create any kind of application, in whatever application domain you can
- imagine.
- .
- This package contains the (detached) debug symbols for the public libraries:
- - libuno_sal: System Abstraction Layer (C Interface)
- - libuno_salhelpergcc3: additional C++ functionality for sal
- - libuno_cppu: C++ UNO bridge (C Interface)
- - libuno_cppuhelpergcc3: additionl C++ functionality for cppu
- - libuno_purpenvhelpergcc3: "purpose environments" helper
-
-Package: ure-dbg
-Section: debug
-Priority: extra
-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}
-Description: LibreOffice UNO runtime environment -- debug symbols
- The Uno Runtime Environment (URE) is the well-known UNO component model
- of LibreOffice, packaged up as an individual product.
- .
- It offers you a flexible, low-overhead component model that is most ideal
- for (but not limited to) combining in one application components written in
- different computer languages, and developed by different parties. You can use
- it to create any kind of application, in whatever application domain you can
- imagine.
- .
- This package contains the (detached) debug symbols for the URE.
-
Package: libreoffice-dev
Section: devel
- Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
-Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
++Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
Depends: libreoffice-core (= ${binary:Version}),
${idlc-cpp-depends},
${misc:Depends},
@@@ -4259,37 -4264,8 +4258,37 @@@ Description: LibreOfficeKit -- header
.
This package contains the headers needed for using LibreOfficeKit.
+Package: libreoffice-gtk3
- Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
++Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
+Depends: libreoffice-core (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Recommends: libreoffice-style-tango
+Section: gnome
+Enhances: libreoffice
+Description: office productivity suite -- GTK+ 3.0 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+ 3.0 and Gtk/GNOMEish print dialog when running under GNOME.
+ It also contains a (basic) GTK+ document viewer widget.
+
+Package: gir1.2-lokdocview-0.1
- Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
++Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
+Section: introspection
+Depends: libreoffice-gtk3 (= ${binary:Version}),
+ ${gir:Depends},
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: GTK3 widget wrapping LibreOffice functionality - introspection
+ LOKDocView is the GTK3 widget that wraps the libreoffice functionality and
+ exposes a simple API for applications to use this widget.
+ .
+ This package contains the Introspection data.
+
Package: libreoffice-kde
- Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
-Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
++Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
@@@ -4312,7 -4288,8 +4311,7 @@@ Description: office productivity suite
Package: libreoffice-sdbc-postgresql
Section: misc
- Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
-Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
++Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 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)
@@@ -4327,7 -4304,7 +4326,7 @@@ Homepage: http://wiki.documentfoundatio
Package: libreoffice-mysql-connector
Section: misc
- Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
-Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
++Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
Suggests: mariadb-server | mysql-server (>= 5.1)
Conflicts: libreoffice-common (<< 1:3.5~),
@@@ -4342,7 -4319,7 +4341,7 @@@ Description: MariaDB/MySQL Connector ex
database from LibreOffice without any wrapper layer such as ODBC or JDBC.
Package: libreoffice-evolution
- Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
-Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
++Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
Section: gnome
Depends: libreoffice-base,
libreoffice-common (>= 1:3.4.0~),
@@@ -4374,13 -4351,12 +4373,12 @@@ Depends: ant (>= 1.7.0)
bzip2,
coinor-libcoinmp-dev (>= 1.7.6+dfsg1-2),
coinor-libcoinutils-dev (>= 2.9.15-3.1),
- debhelper (>= 7.2.3~),
+ debhelper (>= 9.20160115),
default-jdk,
default-jdk (>= 2:1.7-52.1),
- default-jdk (>= 2:1.8-55),
dh-python,
doxygen (>= 1.8.4),
- dpkg-dev (>= 1.16.1),
+ dpkg-dev (>= 1.18.2~),
fastjar,
firebird-dev (>= 2.5.2.26540.ds4-2),
flex (>= 2.3.35),
diff --cc rules
index f92935f,bd743e8..a2cfd96
--- a/rules
+++ b/rules
@@@ -81,7 -81,7 +81,7 @@@ endi
#########
# Default package configuration
#
- OOO_ARCHS = alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
-OOO_ARCHS = alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
++OOO_ARCHS = alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
PATCHSET=$(DEB_VENDOR)
BUILD_DEPS=\
autoconf,\
@@@ -602,9 -574,9 +602,9 @@@ IGNORE_MAKE_CHECK_FAILURES:
endif
endif
-OOO_64BIT_ARCHS = $(filter alpha amd64 arm64 ia64 kfreebsd-amd64 ppc64 ppc64el s390x, $(OOO_ARCHS))
+OOO_64BIT_ARCHS = $(filter alpha amd64 arm64 ia64 kfreebsd-amd64 mips64 mips64el ppc64 ppc64el s390x, $(OOO_ARCHS))
$(eval $(call gen_no_archs,OOO_64BIT_ARCHS))
- OOO_BE_ARCHS = $(filter hppa m68k mips mips64 powerpc powerpcspe ppc64 s390 s390x sparc sparc64,$(OOO_ARCHS))
-OOO_BE_ARCHS = $(filter hppa m68k mips powerpc powerpcspe ppc64 s390 s390x sparc,$(OOO_ARCHS))
++OOO_BE_ARCHS = $(filter hppa m68k mips mips64 powerpc powerpcspe ppc64 s390 s390x sparc,$(OOO_ARCHS))
OOO_LE_ARCHS = $(filter-out $(OOO_BE_ARCHS),$(OOO_ARCHS))
$(eval $(call gen_no_archs,OOO_LE_ARCHS))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: