[libreoffice] 02/02: 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 46e254ce011b9a32f58e42b6e8e6a5a001088e5b
Merge: 625793e e4ed829
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Dec 18 23:32:43 2017 +0100

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

 changelog                                          |  35 ++++++
 control                                            |  39 ++++---
 control.in                                         |  12 +-
 control.lang.in                                    |   2 +-
 ...rol.reportdesign.in => control.reportbuilder.in |   2 +-
 copyright                                          |  13 +++
 libreoffice-common.bug-script.in                   |   6 -
 patches/apparmor-usrmerge.diff                     |  52 +++++++++
 .../disable-tests-somehow-needing-more-fonts.diff  |  15 ---
 rules                                              | 126 ++++++++++-----------
 10 files changed, 190 insertions(+), 112 deletions(-)

diff --cc changelog
index cf1f422,7e4da7c..5d51a29
--- a/changelog
+++ b/changelog
@@@ -1,15 -1,38 +1,50 @@@
 +libreoffice (1:6.1.0~alpha1~git20171216-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +
 +  * debian/rules:
 +    - install smoketestdoc.sxw and TestExtension.oxt into a new
 +      libreoffice-smoketest package which can be used by autopkgtests
 +  * debian/tests/*: add autopkgtest to test install TestExtension.oxt
 +    (user and shared)
 +
 + -- Rene Engelhard <rene at debian.org>  Tue, 07 Nov 2017 20:59:01 +0100
 +
+ libreoffice (1:6.0.0~rc1~git20171218-1) UNRELEASED; urgency=medium
+ 
+   * New upstream snapshot
+     - fixes keyboard navigation for textboxes in slide layout (closes: #870387)
+     - fixes Glue points in Draw (closes: #883989)
+ 
+   * debian/patches/apparmor-usrmerge.diff: allow also /usr/bin/dash (etc.)
+     - usrmerge...
+ 
+   * debian/libreoffice-common.bug-script.in: revert running aa-status;
+     Might not exist and actually displaying the status needs root. People
+     shouldn't run reportbug as root, though...
+   * debian/rules:
+     - stop passing --disable-report-builder to build-archs configure since
+       even though it's built the report builder doesn't work then. Move
+       from Build-Depends-Indep: to Build-Depends: again (closes: #875688);
+     - update ar FONT_SUGGESTS: fonts-arabeyes ->
+       fonts-kacst, fonts-hosny-amiri, fonts-sil-scheherazade, fonts-hosny-thabit
+   * debian/rules, debian/control*.in:
+       s/REPORTDESIGN/REPORTBUILDER/ and
+       control.reportdesign.in -> control.reportbuilder.in while we're at it
+   * debian/copyright:
+     - mention sysui/desktop/apparmor/* copyright/license
+     - mention icon_themes/elementary*/* copyright/license
+   * debian/control.in:
+     - remove fonts-noto-unhinted from Recommends: again per
+       upstream suggestion
+     - recommend both fonts-liberation (LO ships 2 + Narrow from 1)
+     - build-conflict against fonts-liberation <!nocheck>
+   * debian/rules, debian/control.in: recommend and build-depend against
+     fonts-liberation2 instead of fonts-liberation since that is actually
+     what LO upstream ships (see above)
+ 
+  -- Rene Engelhard <rene at debian.org>  Sat, 09 Dec 2017 00:22:29 +0100
+ 
  libreoffice (1:6.0.0~beta2-1) experimental; urgency=medium
  
    [ Rene Engelhard ]
diff --cc control
index 2a12bc8,6d71770..7cd3b4b
--- a/control
+++ b/control
@@@ -164,20 -176,7 +176,9 @@@ Build-Depends: ant (>= 1.7.0) [!hppa !i
  Build-Depends-Indep: doxygen (>= 1.8.4) <!nodoc>,
                       g++-mingw-w64-i686,
                       gettext,
 +                     graphviz <!nodoc>,
 +                     libbase-java [!hppa !ia64 !mips64 !s390 !sparc],
                       libbsh-java,
-                      libcommons-logging-java [!hppa !ia64 !mips64 !s390 !sparc],
-                      libflute-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc],
-                      libfonts-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc],
-                      libformula-java (>= 1.1.7) [!hppa !ia64 !mips64 !s390 !sparc],
-                      liblayout-java (>= 0.2.10) [!hppa !ia64 !mips64 !s390 !sparc],
-                      libloader-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc],
-                      libpentaho-reporting-flow-engine-java (>= 0.9.4) [!hppa !ia64 !mips64 !s390 !sparc],
-                      librepository-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc],
-                      libsac-java [!hppa !ia64 !mips64 !s390 !sparc],
-                      libserializer-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc],
-                      libxml-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc],
                       rdfind,
                       symlinks
  Build-Conflicts: amd-libopencl1,

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