[libreoffice] 07/07: Merge branch '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 649c50715ac40ccb2d71e918874073f3dbe18d4f
Merge: 5ad4d3d 55764cf
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Thu Jun 15 16:02:47 2017 +0200

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

 changelog                                          |  6 +++++
 control                                            |  1 +
 control.in                                         |  1 +
 tests/patches/java-subsequentcheck-standalone.diff | 28 +++++-----------------
 4 files changed, 14 insertions(+), 22 deletions(-)

diff --cc changelog
index 5dc2bcb,e781a23..f072ea6
--- a/changelog
+++ b/changelog
@@@ -1,72 -1,17 +1,78 @@@
 -libreoffice (1:5.3.4~rc1-1) UNRELEASED; urgency=medium
 -
 -  * New upstream release candidate
 +libreoffice (1:5.4.0~beta2-4) experimental; urgency=medium
  
 +  * debian/patches/gb_SUPPRESS_TESTS.diff: add more tests to suppress
 +    (from master)
    * debian/patches/odk-settings-JAVA_PROC_TYPE.diff: set correct
      JAVA_PROC_TYPE for arm{el,hf}, mips* and ppc64el
 +  * debian/patches/gerrit_38597.diff: add from gerrit for master, fixes
 +    i386 tests
 +
 +  * debian/rules, debian/scripts/locale-gen: upstream insists on using
 +    en_US.UTF-8 for the tests. "Steal" the locale-gen stuff from gcc
 +  * debian/control.in: make -core depend on ure (>= 5.4.0~beta2~)
 +    (closes: #864690)
+   * debian/control.in:
+     - make -gstreamer recommend gstreamer1.0-plugins-bad as we apparently
+       want/need gtksink
+ 
+   * merge from Ubuntu:
+     - debian/tests/patches/java-subsequentcheck-standalone.diff: refreshed
  
 - -- Rene Engelhard <rene at debian.org>  Tue, 13 Jun 2017 00:38:38 +0200
 + -- Rene Engelhard <rene at debian.org>  Mon, 12 Jun 2017 23:44:55 +0200
 +
 +libreoffice (1:5.4.0~beta2-3) experimental; urgency=medium
 +
 +  *  debian/patches/series, also-suppress-odk-build-examples.diff: sigh.
 +     don't do that yet, not yet ready....
 +
 + -- Rene Engelhard <rene at debian.org>  Fri, 09 Jun 2017 05:18:08 +0200
 +
 +libreoffice (1:5.4.0~beta2-2) experimental; urgency=medium
 +
 +  * debian/patches/disable-db-tests.diff: update
 +
 +  * debian/rules:
 +    - try harder and also export LC_ALL=C.UTF-8 for uitest as the
 +      buildd/sbuild sets LC_ALL=POSIX already
 +    - fix icon installation in install-indep
 +
 + -- Rene Engelhard <rene at debian.org>  Thu, 08 Jun 2017 15:55:59 +0200
 +
 +libreoffice (1:5.4.0~beta2-1) experimental; 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.
 +  * debian/gb_SUPPRESS_TESTS.diff: backport from master, allow checks build
 +    but not run them
 +
 +  * tarballs/pdfium-3064.tar.bz2, debian/copyright,
 +    debian/source/include-binaries, debian/libreoffice-core.lintian-overrides:
 +    include pdfium; override embedded-library for lcms2
 +
 +  * debian/rules:
 +    - adapt for (upcoming) usage of dh_missing
 +    - run build-nocheck with --without-junit --without-cppunit to configure
 +      and run check with them; build the checks with gb_SUPPRESS_TESTS first
 +      before running 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>  Wed, 07 Jun 2017 19:42:57 +0000
  
  libreoffice (1:5.3.3-2) experimental; urgency=medium
  

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