[libreoffice] 03/04: Merge branch 'debian-experimental-5.4' into debian-experimental-6.0

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-6.0
in repository libreoffice.

commit 4f8ee33bf3b144a2f71d8cffc5ca201a2231fc7a
Merge: 00b84de 649c507
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Thu Jun 15 16:28:44 2017 +0200

    Merge branch 'debian-experimental-5.4' into debian-experimental-6.0
    
    Conflicts:
    	changelog
    	source/include-binaries
    	tests/control

 README.Debian                                      |   4 +-
 changelog                                          |  61 +++++-
 control                                            |   9 +-
 control.in                                         |   7 +-
 copyright                                          |   4 -
 libreoffice-common.lintian-overrides               |   2 +
 libreoffice-core.lintian-overrides                 |   1 +
 patches/cppunit-optional.diff                      |  20 ++
 patches/disable-db-tests.diff                      |  54 +----
 patches/gb_SUPPRESS_TESTS.diff                     | 244 +++++++++++++++++++++
 patches/gerrit_38597.diff                          |  62 ++++++
 patches/odk-settings-JAVA_PROC_TYPE.diff           |  52 +++++
 patches/series                                     |   3 +
 rules                                              | 118 ++++++----
 scripts/locale-gen                                 |  32 +++
 source/include-binaries                            |   1 -
 tests/control                                      |   2 +-
 tests/patches/java-subsequentcheck-standalone.diff |  28 +--
 18 files changed, 566 insertions(+), 138 deletions(-)

diff --cc changelog
index 2fe29d4,f072ea6..0405799
--- a/changelog
+++ b/changelog
@@@ -1,11 -1,45 +1,51 @@@
 -libreoffice (1:5.4.0~beta2-4) experimental; urgency=medium
 +libreoffice (1:6.0.0~alpha0~git20170612-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot
 +
 + -- Rene Engelhard <rene at debian.org>  Thu, 18 May 2017 12:54:08 +0200
 +
 +libreoffice (1:5.4.0~beta1-1) UNRELEASED; 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>  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
diff --cc source/include-binaries
index ca0b260,1cbc71c..531832a
--- a/source/include-binaries
+++ b/source/include-binaries
@@@ -5,5 -5,4 +5,4 @@@ tarballs/798b2ffdc8bcfe7bca2cf92b62caf6
  tarballs/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
  tarballs/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
  tarballs/xmlsec1-1.2.24.tar.gz
 -tarballs/pdfium-3064.tar.bz2
 +tarballs/pdfium-3094.tar.bz2
- tarballs/cppunit-1.14.0.tar.gz
diff --cc tests/control
index 738e98e,5d95a3a..7055467
--- a/tests/control
+++ b/tests/control
@@@ -1,5 -1,5 +1,5 @@@
  Tests: junit-subsequentcheck
- Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libgl1-mesa-dev, libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.1.0) , opencollada-dev (>= 0.1.0~201407 [...]
 -Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libgl1-mesa-dev, libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.1.0) , opencollada-dev (>= 0.1.0~201407 [...]
++Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libgl1-mesa-dev, libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.1.0) , opencollada-dev (>= 0.1.0~201407 [...]
  
  Tests: pyuno-import
  Depends: python3-uno

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