[libreoffice] 02/03: 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 72af2749132e03f2d128ed81691f448597e7ab56
Merge: 4c4040a d064390
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Oct 8 12:13:08 2017 +0200

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

 changelog                              | 27 +++++++++++++++++++++++++++
 control                                | 33 ---------------------------------
 control.help.in                        |  1 -
 libreoffice-sdbc-firebird.maintscript  |  1 +
 patches/disable-flaky-tests.diff       | 22 ++++++++++++++++++++++
 patches/series                         |  1 +
 patches/ww8export-HAVE_MORE_FONTS.diff | 22 ++++++++++++++++++++++
 7 files changed, 73 insertions(+), 34 deletions(-)

diff --cc changelog
index f351300,e4d93fe..44d7289
--- a/changelog
+++ b/changelog
@@@ -1,21 -1,30 +1,48 @@@
 +libreoffice (1:6.0.0~alpha0~git20170930-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-1) unstable; urgency=medium
+ 
+   * LibreOffice 5.4.2 final release (identical to rc2)
+ 
+   * upload to unstable
+ 
+   * debian/patches/disable-flaky-tests.diff: disable chart2_dump test
+     (closes: #877794)
+   * debian/patches/ww8export-HAVE_MORE_FONTS.diff: temporarily(?) disable
+     testTableKeep test, fails with --without-fonts even though Liberation
+     is in Build-Depends:...
+ 
+   * debian/libreoffice-sdbc-firebird.maintscript: restore, we need it
+     from upgrades involving jessie since jessies version gets kept on
+     jessie->stretch upgrades... (closes: #877494)
+ 
+  -- Rene Engelhard <rene at debian.org>  Sun, 08 Oct 2017 11:38:20 +0200
+ 
+ libreoffice (1:5.4.2~rc2-1) experimental; urgency=medium
+ 
+   * New upstream release candidate
+ 
+   * debian/control.help.in: drop now obsolete Depends on
+     libreoffice-style-default (closes: #877175)
+ 
+  -- Rene Engelhard <rene at debian.org>  Fri, 29 Sep 2017 15:33:05 +0200
+ 
  libreoffice (1:5.4.2~rc1-1) experimental; urgency=medium
  
    * New upstream release candidate
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