[libreoffice] 01/01: Merge remote-tracking branch 'origin/debian-experimental-5.4' into debian-experimental-5.5

[Rene Engelhard]

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

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

commit 7076102cf84f42823cc25386232058ba0ceb788e
Merge: ddad3ff 3b3d8a2
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Jun 10 22:41:51 2017 +0200

    Merge remote-tracking branch 'origin/debian-experimental-5.4' into debian-experimental-5.5

 changelog                 | 12 +++++----
 patches/gerrit_38597.diff | 62 +++++++++++++++++++++++++++++++++++++++++++++++
 patches/series            |  1 +
 3 files changed, 70 insertions(+), 5 deletions(-)

diff --cc changelog
index a42bd2a,801982b..6f88704
--- a/changelog
+++ b/changelog
@@@ -1,13 -1,4 +1,10 @@@
 +libreoffice (1:5.5.0~alpha0~git20170610-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +
-   * debian/rules, debian/scripts/locale-gen: upstream insists on using
-     en_US.UTF-8 for the tests. "Steal" the locale-gen stuff from gcc
- 
 + -- Rene Engelhard <rene at debian.org>  Thu, 18 May 2017 12:54:08 +0200
 +
- libreoffice (1:5.4.0~beta2-4) UNRELEASED; urgency=medium
+ libreoffice (1:5.4.0~beta2-4) experimental; urgency=medium
  
    * debian/patches/gb_SUPPRESS_TESTS.diff: add more tests to suppress
      (from master)
diff --cc patches/series
index f7e6525,856af0e..5e4bb49
--- a/patches/series
+++ b/patches/series
@@@ -31,3 -31,6 +31,4 @@@ no-openssl.dif
  disable-sc_subsequent_filters_test-with-internal-cppunit.diff
  cppunit-optional.diff
  disable-unused-test-programs.diff
 -gb_SUPPRESS_TESTS.diff
 -odk-settings-JAVA_PROC_TYPE.diff
+ gerrit_38597.diff

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