[libreoffice] 01/06: Merge remote-tracking branch 'origin/master' into debian-experimental-5.3

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.3
in repository libreoffice.

commit 4619e84035e123cb6793ff06f1792b546e8c7060
Merge: 1734d77 6a02b4d
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Mar 27 14:11:47 2017 +0200

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

 changelog            | 7 ++++++-
 control              | 7 +++++--
 control.in           | 2 ++
 control.mediawiki.in | 3 ++-
 control.nlpsolver.in | 2 +-
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --cc changelog
index 125b537,41de89b..8b198a7
--- a/changelog
+++ b/changelog
@@@ -1,14 -1,22 +1,19 @@@
 -libreoffice (1:5.2.6-3) UNRELEASED; urgency=medium
 +libreoffice (1:5.3.2~rc1-1) UNRELEASED; urgency=medium
  
 +  * New upstream release candidate
 +
 +  * debian/rules:
 +    - move /usr/include/libreoffice/sal/typesizes.h symlink to -dev
 +      instead of -dev-common (closes: #858199)
+   * debian/control.in:
+     - add missing -java-common Depends: to -script-provider-{bsh,js}
+   * debian/control.mediawiki.in:
+     - add missing JRE depends
+   (thanks to Daniel Richard G. for those two, see #858655)
  
-  -- Rene Engelhard <rene at debian.org>  Mon, 20 Mar 2017 11:46:38 +0100
+  -- Rene Engelhard <rene at debian.org>  Sun, 26 Mar 2017 00:47:55 +0100
  
 -libreoffice (1:5.2.6-2) unstable; urgency=medium
 -
 -  * debian/rules:
 -    - move /usr/include/libreoffice/sal/typesizes.h symlink to -dev
 -      instead of -dev-common (closes: #858199)
 -
 - -- Rene Engelhard <rene at debian.org>  Mon, 20 Mar 2017 11:46:38 +0100
 -
 -libreoffice (1:5.2.6-1) unstable; urgency=medium
 +libreoffice (1:5.3.1-1) experimental; urgency=medium
  
    * New upstream release
  

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