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

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-6.0
in repository libreoffice.

commit dbff4c20cc971621657b5b9217469d96414c044e
Merge: f537581 5ccdc9a
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Oct 31 16:14:59 2017 +0100

    Merge remote-tracking branch 'origin/master' into debian-experimental-6.0

 changelog                             | 4 +++-
 libreoffice-sdbc-firebird.maintscript | 2 +-
 rules                                 | 7 +------
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --cc changelog
index fbe58c0,703ae68..7b7bdd5
--- a/changelog
+++ b/changelog
@@@ -13,29 -8,16 +13,31 @@@ libreoffice (1:6.0.0~beta1~git20171030-
    * debian/rules, debian/shlibs.override.mysql-connector-c++:
      temporarily force a lower dependency on libmysqlcppconn7v5, works
      also with 1.1.7 and we don't get blocked by mariadb-10.1...
+   * debian/libreoffice-sdbc-firebird.maintscript: remove (redundant)
+     $DPKG_MAINTSCRIPT_PACKAGE and update version (closes: #880426)
  
-  -- Rene Engelhard <rene at debian.org>  Thu, 26 Oct 2017 17:23:53 +0200
+  -- Rene Engelhard <rene at debian.org>  Tue, 31 Oct 2017 13:14:13 +0000
  
 -libreoffice (1:5.4.3~rc1-2) unstable; urgency=medium
 +libreoffice (1:6.0.0~alpha1-1) experimental; urgency=medium
  
 -  * upload to unstable
 +  [ Rene Engelhard ]
 +  * New upstream alpha release
  
 - -- Rene Engelhard <rene at debian.org>  Tue, 24 Oct 2017 23:15:10 +0200
 +  * debian/patches/tdf108963-test.diff: adapt test to what we get; the
 +    text _is_ rotated on export, so...
 +
 +  * merge from Ubuntu, thanks Rico Tzschichholz:
 +    - Add "elementary" style package
 +
 +  * debian/rules:
 +    - finally stop building -systray. GNOME 3.26 doesn't show it anymore,
 +      and in 6.0 the feature is not completely removed yet but the UI for
 +      setting it is already gone anyway....
 +
 +  [ Rico Tzschichholz ]
 +  * Add Kannada (kn) langpack
 +
 + -- Rene Engelhard <rene at debian.org>  Fri, 20 Oct 2017 13:42:40 +0000
  
  libreoffice (1:5.4.3~rc1-1) experimental; urgency=medium
  

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