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

[Rene Engelhard]

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

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

commit 13a35a268842cd624fbf1cbf143640214427805c
Merge: ab728fe 1dbae0a
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Apr 30 11:57:35 2017 +0200

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

 changelog                                | 19 ++++++--
 control                                  | 11 +++--
 control.in                               |  6 ++-
 control.mediawiki.in                     |  3 +-
 control.nlpsolver.in                     |  2 +-
 patches/help-msg-add-package-info.diff   | 22 ++++-----
 patches/mediwiki-oor-replace.diff        | 12 ++---
 patches/mention-java-common-package.diff | 83 +++++++++++++-------------------
 patches/rhino-build-optional.diff        | 59 -----------------------
 patches/series                           |  8 ++-
 10 files changed, 84 insertions(+), 141 deletions(-)

diff --cc changelog
index 0361000,9d08580..496d399
--- a/changelog
+++ b/changelog
@@@ -1,26 -1,11 +1,31 @@@
 +libreoffice (1:5.4.0~alpha1-1) UNRELEASED; urgency=medium
 +
 +  * New upstream alpha release
 +    - is now able to do "insert->image, choose pdf". Not insert->docunent
 +      but close enough, so this closes: #814598
 +      (unfortunately only using internal pdfium. sigh.)
 +
 +  * debian/scripts/gid2pkgdirs.sh, debian/control{,.transitionals}.in:
 +    remove extra libreoffice-pdfimport, merge (even though the poppler
 +    dependency...) back to -common/-core since it has the above new feature and
 +    otherwise it may get confusing what is what.
 +
 +  * tarballs/pdfium-3064.tar.bz2, debian/copyright,
 +    debian/source/include-binaries: include pdfium
 +
 +  * debian/rules, debian/source/include-binaries:
 +    - temporarily use internal cppunit; LO now wants >= 0.14
 +
 + -- Rene Engelhard <rene at debian.org>  Thu, 24 Nov 2016 07:27:55 +0100
 +
- libreoffice (1:5.3.2~rc1-1) UNRELEASED; urgency=medium
+ libreoffice (1:5.3.2-1) experimental; urgency=medium
  
-   * New upstream release candidate
+   * New upstream release
+ 
+   * debian/patches/help-msg-add-package-info.diff,
+     debian/patches/mention-java-common-package.diff,
+     debian/patches/mediawiki-oor-replace.diff:
+     debian/patches/series: actually update the patches and re-enable...
  
    * debian/rules:
      - move /usr/include/libreoffice/sal/typesizes.h symlink to -dev

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