[libreoffice] 05/05: 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 ba2de4d6995c1e256e79292aa0842541ede4e65c
Merge: e307d0f ba22dec
Author: Rene Engelhard <rene@debian.org>
Date: Sun Oct 11 12:40:17 2015 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.1
changelog | 4 +++-
control | 64 ++++++++++++++++++++++++++++++++-------------------------------
rules | 3 +++
3 files changed, 39 insertions(+), 32 deletions(-)
diff --cc control
index cbce41c,f1423f7..6c5c53b
--- a/control
+++ b/control
@@@ -14,20 -14,24 +14,21 @@@ Build-Depends: ant (>= 1.7.0) [!mips64e
coinor-libcoinmp-dev (>= 1.7.6+dfsg1-2),
coinor-libcoinutils-dev (>= 2.9.15-3.1),
debhelper (>= 7.2.3~),
- default-jdk,
default-jdk (>= 1:1.7-48) [ia64],
+ default-jdk (>= 2:1.7-52.1) [kfreebsd-amd64 kfreebsd-i386],
+ default-jdk [!mips64eb],
dh-python,
dpkg-dev (>= 1.16.1),
fastjar,
firebird-dev (>= 2.5.2.26540.ds4-2) [!hppa !mips !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc],
flex (>= 2.3.35),
- g++-5 [hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386],
- fontconfig,
- fonts-crosextra-carlito,
- fonts-liberation,
+ g++-5 [hppa ia64 s390 sparc],
g++-mingw-w64-i686 [i386 amd64],
- gcc-5 [hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386],
- gcj-jdk [hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386],
- gcj-native-helper [hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386],
+ 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~),
@@@ -60,9 -64,8 +61,9 @@@
libfontconfig1-dev,
libfreehand-dev (>= 0.1),
libfreetype6-dev (>= 2.2.0),
- libgcj-common (>= 1:4.4.1) [hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386],
+ libgcj-common (>= 1:4.4.1) [hppa ia64 s390 sparc],
libgconf2-dev,
+ libgirepository1.0-dev (>= 1.32),
libgl1-mesa-dev,
libglew-dev,
libglib2.0-dev (>= 2.15.0),
@@@ -147,23 -149,26 +148,23 @@@
Build-Depends-Indep: doxygen (>= 1.8.4),
fdupes,
fontforge,
- libbase-java [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !mips64eb !s390 !sparc],
- libbase-java [!hppa !ia64 !s390 !sparc],
++ libbase-java [!hppa !ia64 !mips64eb !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 [!mips64eb],
- libflute-java (>= 1.1.6) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !mips64eb !s390 !sparc],
- libfonts-java (>= 1.1.6) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !mips64eb !s390 !sparc],
- libformula-java (>= 1.1.7) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !mips64eb !s390 !sparc],
- liblayout-java (>= 0.2.10) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !mips64eb !s390 !sparc],
- libloader-java (>= 1.1.6) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !mips64eb !s390 !sparc],
- libpentaho-reporting-flow-engine-java (>= 0.9.4) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !mips64eb !s390 !sparc],
- librepository-java (>= 1.1.6) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !mips64eb !s390 !sparc],
- libsac-java [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !mips64eb !s390 !sparc],
- libserializer-java (>= 1.1.6) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !mips64eb !s390 !sparc],
- libxml-java (>= 1.1.6) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !mips64eb !s390 !sparc]
++ libflute-java (>= 1.1.6) [!hppa !ia64 !mips64eb !s390 !sparc],
++ libfonts-java (>= 1.1.6) [!hppa !ia64 !mips64eb !s390 !sparc],
++ libformula-java (>= 1.1.7) [!hppa !ia64 !mips64eb !s390 !sparc],
++ liblayout-java (>= 0.2.10) [!hppa !ia64 !mips64eb !s390 !sparc],
++ libloader-java (>= 1.1.6) [!hppa !ia64 !mips64eb !s390 !sparc],
++ libpentaho-reporting-flow-engine-java (>= 0.9.4) [!hppa !ia64 !mips64eb !s390 !sparc],
++ librepository-java (>= 1.1.6) [!hppa !ia64 !mips64eb !s390 !sparc],
++ libsac-java [!hppa !ia64 !mips64eb !s390 !sparc],
++ libserializer-java (>= 1.1.6) [!hppa !ia64 !mips64eb !s390 !sparc],
++ libxml-java (>= 1.1.6) [!hppa !ia64 !mips64eb !s390 !sparc]
Build-Conflicts: amd-libopencl1,
- ant (= 1.8.0-1) [hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386],
- ant (= 1.8.0-2) [hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386],
- ant (= 1.8.0-3) [hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386],
+ 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],
flex (= 2.5.34-1) [amd64],
g++-4.6 (= 4.6.1-10),
g++-4.6 (= 4.6.1-11),
@@@ -182,9 -187,9 +183,9 @@@
nvidia-libopencl1,
qt3-dev-tools
Standards-Version: 3.9.4
-Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.0
+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
@@@ -197,7 -202,7 +198,7 @@@ Depends: fonts-sil-gentium-basic
libreoffice-draw,
libreoffice-impress,
libreoffice-math,
- libreoffice-report-builder-bin [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !mips64eb !s390 !sparc],
- libreoffice-report-builder-bin [!hppa !ia64 !s390 !sparc],
++ libreoffice-report-builder-bin [!hppa !ia64 !mips64eb !s390 !sparc],
libreoffice-writer,
${avmedia-be-depends},
${dejavu-depends},
@@@ -558,7 -563,7 +559,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 hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386
-Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
++Architecture: alpha amd64 arm64 armel armhf arm64 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}
@@@ -575,7 -580,7 +576,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 hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386
-Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
++Architecture: alpha amd64 arm64 armel armhf arm64 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}),
@@@ -732,7 -739,7 +733,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 hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386
-Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
++Architecture: alpha amd64 arm64 armel armhf arm64 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},
@@@ -869,7 -876,7 +870,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 hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386
-Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
++Architecture: alpha amd64 arm64 armel armhf arm64 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
@@@ -881,14 -888,14 +882,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 hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386
-Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
++Architecture: alpha amd64 arm64 armel armhf arm64 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 arm64 i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386]
- libreoffice-sdbc-hsqldb [alpha amd64 arm64 armel armhf arm64 i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc]
++ 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]
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
@@@ -4176,7 -4126,7 +4177,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
-Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386
++Architecture: alpha amd64 arm64 armel armhf arm64 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
@@@ -4363,7 -4284,8 +4364,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 hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386
-Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
++Architecture: alpha amd64 arm64 armel armhf arm64 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)
@@@ -4378,7 -4300,7 +4379,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 hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386
-Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
++Architecture: alpha amd64 arm64 armel armhf arm64 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~),
@@@ -4393,7 -4315,7 +4394,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 hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386
-Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
++Architecture: alpha amd64 arm64 armel armhf arm64 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~),
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: