[libreoffice] 01/01: Merge remote-tracking branch 'origin/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 d84e250ba0737d4f06a367145dfc3d3ce930feb8
Merge: 93b10e0 b89604c
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Nov 15 07:07:30 2016 +0100

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

 changelog  | 3 +++
 control    | 3 ++-
 control.in | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --cc changelog
index e9d1184,c4b136e..38ede68
--- a/changelog
+++ b/changelog
@@@ -9,47 -9,42 +9,50 @@@ 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
  
 - -- Rene Engelhard <rene at debian.org>  Tue, 11 Oct 2016 20:24:12 +0200
 -
 -libreoffice (1:5.2.3-1) UNRELEASED; urgency=medium
 -
 -  * LibreOffice 5.2.3 final release (identical to rc3) 
 -
 -  * debian/patches/show-vcl-backend-in-about.diff: as name says; backport from
 -    master
 +  * 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
+   * debian/control.in:
+     - add Breaks: browser-plugin-libreoffice to libreoffice-core
+       (closes: #843980)
  
 - -- Rene Engelhard <rene at debian.org>  Thu, 03 Nov 2016 19:18:20 +0100
 + -- Rene Engelhard <rene at debian.org>  Mon, 24 Oct 2016 23:06:23 +0200
  
 -libreoffice (1:5.2.3~rc3-1) unstable; urgency=medium
 -
 -  * New upstream release candidate
 +libreoffice (1:5.3.0~alpha1-1) experimental; urgency=medium
  
 -  * 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.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
  

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