[libreoffice] 01/02: 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 72330e8a8cd9b409fece5ad9c6cf1ccc8279c1ec
Merge: 6f9e3ea d404efe
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Fri Jun 9 21:29:55 2017 +0200

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

 changelog                                |  7 +++++
 patches/odk-settings-JAVA_PROC_TYPE.diff | 52 ++++++++++++++++++++++++++++++++
 patches/series                           |  1 +
 3 files changed, 60 insertions(+)

diff --cc changelog
index 8436c24,55decc5..6f3eef5
--- a/changelog
+++ b/changelog
@@@ -1,57 -1,12 +1,64 @@@
 -libreoffice (1:5.3.4~rc1-1) UNRELEASED; urgency=medium
 -
 -  * New upstream release candidate
++libreoffice (1:5.4.0~beta2-4) UNRELEASED; urgency=medium
+ 
+   * debian/patches/odk-settings-JAVA_PROC_TYPE.diff: set correct
+     JAVA_PROC_TYPE for arm{el,hf}, mips* and ppc64el
+ 
+  -- Rene Engelhard <rene at debian.org>  Thu, 01 Jun 2017 20:46:05 +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
  
    * debian/patches/sensible-lomua.diff: sync upstreams
diff --cc patches/series
index b9a5328,8efafe3..cdde233
--- a/patches/series
+++ b/patches/series
@@@ -28,7 -28,8 +28,8 @@@ debian-branding.dif
  no-packagekit-per-default.diff
  system-officeotron-and-odfvalidator.diff
  no-openssl.diff
 -m68k-alignment.diff
 -change-from-glew-to-epoxy.diff
 -gtk3-opengl-slideshow.diff
 -m68k-use-mlong-jump-table-offsets.diff
 +disable-sc_subsequent_filters_test-with-internal-cppunit.diff
 +cppunit-optional.diff
 +disable-unused-test-programs.diff
 +gb_SUPPRESS_TESTS.diff
+ odk-settings-JAVA_PROC_TYPE.diff

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