[libreoffice] 01/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 a269001789663595db02fd31153ca63940215db6
Merge: 6bf6a94 6232566
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Dec 9 18:40:33 2017 +0100

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

 README.Debian                     | 18 +++++++++++
 changelog                         | 20 +++++++++---
 control                           |  2 ++
 control.in                        |  1 +
 patches/disable-gbuildtojson.diff | 66 +++++++++++++++++++++++++++++++++++++++
 patches/series                    |  1 +
 rules                             | 11 +++++++
 7 files changed, 115 insertions(+), 4 deletions(-)

diff --cc changelog
index 5df758b,4a6f40e..8d42a1f
--- a/changelog
+++ b/changelog
@@@ -1,16 -1,7 +1,17 @@@
 +libreoffice (1:6.1.0~alpha1~git20171208-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +
 +  * debian/rules:
 +    - use new --disable-c++17 since some external dependencies (like
 +      mysql-connector-c++) are not yet ready for it
 +
 + -- Rene Engelhard <rene at debian.org>  Tue, 07 Nov 2017 20:59:01 +0100
 +
- libreoffice (1:6.0.0~beta2~git20171208-1) UNRELEASED; urgency=medium
+ libreoffice (1:6.0.0~beta2-1) experimental; urgency=medium
  
-   * New upstream snapshot
+   [ Rene Engelhard ]
+   * New upstream beta release
  
    * debian/patches/apparmor-complain.diff: set complain mode for oosplash
      and soffice.bin profiles
diff --cc control
index f8e6549,0b5e6a3..95d4ccc
--- a/control
+++ b/control
@@@ -38,7 -38,7 +38,8 @@@ Build-Depends: ant (>= 1.7.0) [!hppa !i
                 ghostscript [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                 gobject-introspection (>= 1.32.0),
                 gperf,
+                gpg <!nocheck>,
 +               graphviz <!nodoc>,
                 hunspell-en-us [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                 imagemagick [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] <!nocheck>,
                 java-common (>= 0.49),

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