[libreoffice] 01/01: regen control...
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit ba22dece5269a902faff782783389f0eb1931c2d
Author: Rene Engelhard <rene@debian.org>
Date: Sun Oct 11 12:39:16 2015 +0200
regen control...
---
changelog | 2 +-
control | 62 ++++++++++++++++++++++++++++++++------------------------------
2 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/changelog b/changelog
index 409c6ac..4a2bf62 100644
--- a/changelog
+++ b/changelog
@@ -22,7 +22,7 @@ libreoffice (1:5.0.3~rc1-1) unstable; urgency=medium
* debian/control.subsequentcheckbase.in:
- remove hardcoded dependency openjdk-7-jdk; we get default-jdk in anyway
- -- Rene Engelhard <rene@debian.org> Fri, 09 Oct 2015 21:08:40 +0200
+ -- Rene Engelhard <rene@debian.org> Sun, 11 Oct 2015 12:36:37 +0200
libreoffice (1:5.0.2-1) unstable; urgency=medium
diff --git a/control b/control
index 2e796a7..f1423f7 100644
--- a/control
+++ b/control
@@ -16,6 +16,7 @@ Build-Depends: ant (>= 1.7.0),
debhelper (>= 7.2.3~),
default-jdk,
default-jdk (>= 1:1.7-48) [ia64],
+ default-jdk (>= 2:1.7-52.1) [kfreebsd-amd64 kfreebsd-i386],
dh-python,
dpkg-dev (>= 1.16.1),
fastjar,
@@ -24,11 +25,11 @@ Build-Depends: ant (>= 1.7.0),
fontconfig,
fonts-crosextra-carlito,
fonts-liberation,
- g++-5 [hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386],
+ 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,
gperf,
@@ -63,7 +64,7 @@ Build-Depends: ant (>= 1.7.0),
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,
libgl1-mesa-dev,
libglew-dev,
@@ -148,26 +149,26 @@ Build-Depends: ant (>= 1.7.0),
Build-Depends-Indep: doxygen (>= 1.8.4),
fdupes,
fontforge,
- libbase-java [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc],
+ libbase-java [!hppa !ia64 !s390 !sparc],
libbsh-java,
libcommons-codec-java,
libcommons-httpclient-java,
libcommons-lang-java,
libcommons-logging-java,
- libflute-java (>= 1.1.6) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc],
- libfonts-java (>= 1.1.6) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc],
- libformula-java (>= 1.1.7) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc],
- liblayout-java (>= 0.2.10) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc],
- libloader-java (>= 1.1.6) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc],
- libpentaho-reporting-flow-engine-java (>= 0.9.4) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc],
- librepository-java (>= 1.1.6) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc],
- libsac-java [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc],
- libserializer-java (>= 1.1.6) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc],
- libxml-java (>= 1.1.6) [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc]
+ 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]
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),
@@ -201,7 +202,7 @@ Depends: fonts-sil-gentium-basic,
libreoffice-draw,
libreoffice-impress,
libreoffice-math,
- libreoffice-report-builder-bin [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc],
+ libreoffice-report-builder-bin [!hppa !ia64 !s390 !sparc],
libreoffice-writer,
${avmedia-be-depends},
${dejavu-depends},
@@ -562,7 +563,7 @@ Description: office productivity suite -- equation editor
This package contains the equation editor component for LibreOffice.
Package: libreoffice-base-core
-Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel 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
Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
@@ -579,7 +580,7 @@ Description: office productivity suite -- shared library
install libreoffice-base.
Package: libreoffice-base
-Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel 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
Section: database
Depends: libreoffice-base-core (= ${binary:Version}),
libreoffice-base-drivers (= ${binary:Version}),
@@ -738,7 +739,7 @@ Description: Python-UNO bridge
Homepage: http://udk.openoffice.org/python/python-bridge.html
Package: libreoffice-officebean
-Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel 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
Section: java
Depends: libreoffice-core (= ${binary:Version}),
${java-common-depends},
@@ -875,7 +876,7 @@ Depends: libreoffice-core,
${misc:Depends},
${shlibs:Depends}
Replaces: libreoffice-base (<< 1:4.2~)
-Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel 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
Section: database
Enhances: libreoffice-base-drivers
Description: HSQLDB SDBC driver for LibreOffice
@@ -887,14 +888,14 @@ Description: HSQLDB SDBC driver for LibreOffice
Package: libreoffice-base-drivers
Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
-Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel 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
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 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]
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
@@ -4125,7 +4126,7 @@ Description: LibreOffice component for building database reports
Package: libreoffice-report-builder-bin
Section: misc
-Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x
+Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel 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
@@ -4284,7 +4285,7 @@ Description: office productivity suite -- KDE integration
Package: libreoffice-sdbc-postgresql
Section: misc
-Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel 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
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)
@@ -4299,7 +4300,7 @@ Homepage: http://wiki.documentfoundation.org/PostgreSQL-SDBC
Package: libreoffice-mysql-connector
Section: misc
-Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel 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
Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
Suggests: mariadb-server | mysql-server (>= 5.1)
Conflicts: libreoffice-common (<< 1:3.5~),
@@ -4314,7 +4315,7 @@ Description: MariaDB/MySQL Connector extension for LibreOffice
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 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
Section: gnome
Depends: libreoffice-base,
libreoffice-common (>= 1:3.4.0~),
@@ -4348,6 +4349,7 @@ Depends: ant (>= 1.7.0),
coinor-libcoinutils-dev (>= 2.9.15-3.1),
debhelper (>= 7.2.3~),
default-jdk,
+ default-jdk (>= 2:1.7-52.1),
dh-python,
doxygen (>= 1.8.4),
dpkg-dev (>= 1.16.1),
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: