[libreoffice] 02/04: Merge remote-tracking branch 'origin/debian-experimental-6.0' into debian-experimental-6.1

[Rene Engelhard]

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

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

commit adcb02f220dbf031f5e4777f1624fa6582611ce0
Merge: 3abc32a 7cbaa92
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Dec 4 23:57:00 2017 +0100

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

 changelog                               | 32 ++++++++++++++++++++++++++++----
 control                                 |  7 +------
 control.in                              |  2 +-
 libreoffice-common.bug-script.in        |  6 ++++++
 libreoffice-mysql-connector.triggers.in |  1 -
 libreoffice-wiki-publisher.triggers.in  |  1 -
 patches/apparmor-complain.diff          | 26 ++++++++++++++++++++++++++
 patches/sal-fix-kfreebsd-build.diff     | 23 +++++++++++++++++++++++
 patches/series                          |  1 +
 rules                                   | 25 +++++++++++++++++++++----
 10 files changed, 107 insertions(+), 17 deletions(-)

diff --cc changelog
index 92d4481,089d6a3..9556cba
--- a/changelog
+++ b/changelog
@@@ -1,10 -1,28 +1,34 @@@
- libreoffice (1:6.1.0~alpha1~git20171129-1) UNRELEASED; urgency=medium
++libreoffice (1:6.1.0~alpha1~git20171208-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +
 + -- Rene Engelhard <rene at debian.org>  Tue, 07 Nov 2017 20:59:01 +0100
 +
- libreoffice (1:6.0.0~beta1-2) UNRELEASED; urgency=medium
+ libreoffice (1:6.0.0~beta2~git20171208-1) UNRELEASED; urgency=medium
+ 
+   * New upstream snapshot
+ 
+   * debian/patches/apparmor-complain.diff: set complain mode for oosplash
+     and soffice.bin profiles
+   * debian/patches/sal-fix-kfreebsd-build.diff: add from gerrit
+ 
+   * debian/control.in: remove openjdk conflicts ...
+   * debian/rules: ... and make them Depends in JAVA_RUNTIME_DEPENDS for the
+     Java-using packages. Also allow openjdk-9 everywhere
+   This doesn't prevent usage of the "broken" JDK but otherwise we "break"
+   jodconverter/natbraille in testing... And linux 4.14.2-1 is also supposed to
+   fix the regression finally...
+   This also closes: #882436
+ 
+   * debian/rules:
+     - stop installing disabled symlinks for apparmor
+     - actually install the OpenSymbol fontconfig snippet into a 
+       /etc/fonts.d/30_opensymbol.conf
+   * debian/libreoffice-common.bug-script.in: run aa-status
+ 
+  -- Rene Engelhard <rene at debian.org>  Mon, 04 Dec 2017 19:01:27 +0100
+ 
+ libreoffice (1:6.0.0~beta1-2) experimental; urgency=medium
  
    * debian/libreoffice-common.{triggers,postinst}.in,
      debian/shell-lib-lool.sh: add trigger updating LOOLs systemplate
diff --cc patches/series
index 790de8c,1f52720..443844e
--- a/patches/series
+++ b/patches/series
@@@ -31,3 -32,5 +31,4 @@@ cppunit-optional.dif
  disable-unused-test-programs.diff
  disable-tests-somehow-needing-more-fonts.diff
  tdf108963-test.diff
+ apparmor-complain.diff
 -sal-fix-kfreebsd-build.diff

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