[libreoffice] 05/06: Merge debian-experimental-5.4 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 fd4e64490b7148f8eb957054996c75d070f7e93d
Merge: f1382dd fd995e3
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Oct 20 13:42:55 2017 +0000

    Merge debian-experimental-5.4 into debian-experimental-6.0

 changelog                                    |  8 +++---
 patches/arm64-disable-sc-functions-test.diff | 37 ++++++++++++++++++++++++++++
 patches/series                               |  1 +
 rules                                        |  3 +++
 4 files changed, 46 insertions(+), 3 deletions(-)

diff --cc changelog
index ade4c7b,e2b16ca..fdc2cd0
--- a/changelog
+++ b/changelog
@@@ -1,24 -1,3 +1,24 @@@
 +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....
 +
 +  [ Rico Tzschichholz ]
 +  * Add Kannada (kn) langpack
 +
-  -- Rene Engelhard <rene at debian.org>  Fri, 20 Oct 2017 15:19:17 +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
  
    * New upstream release candidate
diff --cc patches/series
index 132ab3d,fa046b8..fb8ca1a
--- a/patches/series
+++ b/patches/series
@@@ -30,6 -31,10 +30,7 @@@ no-openssl.dif
  disable-some-sc-tests-with-internal-cppunit.diff
  cppunit-optional.diff
  disable-unused-test-programs.diff
 -gb_SUPPRESS_TESTS.diff
 -stop-shipping-mimelnk-desktop-files.diff
 -icu-no-icu-config.diff
  ww8export-HAVE_MORE_FONTS.diff
 -avoid-throwing-cpp-exceptions-across-libgpeg-c-frames.diff
  arm64-bridges-no-stack-protector-strong.diff
 +tdf108963-test.diff
+ arm64-disable-sc-functions-test.diff

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