[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 9092a3d4291f6b6740a2229d904912c7cd06f598
Merge: e0eed8b 7b3f697
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Nov 7 19:18:19 2017 +0000

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

 changelog  |  7 ++++---
 control    | 11 ++++++++---
 control.in |  4 ++--
 rules      |  3 +--
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --cc changelog
index ccd8008,634b4ca..39f9208
--- a/changelog
+++ b/changelog
@@@ -22,29 -22,16 +21,31 @@@ libreoffice (1:6.0.0~beta1~git20171106-
    * debian/rules, debian/libreoffice-common.maintscript: fix path in/for
      apparmor profiles (add missing /). mv_conffile the files to the new
      name...
+   * debian/control.in: make -core conflict against openjdk-{6,7,8}-jre-headless
+     on i386- -java-common would make more sense, but it's Arch: all..
  
-  -- Rene Engelhard <rene at debian.org>  Tue, 07 Nov 2017 07:59:37 +0100
+  -- Rene Engelhard <rene at debian.org>  Tue, 07 Nov 2017 19:34:51 +0100
  
 -libreoffice (1:5.4.3~rc1-2) unstable; urgency=medium
 +libreoffice (1:6.0.0~alpha1-1) experimental; urgency=medium
 +
 +  [ Rene Engelhard ]
 +  * New upstream alpha release
 +
 +  * debian/patches/tdf108963-test.diff: adapt test to what we get; the
 +    text _is_ rotated on export, so...
 +
 +  * merge from Ubuntu, thanks Rico Tzschichholz:
 +    - Add "elementary" style package
 +
 +  * debian/rules:
 +    - finally stop building -systray. GNOME 3.26 doesn't show it anymore,
 +      and in 6.0 the feature is not completely removed yet but the UI for
 +      setting it is already gone anyway....
  
 -  * upload to unstable
 +  [ Rico Tzschichholz ]
 +  * Add Kannada (kn) langpack
  
 - -- Rene Engelhard <rene at debian.org>  Tue, 24 Oct 2017 23:15:10 +0200
 + -- Rene Engelhard <rene at debian.org>  Fri, 20 Oct 2017 13:42:40 +0000
  
  libreoffice (1:5.4.3~rc1-1) experimental; urgency=medium
  
diff --cc control
index ba295dd,f15b9b8..73ff527
--- a/control
+++ b/control
@@@ -148,7 -148,8 +148,7 @@@ Build-Depends: ant (>= 1.7.0) [!hppa !i
                 locales [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                 lp-solve (>= 5.5.0.13-5+b1),
                 maven-repo-helper,
-                openjdk-9-jdk (>= 9.0.1+11-1) [i386],
 -               opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1-2) [amd64 i386],
+                openjdk-9-jdk (>= 9.0.1+11-1~) [i386],
                 pkg-config,
                 pstoedit [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                 python3,

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