[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 6a8af63eac8132f271fc274135ca829bdb11fb19
Merge: d376baf f69db8e
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Oct 30 15:23:30 2017 +0000

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

 changelog                           |  9 +++++++--
 rules                               | 18 ++++++++++++++++++
 shlibs.override.mysql-connector-c++ |  1 +
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --cc changelog
index 18c2e92,1b07fca..fbe58c0
--- a/changelog
+++ b/changelog
@@@ -3,34 -3,19 +3,39 @@@ libreoffice (1:6.0.0~beta1~git20171030-
    * New upstream snapshot
  
    * debian/rules:
 +    - use (dh_)dwz and (if enabled) install the multifile file into
 +      uno-libs3-dbgsym.
 +      Thanks Matthias Klose for the hint.
 +      Make *-dbgsym depend on uno-libs3-dbgsym which should contain the above
 +      file and is recommended anyway because of the gdb helpers.
+     - be consequent and enable the junit tests on armhf/arm64 now that
+       those work.
+   * 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...
 -    
 +
-  -- Rene Engelhard <rene at debian.org>  Thu, 19 Oct 2017 15:49:57 +0200
+  -- Rene Engelhard <rene at debian.org>  Thu, 26 Oct 2017 17:23:53 +0200
  
 -libreoffice (1:5.4.3~rc1-2) unstable; urgency=medium
 +libreoffice (1:6.0.0~alpha1-1) experimental; urgency=medium
 +
 +  [ Rene Engelhard ]
 +  * New upstream alpha release
 +
 +  * 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....
  
 -  * upload to unstable
 +  [ Rico Tzschichholz ]
 +  * Add Kannada (kn) langpack
  
 - -- Rene Engelhard <rene at debian.org>  Tue, 24 Oct 2017 23:15:10 +0200
 + -- 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