[libreoffice] 01/01: Merge remote-tracking branch 'origin/master' into debian-experimental-5.3

[Rene Engelhard]

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 a2f567a75d1574093d0023b140f48b217d6a5b94
Merge: 2e8ca66 a78d2ff
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Oct 22 00:22:22 2016 +0200

    Merge remote-tracking branch 'origin/master' into debian-experimental-5.3
    
    Conflicts:
    	changelog

 changelog                 |  7 +++++++
 scripts/get_libvlc_dep.sh | 27 +++++++++++++++++----------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --cc changelog
index d57b05b,46049ac..9ff6190
--- a/changelog
+++ b/changelog
@@@ -1,32 -1,10 +1,39 @@@
 -libreoffice (1:5.2.3~rc1-4) unstable; urgency=medium
++libreoffice (1:5.3.0~alpha1-2) UNRELEASED; urgency=medium
+ 
+   * debian/scripts/get_libvlc_dep.sh: fix to work again (also) with
+     new multiarchified libvlc5
+ 
+  -- Rene Engelhard <rene at debian.org>  Fri, 21 Oct 2016 23:56:08 +0200
+ 
 +libreoffice (1:5.3.0~alpha1-1) experimental; 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/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>  Thu, 20 Oct 2016 15:46:34 +0200
 +
  libreoffice (1:5.2.3~rc1-3) unstable; urgency=medium
  
    * debian/patches/fix-system-lpsolve-build.diff: fix -L in configure.ac so

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git