[libreoffice] 01/01: Merge remote-tracking branch 'origin' 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 815e239dc1c5f35f67dec4bfd7dbdda041c04641
Merge: 9d5af02 9969531
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sun Jun 4 09:38:33 2017 +0200

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

 README.Debian | 4 +---
 changelog     | 6 ++++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --cc changelog
index 6378e6f,d513881..eaf9e23
--- a/changelog
+++ b/changelog
@@@ -1,40 -1,9 +1,46 @@@
 +libreoffice (1:5.4.0~beta2~git20170603-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +    - 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.
 +
 +  * debian/rules, debian/patches/cppunit-optional.diff: as name says;
 +    make cppunit build-dep optional and add <!nocheck> to the build-dep
 +  * debian/patches/disable-unneeded-test-programs.diff : micro-optimisation;
 +    as name says.
 +
 +  * tarballs/pdfium-3064.tar.bz2, debian/copyright,
 +    debian/source/include-binaries, debian/libreoffice-core.lintian-overrides:
 +    include pdfium; override embedded-library for lcms2
 +
 +  * tarballs/cppunit-1.14.0.tar.gz, debian/copyright,
 +    debian/source/include-binaries, debian/rules: use internal cppunit, we
 +    need >= 1.14.0 here and that one is in NEW only yet
 +
 +  * debian/rules:
 +    - adapt for (upcoming) usage of dh_missing
 +    - run build-nocheck with --without-junit --without-cppunit to configure
 +      and run check without them 
 +    - replace symlinks /usr/share/applications/*.desktop. move
 +      /usr/lib/libreoffice/share/xdg/*.desktop (except qstart.desktop) to
 +      them instead. Fixes e.g. appstream-generator for our appstream data
 +      (which cannot handle the symlinks...)
 +    - enable running make uicheck
 +
 + -- Rene Engelhard <rene at debian.org>  Sat, 27 May 2017 10:52:43 +0200
 +
+ libreoffice (1:5.3.4~rc1-1) UNRELEASED; urgency=medium
+ 
+   * New upstream release candidate
+ 
+  -- Rene Engelhard <rene at debian.org>  Thu, 01 Jun 2017 20:46:05 +0200
+ 
  libreoffice (1:5.3.3-2) experimental; urgency=medium
  
    * debian/patches/sensible-lomua.diff: sync upstreams

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