[libreoffice] 02/04: Merge branch '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 3de8b03f872d9cec552440dd3c5fa00bbbfcbaa3
Merge: b876efb 399d33a
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Thu May 4 10:56:29 2017 +0200

    Merge branch 'debian-experimental-5.3' into debian-experimental-5.4
    
    Conflicts:
    	changelog

 changelog  | 5 ++++-
 control    | 1 +
 control.in | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --cc changelog
index 4cf8f9b,4b6e6fa..e09bc0f
--- a/changelog
+++ b/changelog
@@@ -1,22 -1,9 +1,25 @@@
 -libreoffice (1:5.3.2-2) UNRELEASED; urgency=medium
 +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/copyright,
 +    debian/source/include-binaries: include cppunit; LO now wants >= 0.14
  
-  -- Rene Engelhard <rene at debian.org>  Thu, 24 Nov 2016 07:27:55 +0100
+   * debian/control.in:
+     - recommend new fonts-open-sans
+ 
+  -- Rene Engelhard <rene at debian.org>  Wed, 03 May 2017 12:55:48 +0200
  
  libreoffice (1:5.3.2-1) experimental; urgency=medium
  

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