[libreoffice] 01/01: Merge remote-tracking branch 'origin/debian-experimental-5.2' into debian-experimental-5.3
Rene Engelhard
rene at moszumanska.debian.org
Tue Nov 15 22:06:22 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 9b5cef1f5586c3ce4795faf3c7026cce314328fc
Merge: d84e250 35ab929
Author: Rene Engelhard <rene at debian.org>
Date: Tue Nov 15 23:04:07 2016 +0100
Merge remote-tracking branch 'origin/debian-experimental-5.2' into debian-experimental-5.3
Conflicts:
changelog
control
rules
tests/control
changelog | 6 ++++--
control | 1 +
rules | 6 +++---
tests/control | 2 +-
4 files changed, 9 insertions(+), 6 deletions(-)
diff --cc changelog
index 38ede68,3f5cc4c..c3e5fe6
--- a/changelog
+++ b/changelog
@@@ -9,50 -17,39 +9,52 @@@ libreoffice (1:5.3.0~beta1~git20161101-
* debian/patches/no-openssl.diff: don't uselessly check for openssl and
don't require openssl in postgresql-sdbc-impl, not (directly) used
- * debian/control.in:
- - add Breaks: browser-plugin-libreoffice to libreoffice-core
- (closes: #843980)
+ * debian/scripts/get_libvlc_dep.sh: fix to work again (also) with
+ new multiarchified libvlc5
+
* debian/rules:
+ - don't install ChangeLog (now done automatically by dh compat >= 7) as
+ it doubles -common/-core size and increases font-opensymbol *by 10*
+ - ENABLE_GDRIVE=y also on armhf and arm64 as we've chromium there now, too
- enable mysql-connector again now that libmysqlcppconn _and_
mysql-workbench are built against mariadb.
- Bump (Build-)Dependency on libmysqlcppconn to >= 1.1.7-3 to go sure
+ Bump Build-Dependency on libmysqlcppconn to >= 1.1.7-4 to go sure
+ we're getting a >= 1.1.7 dependency
+ Fix adding the libmysqlcppconn-dev Build-Dep in the default case
+ * debian/control.in:
+ - add Breaks: browser-plugin-libreoffice to libreoffice-core
+ (closes: #843980)
- -- Rene Engelhard <rene at debian.org> Mon, 24 Oct 2016 23:06:23 +0200
+ -- Rene Engelhard <rene at debian.org> Tue, 15 Nov 2016 22:02:43 +0100
-libreoffice (1:5.2.3~rc3-1) unstable; urgency=medium
-
- * New upstream release candidate
-
- * debian/patches/fix-system-lpsolve-build.diff: rename to ..
- * build-against-shared-lpsolve.diff: ... this to make the purpose more clear
- * debian/patches/fix-system-lpsolve-build.diff: add new one adding
- -llpsolve55_pic test/linkage (disabled)
-
- * debian/control.in:
- - remove -sdbc-firebird Recommends: in -base-drivers
- (closes: #842316, #841253) and the mentioning from the Desciption
-
- -- Rene Engelhard <rene at debian.org> Mon, 31 Oct 2016 23:20:33 +0100
+libreoffice (1:5.3.0~alpha1-1) experimental; urgency=medium
-libreoffice (1:5.2.3~rc1-4) unstable; urgency=medium
+ * New upstream alpha release
+ - fixes typo in VCL.xcu; s/Tino/Tinos/ (closes: #834580)
+ - fixes (experimental) Gtk print dialog crash (closes: #839701)
+ - fixes copy paste cells between two tables of two documents with Gtk3
+ (closes: #834622)
+ - fixes tooltips when dragging/filling cells with Gtk3 (closes: #831977)
- * debian/scripts/get_libvlc_dep.sh: fix to work again (also) with
- new multiarchified libvlc5
+ * 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
+ * debian/rules:
+ - bump dh compat to 10
+ - re-enable firebird (closes: #841253)
- -- Rene Engelhard <rene at debian.org> Fri, 21 Oct 2016 23:56:08 +0200
+ -- Rene Engelhard <rene at debian.org> Thu, 20 Oct 2016 15:46:34 +0200
libreoffice (1:5.2.3~rc1-3) unstable; urgency=medium
diff --cc control
index cd309fd,4263207..db3a100
--- a/control
+++ b/control
@@@ -91,9 -95,9 +91,10 @@@ Build-Depends: ant (>= 1.7.0) [!hppa !i
libmdds-dev (>= 1.2),
libmspub-dev (>= 0.1),
libmwaw-dev (>= 0.3.1),
+ libmysqlcppconn-dev (>= 1.1.7-4),
libmythes-dev (>= 2:1.2),
libneon27-gnutls-dev,
+ libnspr4-dev,
libnss3-dev (>= 3.12.3),
libo3dgc-dev (>= 0~20131011-2) [amd64 i386],
libodfgen-dev (>= 0.1),
diff --cc tests/control
index ea485fb,9bc8862..f8a71ba
--- 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