[libreoffice] 01/02: use java6_architectures for computing OOO_JAVA_ARCHS; update changelog
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.3
in repository libreoffice.
commit 713983e30b681fcda01d660989cb71f0caaab639
Author: Rene Engelhard <rene@debian.org>
Date: Sat Aug 27 09:05:53 2016 +0200
use java6_architectures for computing OOO_JAVA_ARCHS; update changelog
---
changelog | 9 +++++----
control | 63 +++++++++++++++++++++++++++++------------------------------
rules | 2 +-
tests/control | 2 +-
4 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/changelog b/changelog
index ab45556..62a9e67 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.3.0~alpha0~git20160825-1) UNRELEASED; urgency=medium
+libreoffice (1:5.3.0~alpha0~git20160827-1) UNRELEASED; urgency=medium
* New upstream snapshot
- fixes typo in VCL.xcu; s/Tino/Tinos/ (closes: #834580)
@@ -9,11 +9,12 @@ libreoffice (1:5.3.0~alpha0~git20160825-1) UNRELEASED; urgency=medium
transitionals again
* debian/rules, control.gcj.in: cleanup:
- remove support for gcj (and thus building -gcj "native") completely;
- openjdk-9 apparently will drop support for source/target 1.5 (which gcj
- only supports) and gcc-7 apparently even will drop gcj, too - and upstream
- bumped their requirement to 1.6 anyways.
+ removed upstream; and also openjdk-9 apparently will drop support for
+ source/target 1.5 (which gcj only supports) and gcc-7 apparently even
+ will drop gcj, too
(also the officeotron/odfvalidator stuff fails because due to the java-gcj
in the path for safety reasons it picks up gcj..)
+ - use java6_architectures for computing OOO_JAVA_ARCHS
-- Rene Engelhard <rene@debian.org> Thu, 26 May 2016 20:00:57 +0200
diff --git a/control b/control
index a26c6b6..6674778 100644
--- a/control
+++ b/control
@@ -3,8 +3,8 @@ Section: editors
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <rene@debian.org>, Chris Halls <halls@debian.org>
-Build-Depends: ant (>= 1.7.0) [!mips64],
- ant-optional (>= 1.7.0) [!mips64],
+Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
+ ant-optional (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
autoconf,
automake,
bc,
@@ -15,8 +15,7 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
coinor-libcoinmp-dev (>= 1.7.6+dfsg1-2),
coinor-libcoinutils-dev (>= 2.9.15-3.1),
debhelper (>= 9.20160114),
- default-jdk (>= 1:1.6) [!mips64],
- default-jdk (>= 1:1.7-48) [ia64],
+ default-jdk (>= 1:1.6) [!hppa !mips64 !s390 !sparc],
default-jdk (>= 2:1.7-52.1) [kfreebsd-any],
default-jdk (>= 2:1.8-55) [sparc64],
dh-python,
@@ -37,7 +36,7 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
junit4 (>= 4.8.2-2) [!kfreebsd-amd64 !kfreebsd-i386 !sparc64] <!nocheck>,
kdelibs5-dev (>= 4:4.3.4),
libabw-dev (>= 0.1),
- libarchive-zip-perl [!mips64],
+ libarchive-zip-perl [!hppa !ia64 !mips64 !s390 !sparc],
libavahi-client-dev,
libbluetooth-dev [linux-any],
libboost-date-time-dev (>= 1.58),
@@ -77,7 +76,7 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
libgtk-3-dev (>= 3.8~),
libgtk2.0-dev (>= 2.10),
libharfbuzz-dev (>= 0.9.18),
- libhsqldb1.8.0-java (>> 1.8.0.10) [!mips64],
+ libhsqldb1.8.0-java (>> 1.8.0.10) [!hppa !ia64 !mips64 !s390 !sparc],
libhunspell-dev (>= 1.1.5-2),
libhyphen-dev (>= 2.4),
libice-dev,
@@ -149,19 +148,19 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
Build-Depends-Indep: doxygen (>= 1.8.4) <!nodoc>,
fdupes,
g++-mingw-w64-i686,
- libbase-java [!mips64],
+ libbase-java [!hppa !ia64 !mips64 !s390 !sparc],
libbsh-java,
- libcommons-logging-java [!mips64],
- libflute-java (>= 1.1.6) [!mips64],
- libfonts-java (>= 1.1.6) [!mips64],
- libformula-java (>= 1.1.7) [!mips64],
- liblayout-java (>= 0.2.10) [!mips64],
- libloader-java (>= 1.1.6) [!mips64],
- libpentaho-reporting-flow-engine-java (>= 0.9.4) [!mips64],
- librepository-java (>= 1.1.6) [!mips64],
- libsac-java [!mips64],
- libserializer-java (>= 1.1.6) [!mips64],
- libxml-java (>= 1.1.6) [!mips64]
+ libcommons-logging-java [!hppa !ia64 !mips64 !s390 !sparc],
+ 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,
flex (= 2.5.34-1) [amd64],
g++-4.6 (= 4.6.1-10),
@@ -191,13 +190,13 @@ Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreeb
Section: metapackages
Pre-Depends: ${misc:Pre-Depends}
Depends: fonts-sil-gentium-basic,
- libreoffice-base [!mips64],
+ libreoffice-base [!hppa !ia64 !mips64 !s390 !sparc],
libreoffice-calc,
libreoffice-core (= ${binary:Version}),
libreoffice-draw,
libreoffice-impress,
libreoffice-math,
- libreoffice-report-builder-bin [!mips64],
+ libreoffice-report-builder-bin [!hppa !ia64 !mips64 !s390 !sparc],
libreoffice-writer,
${avmedia-be-depends},
${dejavu-depends},
@@ -494,7 +493,7 @@ Description: office productivity suite -- arch-independent Java support files
Package: libreoffice-writer
Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
Pre-Depends: ${misc:Pre-Depends}
-Depends: libreoffice-base-core (= ${binary:Version}) [!mips64],
+Depends: libreoffice-base-core (= ${binary:Version}) [!hppa !ia64 !mips64 !s390 !sparc],
libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
@@ -515,7 +514,7 @@ Description: office productivity suite -- word processor
Package: libreoffice-calc
Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
Pre-Depends: ${misc:Pre-Depends}
-Depends: libreoffice-base-core (= ${binary:Version}) [!mips64],
+Depends: libreoffice-base-core (= ${binary:Version}) [!hppa !ia64 !mips64 !s390 !sparc],
libreoffice-core (= ${binary:Version}),
${lpsolve-dep},
${misc:Depends},
@@ -570,7 +569,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 i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
+Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386
Pre-Depends: ${misc:Pre-Depends}
Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
@@ -588,7 +587,7 @@ Description: office productivity suite -- shared library
install libreoffice-base.
Package: libreoffice-base
-Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
+Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386
Pre-Depends: ${misc:Pre-Depends}
Section: database
Depends: libreoffice-base-core (= ${binary:Version}),
@@ -735,7 +734,7 @@ Description: Python-UNO bridge
Homepage: http://udk.openoffice.org/python/python-bridge.html
Package: libreoffice-officebean
-Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
+Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386
Section: java
Pre-Depends: ${misc:Pre-Depends}
Depends: libreoffice-core (= ${binary:Version}),
@@ -884,7 +883,7 @@ Depends: libreoffice-core,
${misc:Depends},
${shlibs:Depends}
Replaces: libreoffice-base (<< 1:4.2~)
-Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
+Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386
Section: database
Enhances: libreoffice-base-drivers
Description: HSQLDB SDBC driver for LibreOffice
@@ -897,14 +896,14 @@ Description: HSQLDB SDBC driver for LibreOffice
Package: libreoffice-base-drivers
Pre-Depends: ${misc:Pre-Depends}
Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
-Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
+Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386
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 m68k 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 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386]
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
@@ -4317,7 +4316,7 @@ Description: LibreOffice component for building database reports
Package: libreoffice-report-builder-bin
Section: misc
-Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
+Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386
Pre-Depends: ${misc:Pre-Depends}
Depends: libreoffice-base, libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
Description: LibreOffice component for building database reports -- libraries
@@ -4536,7 +4535,7 @@ Description: office productivity suite -- KDE integration
Package: libreoffice-sdbc-postgresql
Section: misc
-Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
+Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386
Pre-Depends: ${misc:Pre-Depends}
Depends: libreoffice-core (>= 1:3.5.0~beta), ${misc:Depends}, ${shlibs:Depends}
Suggests: postgresql (>= 8.4)
@@ -4552,7 +4551,7 @@ Homepage: http://wiki.documentfoundation.org/PostgreSQL-SDBC
Package: libreoffice-mysql-connector
Section: misc
-Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
+Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386
Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
Suggests: default-mysql-server | virtual-mysql-server
Conflicts: libreoffice-common (<< 1:3.5~),
@@ -4567,7 +4566,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 i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
+Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386
Section: gnome
Pre-Depends: ${misc:Pre-Depends}
Depends: libreoffice-base,
diff --git a/rules b/rules
index 6deb52f..773d7ce 100755
--- a/rules
+++ b/rules
@@ -590,7 +590,7 @@ $(eval $(call gen_no_archs,OOO_LE_ARCHS))
# Java...
ifeq "$(JDK)" "default"
-OOO_JAVA_ARCHS = $(filter $(OOO_ARCHS),$(java_architectures))
+OOO_JAVA_ARCHS = $(filter $(OOO_ARCHS),$(java6_architectures))
else
OOO_JAVA_ARCHS = $(OOO_ARCHS)
endif
diff --git a/tests/control b/tests/control
index 6392bd1..bf8e067 100644
--- a/tests/control
+++ b/tests/control
@@ -1,5 +1,5 @@
Tests: junit-subsequentcheck
-Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1 [...]
+Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1 [...]
Tests: pyuno-import
Depends: python3-uno
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: