[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 a14ae42f61e93e68e9a414f9463b61307bb34d45
Merge: adee95b 5e4ad23
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Jun 8 22:46:53 2017 +0200

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

 changelog                                     |  7 +++-
 patches/also-suppress-odk-build-examples.diff | 22 +++++++++++
 patches/disable-db-tests.diff                 | 54 +++------------------------
 patches/series                                |  1 +
 rules                                         |  4 +-
 5 files changed, 36 insertions(+), 52 deletions(-)

diff --cc changelog
index e92ec16,98efaed..21d768b
--- a/changelog
+++ b/changelog
@@@ -1,10 -1,6 +1,12 @@@
 +libreoffice (1:5.5.0~alpha0~git20170608-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +
 + -- Rene Engelhard <rene at debian.org>  Thu, 18 May 2017 12:54:08 +0200
 +
- libreoffice (1:5.4.0~beta2-2) UNRELEASED; urgency=medium
+ libreoffice (1:5.4.0~beta2-2) experimental; urgency=medium
+ 
+   * debian/patches/disable-db-tests.diff: update
  
    * debian/rules:
      - try harder and also export LC_ALL=C.UTF-8 for uitest as the
diff --cc patches/series
index f7e6525,8bc068e..454189b
--- a/patches/series
+++ b/patches/series
@@@ -31,3 -31,5 +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
+ also-suppress-odk-build-examples.diff

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