[libreoffice] 02/03: Merge remote-tracking branch 'origin/debian-experimental-5.2' into debian-experimental-5.3
Rene Engelhard
rene at moszumanska.debian.org
Sun Oct 9 20:20:13 UTC 2016
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 e34586adfa8ee16530b201c693d8ccca00228982
Merge: 0a5f1ac ef0c9c2
Author: Rene Engelhard <rene at debian.org>
Date: Sun Oct 9 22:18:12 2016 +0200
Merge remote-tracking branch 'origin/debian-experimental-5.2' into debian-experimental-5.3
Conflicts:
changelog
control
control.in
rules
tests/control
changelog | 20 +++++++++++++++++++-
control | 19 +------------------
control.firebird.in | 13 +++++++++++++
control.in | 13 -------------
rules | 13 +++++++++++--
tests/control | 2 +-
6 files changed, 45 insertions(+), 35 deletions(-)
diff --cc changelog
index 44959df,8daf0ac..5edc2bf
--- a/changelog
+++ b/changelog
@@@ -1,26 -1,4 +1,26 @@@
+libreoffice (1:5.3.0~alpha0~git20160920-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+ - fixes typo in VCL.xcu; s/Tino/Tinos/ (closes: #834580)
+
+ * debian/control.{lang,help}.in: use ${help-l10n-virtual-version} as
+ versioned Provides
+ * debian/rules, debian/control.transitionals.in: remove jessie->stretch
+ transitionals again
+ * debian/rules, control.gcj.in: cleanup:
+ - remove support for gcj (and thus building -gcj "native") completely;
+ 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
+ * debian/copyright: add schema/*/* to Files-Excluded: :/
+ * debian/uno-libs3.symbols: update
+
+ -- Rene Engelhard <rene at debian.org> Thu, 26 May 2016 20:00:57 +0200
+
- libreoffice (1:5.2.3~rc1~git20160920-1) UNRELEASED; urgency=medium
+ libreoffice (1:5.2.3~rc1~git20161009-1) UNRELEASED; urgency=medium
* New upstream snapshot
diff --cc control
index 10e189a,7e7d61c..6decd09
--- a/control
+++ b/control
@@@ -21,13 -21,16 +21,11 @@@ Build-Depends: ant (>= 1.7.0) [!hppa !i
dh-python,
dpkg-dev (>= 1.18.2~),
fastjar,
- firebird-dev (>= 3.0.0.32483.ds4-4) [!hppa !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64],
- firebird3.0-server-core [!hppa !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
flex (>= 2.3.35),
- fontconfig [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc !sparc64] <!nocheck>,
- fonts-crosextra-carlito [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc !sparc64] <!nocheck>,
- fonts-liberation [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc !sparc64] <!nocheck>,
- g++-6 [hppa ia64 s390 sparc],
- gcc-6 [hppa ia64 s390 sparc],
- gcj-jdk [hppa ia64 s390 sparc],
- gcj-native-helper [hppa ia64 s390 sparc],
- gdb [!hppa !ia64 !kfreebsd-amd64 !kfreebsd-i386 !s390 !sparc !sparc64] <!nocheck>,
+ fontconfig [!kfreebsd-amd64 !kfreebsd-i386 !sparc64] <!nocheck>,
+ fonts-crosextra-carlito [!kfreebsd-amd64 !kfreebsd-i386 !sparc64] <!nocheck>,
+ fonts-liberation [!kfreebsd-amd64 !kfreebsd-i386 !sparc64] <!nocheck>,
+ gdb [!kfreebsd-amd64 !kfreebsd-i386 !sparc64] <!nocheck>,
gettext,
gobject-introspection (>= 1.32.0),
gperf,
diff --cc control.firebird.in
index 0000000,84b04de..b83ce7d
mode 000000,100644..100644
--- a/control.firebird.in
+++ b/control.firebird.in
@@@ -1,0 -1,13 +1,13 @@@
+ Package: libreoffice-sdbc-firebird
+ Pre-Depends: ${misc:Pre-Depends}
-Depends: libreoffice-core, ${shlibs:Depends}, ${misc:Depends}
++Depends: libreoffice-core, ${shlibs:Depends}, ${misc:Depends}, ${firebird-server-depends}
+ Architecture: %OOO_LE_ARCHS%
+ Section: database
+ Enhances: libreoffice-base-drivers
+ Description: Firebird SDBC driver for LibreOffice
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ The Firebird SDBC Driver allows one to use the Firebird database from
+ LibreOffice without any wrapper layer such as ODBC or JDBC.
+
diff --cc tests/control
index b0b461d,9ce3278..57b60f7
--- a/tests/control
+++ b/tests/control
@@@ -1,5 -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+dfsg [...]
-Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libarchive-zip-perl, 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~ [...]
++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+dfsg [...]
Tests: pyuno-import
Depends: python3-uno
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
More information about the Pkg-openoffice-commits
mailing list