[libreoffice] 02/02: 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 a72ec4d3455a88abb7dc57744413f9bc187c60c9
Merge: 4df0234 983c219
Author: Rene Engelhard <rene at debian.org>
Date:   Thu May 11 19:27:20 2017 +0200

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

 changelog | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --cc changelog
index 9871aff,bbcf945..a0c6ee9
--- a/changelog
+++ b/changelog
@@@ -1,24 -1,7 +1,24 @@@
 +libreoffice (1:5.4.0~beta1~git20170510-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
- 
-  -- Rene Engelhard <rene at debian.org>  Sat, 06 May 2017 17:24:08 +0200
- 
- libreoffice (1:5.4.0~alpha1-1) experimental; 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
 +
++ -- Rene Engelhard <rene at debian.org>  Sat, 06 May 2017 17:24:08 +0200
++
+ libreoffice (1:5.3.3-1) experimental; urgency=medium
+ 
+   * New upstream release
+ 
    * debian/control.in:
      - recommend new fonts-open-sans
  

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