[libreoffice] 02/05: Merge branch 'debian-experimental-5.2' 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 80d463cae1fe0dc6d8b079baa9f2bd4460432891
Merge: 16b5f65 1c0d377
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Sep 20 15:04:16 2016 +0200

    Merge branch 'debian-experimental-5.2' into debian-experimental-5.3
    
    Conflicts:
    	changelog
    	patches/series
    	rules

 changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --cc changelog
index 8e8490b,5caa53b..ebcc770
--- a/changelog
+++ b/changelog
@@@ -1,25 -1,9 +1,31 @@@
 +libreoffice (1:5.3.0~alpha0~git20160919-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
+ 
+   * New upstream snapshot
+ 
+  -- Rene Engelhard <rene at debian.org>  Wed, 07 Sep 2016 23:57:23 +0200
+ 
  libreoffice (1:5.2.1-3) unstable; urgency=medium
  
    * debian/patches/gtk3-use-style-updated-signal.diff: backport from master;

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