[libreoffice] 02/02: 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 56aaf4844f8547ed1db9b1eebfcb220e1ad31d28
Merge: 5aa1529 a13b9b4
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Jun 10 10:57:56 2017 +0200

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

 changelog                                     | 16 ++++++++++++++++
 patches/also-suppress-odk-build-examples.diff | 22 ----------------------
 patches/series                                |  1 -
 3 files changed, 16 insertions(+), 23 deletions(-)

diff --cc changelog
index 54e077b,4c3ef50..a42bd2a
--- a/changelog
+++ b/changelog
@@@ -1,12 -1,19 +1,28 @@@
 +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
+ 
+   * debian/patches/gb_SUPPRESS_TESTS.diff: add more tests to suppress
+     (from master)
+   * debian/patches/odk-settings-JAVA_PROC_TYPE.diff: set correct
+     JAVA_PROC_TYPE for arm{el,hf}, mips* and ppc64el
+ 
+  -- Rene Engelhard <rene at debian.org>  Thu, 01 Jun 2017 20:46:05 +0200
+ 
+ libreoffice (1:5.4.0~beta2-3) experimental; urgency=medium
+ 
+   *  debian/patches/series, also-suppress-odk-build-examples.diff: sigh.
+      don't do that yet, not yet ready....
+ 
+  -- Rene Engelhard <rene at debian.org>  Fri, 09 Jun 2017 05:18:08 +0200
+ 
  libreoffice (1:5.4.0~beta2-2) experimental; urgency=medium
  
    * debian/patches/disable-db-tests.diff: update
diff --cc patches/series
index 454189b,cdde233..f7e6525
--- a/patches/series
+++ b/patches/series
@@@ -31,4 -31,5 +31,3 @@@ no-openssl.dif
  disable-sc_subsequent_filters_test-with-internal-cppunit.diff
  cppunit-optional.diff
  disable-unused-test-programs.diff
- also-suppress-odk-build-examples.diff
 -gb_SUPPRESS_TESTS.diff
 -odk-settings-JAVA_PROC_TYPE.diff

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