[libreoffice] 01/01: 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 0f96d161a722a3d38a8a1d04ee246e186d3b7ea9
Merge: 406b318 67849bf
Author: Rene Engelhard <rene@debian.org>
Date: Fri Feb 5 14:09:42 2016 +0100
Merge remote-tracking branch 'origin/master' into debian-experimental-5.1
changelog | 6 +++-
control | 64 ++++++++++++++++++----------------
patches/kfreebsd-openjdk8-JAVAINC.diff | 28 +++++++++++++++
patches/series | 1 +
rules | 3 ++
5 files changed, 70 insertions(+), 32 deletions(-)
diff --cc changelog
index e3bf210,8a4aaa1..59b4b72
--- a/changelog
+++ b/changelog
@@@ -6,38 -5,23 +6,42 @@@ libreoffice (1:5.1.1~rc1~git20160204-1
* debian/patches/bash-completion-dir.diff: add from master;
install bash completion to "new" /usr/share/bash-completion/completions
+ * debian/patches/kfreebsd-openjdk8-JAVAINC.diff: add
+ -I$JAVA_HOME/include/linux to JAVAINC for kFreeBSD to find jni_md.h
+ * debian/rules:
- - update/clean up up JAVA_RUNTIME_DEPENDS: move gcj-jre after all the
- openjdks and add openjdk-8-jre
+ - build-depend on default-jdk (>= 2:1.8-55) on sparc64 to go sure
* 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> Wed, 27 Jan 2016 08:37:19 +0100
+ -- Rene Engelhard <rene@debian.org> Fri, 05 Feb 2016 12:14:51 +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 99f4ce7,7622051..d679869
--- a/control
+++ b/control
@@@ -13,26 -13,26 +13,27 @@@ 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 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64],
+ firebird-dev (>= 2.5.2.26540.ds4-2) [!hppa !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64],
flex (>= 2.3.35),
fontconfig,
fonts-crosextra-carlito,
fonts-liberation,
- g++-5 [hppa ia64 s390 sparc sparc64],
+ g++-5 [hppa ia64 s390 sparc],
g++-mingw-w64-i686 [i386 amd64],
- gcc-5 [hppa ia64 s390 sparc sparc64],
- gcj-jdk [hppa ia64 s390 sparc sparc64],
- gcj-native-helper [hppa ia64 s390 sparc sparc64],
+ gcc-5 [hppa ia64 s390 sparc],
+ gcj-jdk [hppa ia64 s390 sparc],
+ gcj-native-helper [hppa ia64 s390 sparc],
gdb,
gettext,
+ gobject-introspection (>= 1.32.0),
gperf,
java-common (>= 0.49),
javahelper (>= 0.37~),
@@@ -67,8 -65,9 +68,8 @@@
libfontconfig1-dev,
libfreehand-dev (>= 0.1),
libfreetype6-dev (>= 2.2.0),
- libgcj-common (>= 1:4.4.1) [hppa ia64 s390 sparc sparc64],
+ libgcj-common (>= 1:4.4.1) [hppa ia64 s390 sparc],
- libgconf2-dev,
- libgl1-mesa-dev,
+ libgirepository1.0-dev (>= 1.32),
libglew-dev,
libglib2.0-dev (>= 2.15.0),
libglm-dev (>= 0.9.6.3),
@@@ -149,24 -149,26 +150,24 @@@
zlib1g-dev
Build-Depends-Indep: doxygen (>= 1.8.4),
fdupes,
- libbase-java [!hppa !ia64 !mips64 !s390 !sparc !sparc64],
- libbase-java [!hppa !ia64 !s390 !sparc],
++ libbase-java [!hppa !ia64 !mips64 !s390 !sparc],
libbsh-java,
- libcommons-codec-java,
- libcommons-httpclient-java,
- libcommons-lang-java,
- libcommons-logging-java,
- libflute-java (>= 1.1.6) [!hppa !ia64 !s390 !sparc],
- libfonts-java (>= 1.1.6) [!hppa !ia64 !s390 !sparc],
- libformula-java (>= 1.1.7) [!hppa !ia64 !s390 !sparc],
- liblayout-java (>= 0.2.10) [!hppa !ia64 !s390 !sparc],
- libloader-java (>= 1.1.6) [!hppa !ia64 !s390 !sparc],
- libpentaho-reporting-flow-engine-java (>= 0.9.4) [!hppa !ia64 !s390 !sparc],
- librepository-java (>= 1.1.6) [!hppa !ia64 !s390 !sparc],
- libsac-java [!hppa !ia64 !s390 !sparc],
- libserializer-java (>= 1.1.6) [!hppa !ia64 !s390 !sparc],
- libxml-java (>= 1.1.6) [!hppa !ia64 !s390 !sparc]
+ libcommons-logging-java [!mips64],
- libflute-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc !sparc64],
- libfonts-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc !sparc64],
- libformula-java (>= 1.1.7) [!hppa !ia64 !mips64 !s390 !sparc !sparc64],
- liblayout-java (>= 0.2.10) [!hppa !ia64 !mips64 !s390 !sparc !sparc64],
- libloader-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc !sparc64],
- libpentaho-reporting-flow-engine-java (>= 0.9.4) [!hppa !ia64 !mips64 !s390 !sparc !sparc64],
- librepository-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc !sparc64],
- libsac-java [!hppa !ia64 !mips64 !s390 !sparc !sparc64],
- libserializer-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc !sparc64],
- libxml-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc !sparc64]
++ libflute-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc],
++ libfonts-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc],
++ libformula-java (>= 1.1.7) [!hppa !ia64 !mips64 !s390 !sparc],
++ liblayout-java (>= 0.2.10) [!hppa !ia64 !mips64 !s390 !sparc],
++ libloader-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc],
++ libpentaho-reporting-flow-engine-java (>= 0.9.4) [!hppa !ia64 !mips64 !s390 !sparc],
++ librepository-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc],
++ libsac-java [!hppa !ia64 !mips64 !s390 !sparc],
++ libserializer-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc],
++ libxml-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc]
Build-Conflicts: amd-libopencl1,
- ant (= 1.8.0-1) [hppa ia64 s390 sparc sparc64],
- ant (= 1.8.0-2) [hppa ia64 s390 sparc sparc64],
- ant (= 1.8.0-3) [hppa ia64 s390 sparc sparc64],
+ ant (= 1.8.0-1) [hppa ia64 s390 sparc],
+ ant (= 1.8.0-2) [hppa ia64 s390 sparc],
+ ant (= 1.8.0-3) [hppa ia64 s390 sparc],
+ firebird-dev (>= 3.0),
flex (= 2.5.34-1) [amd64],
g++-4.6 (= 4.6.1-10),
g++-4.6 (= 4.6.1-11),
@@@ -186,9 -187,9 +187,9 @@@
nvidia-libopencl1,
qt3-dev-tools
Standards-Version: 3.9.4
-Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
+Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.1
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
--Bugs:
++Bugs: mailto:debian-openoffice@lists.debian.org
Homepage: http://www.libreoffice.org
Package: libreoffice
@@@ -201,7 -202,7 +202,7 @@@ Depends: fonts-sil-gentium-basic
libreoffice-draw,
libreoffice-impress,
libreoffice-math,
- libreoffice-report-builder-bin [!hppa !ia64 !mips64 !s390 !sparc !sparc64],
- libreoffice-report-builder-bin [!hppa !ia64 !s390 !sparc],
++ libreoffice-report-builder-bin [!hppa !ia64 !mips64 !s390 !sparc],
libreoffice-writer,
${avmedia-be-depends},
${dejavu-depends},
@@@ -563,7 -565,7 +564,7 @@@ Description: office productivity suite
This package contains the equation editor component for LibreOffice.
Package: libreoffice-base-core
- Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc sparc64
-Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
++Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
@@@ -580,7 -582,7 +581,7 @@@ Description: office productivity suite
install libreoffice-base.
Package: libreoffice-base
- Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc sparc64
-Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
++Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
Section: database
Depends: libreoffice-base-core (= ${binary:Version}),
libreoffice-base-drivers (= ${binary:Version}),
@@@ -736,7 -741,7 +737,7 @@@ Description: Python-UNO bridg
Homepage: http://udk.openoffice.org/python/python-bridge.html
Package: libreoffice-officebean
- Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc sparc64
-Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
++Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
Section: java
Depends: libreoffice-core (= ${binary:Version}),
${java-common-depends},
@@@ -873,7 -878,7 +874,7 @@@ Depends: libreoffice-core
${misc:Depends},
${shlibs:Depends}
Replaces: libreoffice-base (<< 1:4.2~)
- Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc sparc64
-Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
++Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
Section: database
Enhances: libreoffice-base-drivers
Description: HSQLDB SDBC driver for LibreOffice
@@@ -885,14 -890,14 +886,14 @@@
Package: libreoffice-base-drivers
Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
- Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc sparc64
-Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
++Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 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 arm64 i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc sparc64]
- libreoffice-sdbc-hsqldb [alpha amd64 arm64 armel armhf i386 mips mipsel 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 mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 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
@@@ -4182,7 -4130,7 +4183,7 @@@ Description: LibreOffice component for
Package: libreoffice-report-builder-bin
Section: misc
- Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386
-Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386
++Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 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
@@@ -4311,7 -4289,8 +4312,7 @@@ Description: office productivity suite
Package: libreoffice-sdbc-postgresql
Section: misc
- Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc sparc64
-Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
++Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 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)
@@@ -4326,7 -4305,7 +4327,7 @@@ Homepage: http://wiki.documentfoundatio
Package: libreoffice-mysql-connector
Section: misc
- Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc sparc64
-Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
++Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 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~),
@@@ -4341,7 -4320,7 +4342,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 arm64 i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc sparc64
-Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
++Architecture: alpha amd64 arm64 armel armhf i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
Section: gnome
Depends: libreoffice-base,
libreoffice-common (>= 1:3.4.0~),
@@@ -4373,12 -4352,13 +4374,13 @@@ 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 patches/series
index fed3759,a878f43..5b40390
--- a/patches/series
+++ b/patches/series
@@@ -27,8 -28,8 +27,9 @@@ odk-no-dot.dif
hppa-is-32bit.diff
gcj-no-bitness-check.diff
rsc-no-error-about-unknown-switch.diff
-liborcus-0.9.1.diff
debian-branding.diff
-icu-56.diff
+disable-npapi-plugin-support.diff
+gcc-6.diff
+GCC-6-PR69273-workaround.diff
bash-completion-dir.diff
+ kfreebsd-openjdk8-JAVAINC.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: