[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 55dd12e37f16e1eee88cd16eadf2d1d18767fa15
Merge: edcbf1c 380f5db
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Dec 15 00:34:51 2017 +0100

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

 changelog                                          |  5 +++--
 control                                            | 26 +++++++++++-----------
 ...rol.reportdesign.in => control.reportbuilder.in |  2 +-
 rules                                              |  2 +-
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --cc changelog
index c7e1089,f0efbcf..01b38d7
--- a/changelog
+++ b/changelog
@@@ -13,8 -22,16 +13,9 @@@ libreoffice (1:6.0.0~rc1~git20171214-1
      - 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);
-   * debian/rules, debian/control.in:
-       s/REPORTDESIGN/REPORTBUILDER/ while we're at it
+   * debian/rules, debian/control*.in:
+       s/REPORTDESIGN/REPORTBUILDER/ and
+       control.reportdesign.in -> control.reportbuilder.in while we're at it
 -  * debian/control.in: add gnupg to Suggests
    * debian/copyright:
      - mention sysui/desktop/apparmor/* copyright/license
      - mention icon_themes/elementary*/* copyright/license
diff --cc control
index 947d31f,3eca426..61e59d0
--- a/control
+++ b/control
@@@ -60,6 -58,8 +61,7 @@@ Build-Depends: ant (>= 1.7.0) [!hppa !i
                 libcdr-dev (>= 0.1),
                 libclucene-dev (>= 2.3.3.4-4.1),
                 libcmis-dev (>= 0.5.0-3),
 -               libcollada2gltfconvert-dev (>= 20140924-2)[amd64 i386],
+                libcommons-logging-java [!hppa !ia64 !mips64 !s390 !sparc],
                 libcppunit-dev (>= 1.14) [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                 libcups2-dev,
                 libcurl4-gnutls-dev,
@@@ -98,30 -101,37 +103,36 @@@
                 libicu-dev (>= 52),
                 libjpeg-dev,
                 liblangtag-dev (>= 0.4),
+                liblayout-java (>= 0.2.10) [!hppa !ia64 !mips64 !s390 !sparc],
                 liblcms2-dev,
                 libldap2-dev,
+                libloader-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc],
                 liblpsolve55-dev (>= 5.5.0.13-5+b1),
 -               libmdds-dev (>= 1.2),
 +               libmdds-dev (>= 1.2.3),
                 libmspub-dev (>= 0.1),
                 libmwaw-dev (>= 0.3.1),
 -               libmwaw-dev (>= 0.3.11) <!nocheck>,
 +               libmwaw-dev (>= 0.3.13) <!nocheck>,
                 libmysqlcppconn-dev (>= 1.1.7-4),
                 libmythes-dev (>= 2:1.2),
                 libneon27-gnutls-dev,
                 libnspr4-dev,
                 libnss3-dev (>= 3.12.3),
 -               libo3dgc-dev (>= 0~20131011-2) [amd64 i386],
                 libodfgen-dev (>= 0.1),
 -               liborcus-dev (>= 0.12),
 +               liborcus-dev (>= 0.13),
                 libpagemaker-dev,
 -               libpcre3-dev [amd64 i386],
+                libpentaho-reporting-flow-engine-java (>= 0.9.4) [!hppa !ia64 !mips64 !s390 !sparc],
                 libpng-dev,
                 libpoppler-cpp-dev,
                 libpoppler-dev (>= 0.12.0),
                 libpoppler-private-dev,
                 libpq-dev (>= 9.0~),
 +               libqxp-dev,
                 librdf0-dev (>= 1.0.16-2),
+                librepository-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc],
                 librevenge-dev,
+                libsac-java [!hppa !ia64 !mips64 !s390 !sparc],
                 libsane-dev,
+                libserializer-java (>= 1.1.6) [!hppa !ia64 !mips64 !s390 !sparc],
                 libsm-dev,
                 libstaroffice-dev,
                 libstaroffice-dev (>= 0.0.3) <!nocheck>,
@@@ -163,20 -176,7 +175,8 @@@
                 zlib1g-dev
  Build-Depends-Indep: doxygen (>= 1.8.4) <!nodoc>,
                       g++-mingw-w64-i686,
 +                     gettext,
-                      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,
@@@ -187,9 -187,9 +187,9 @@@
                   nvidia-glx-legacy-dev,
                   nvidia-libopencl1
  Standards-Version: 4.0.1
 -Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
 +Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b debian-experimental-6.0
  Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
--Bugs: 
++Bugs: mailto:debian-openoffice at lists.debian.org
  Homepage: http://www.libreoffice.org
  
  Package: libreoffice

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