[libreoffice] 02/02: 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 b1b39f6724eb9a06c15f85abbea0a7c83b6af7f5
Merge: 21e9dd1 9ca567d
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Jul 17 21:34:49 2017 +0200

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

 changelog               |  12 +++++-
 control                 | 109 ++++++++++--------------------------------------
 control.evolution.in    |   4 +-
 control.in              |  63 ++++++----------------------
 control.kde.in          |   2 +-
 control.librelogo.in    |   2 +-
 control.mediawiki.in    |   5 +--
 control.mysql.in        |   3 --
 control.nlpsolver.in    |   2 +-
 control.ogltrans.in     |   1 -
 control.postgresql.in   |   3 +-
 control.reportdesign.in |   3 --
 control.sdk.in          |   2 +-
 control.ure.in          |   7 ++--
 patches/series          |   1 -
 rules                   |   9 ++--
 16 files changed, 58 insertions(+), 170 deletions(-)

diff --cc changelog
index 6d3186b,2ff9cea..555ccab
--- a/changelog
+++ b/changelog
@@@ -1,9 -1,13 +1,19 @@@
- libreoffice (1:6.0.0~alpha0~git20170715-1) UNRELEASED; urgency=medium
++libreoffice (1:6.0.0~alpha0~git20170717-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +
 + -- Rene Engelhard <rene at debian.org>  Thu, 18 May 2017 12:54:08 +0200
 +
+ libreoffice (1:5.4.0~rc2-2) UNRELEASED; urgency=medium
+ 
+   * debian/patches/examples-fix-SDK_AUTO_DEPLOYMENT-check.diff: don't try
+     to do "auto deployment" when SDK_AUTO_DEPLOYMENT = NO...
+ 
+   * debian/rules:
+     - strip librhino-java from java:Depends, we use the internal one still..
+ 
+  -- Rene Engelhard <rene at debian.org>  Sat, 15 Jul 2017 12:24:52 +0000
+ 
  libreoffice (1:5.4.0~rc2-1) experimental; urgency=medium
  
    * New upstream release candidate
diff --cc control
index e582ae8,a1d0ac3..36ca3fe
--- a/control
+++ b/control
@@@ -191,9 -191,9 +191,9 @@@ Build-Conflicts: amd-libopencl1
                   nvidia-libopencl1,
                   qt3-dev-tools
  Standards-Version: 4.0.0
 -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
diff --cc patches/series
index 02c7c2d,538a3fb..da5c7da
--- a/patches/series
+++ b/patches/series
@@@ -29,4 -29,6 +29,3 @@@ system-officeotron-and-odfvalidator.dif
  no-openssl.diff
  disable-sc_subsequent_filters_test-with-internal-cppunit.diff
  cppunit-optional.diff
--disable-unused-test-programs.diff
 -gb_SUPPRESS_TESTS.diff
 -examples-fix-SDK_AUTO_DEPLOYMENT-check.diff

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