[libreoffice] 01/04: 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 b06f1cbd9bb37d277d6b151dd58c8c5427000bb2
Merge: 7d14cb8 598896e
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Oct 10 19:37:53 2017 +0000

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

 changelog                              |  7 +++++++
 patches/series                         |  1 +
 patches/ww8export-HAVE_MORE_FONTS.diff | 22 ++++++++++++++++++++++
 rules                                  |  6 ------
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --cc changelog
index c3fc0df,ea0b74a..ed55dfd
--- a/changelog
+++ b/changelog
@@@ -1,21 -1,10 +1,28 @@@
 +libreoffice (1:6.0.0~alpha0~git20171008-1) UNRELEASED; urgency=medium
 +
 +  [ Rene Engelhard ]
 +  * New upstream snapshot
 +
 +  * 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>  Thu, 18 May 2017 12:54:08 +0200
 +
+ libreoffice (1:5.4.2-3) unstable; urgency=medium
+ 
+   * debian/patches/ww8export-HAVE_MORE_FONTS.diff, debian/rules: revert
+     change of -2. Actually doesn't work. (Did in a testbuild, but...)
+ 
+  -- Rene Engelhard <rene at debian.org>  Tue, 10 Oct 2017 21:28:41 +0200
+ 
  libreoffice (1:5.4.2-2) unstable; urgency=medium
  
    * debian/patches/ww8export-HAVE_MORE_FONTS.diff: remove again ...
diff --cc patches/series
index e5569a2,a78cdf4..baf4818
--- a/patches/series
+++ b/patches/series
@@@ -28,3 -29,7 +28,4 @@@ 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

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