[libreoffice] 01/01: 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 8d657ef9c4ebbf2c8255c397e230ad9a554cf7b9
Merge: 9092a3d d2a0d41
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Nov 7 20:35:05 2017 +0100

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

 changelog                           |  1 -
 patches/fix-JVM_ONE_PATH_CHECK.diff | 15 ---------------
 patches/series                      |  1 -
 rules                               |  6 +++---
 4 files changed, 3 insertions(+), 20 deletions(-)

diff --cc changelog
index 39f9208,04ab315..a37e4e2
--- a/changelog
+++ b/changelog
@@@ -15,7 -13,9 +15,6 @@@ libreoffice (1:6.0.0~beta1~git20171106-
      - explicitly use and depend on openjdk 9 on i386 now that #876069 is fixed.
      - set JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 in build-indep (needed for
        Java9 in reportbuilder) 
-     - make testsuite failures on i386 fatal again
 -  * debian/rules, debian/shlibs.override.mysql-connector-c++:
 -    temporarily force a lower dependency on libmysqlcppconn7v5, works
 -    also with 1.1.7 and we don't get blocked by mariadb-10.1...
    * debian/libreoffice-sdbc-firebird.maintscript: remove (redundant)
      $DPKG_MAINTSCRIPT_PACKAGE and update version (closes: #880426)
    * debian/rules, debian/libreoffice-common.maintscript: fix path in/for
diff --cc patches/series
index 2865d3b,98e622e..063d940
--- a/patches/series
+++ b/patches/series
@@@ -30,6 -31,9 +30,5 @@@ 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
 -java9-jawt.diff
 -java9-rhino.diff
 +tdf108963-test.diff
- fix-JVM_ONE_PATH_CHECK.diff

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