[libreoffice] 01/01: Merge remote-tracking branch 'origin/master' 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 76898db5ece3f003f21bbedc0517ab08c856b05e
Merge: ffcf291 5c0436f
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sat May 27 12:46:54 2017 +0200

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

 changelog                   | 3 +++
 patches/sensible-lomua.diff | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --cc changelog
index 12ec930,ab7e9f5..2908823
--- a/changelog
+++ b/changelog
@@@ -1,36 -1,8 +1,39 @@@
 +libreoffice (1:5.4.0~beta1-1) UNRELEASED; urgency=medium
 +
 +  * New upstream beta 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.
 +
 +  * 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: include pdfium
 +
 +  * 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 
 +
 + -- Rene Engelhard <rene at debian.org>  Sat, 27 May 2017 10:52:43 +0200
 +
  libreoffice (1:5.3.3-2) UNRELEASED; urgency=medium
  
+   * debian/patches/sensible-lomua.diff: sync upstreams
+     "add xdg-email as the default email route" into here
+ 
    * debian/rules:
      - fix logic error; make -g1 etc work also with noddebs. Build with those
        flags also if building no -dbgsym

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