[libreoffice] 01/02: Merge remote-tracking branch 'origin/debian-experimental-5.4' into debian-experimental-5.5

[Rene Engelhard]

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

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

commit 3251c64d20ba6392156d5164cbf9d7cf105fb07c
Merge: ba74420 bd38363
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Jun 8 05:34:28 2017 +0000

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

 changelog               | 22 ++++++++++------------
 control                 |  1 +
 copyright               |  4 ----
 rules                   | 10 +++++-----
 source/include-binaries |  1 -
 tests/control           |  2 +-
 6 files changed, 17 insertions(+), 23 deletions(-)

diff --cc changelog
index 76313d5,8f4bede..61d8d86
--- a/changelog
+++ b/changelog
@@@ -1,10 -1,12 +1,18 @@@
 +libreoffice (1:5.5.0~alpha0~git20170606-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~beta2-1) UNRELEASED; urgency=medium
+ libreoffice (1:5.4.0~beta2-2) UNRELEASED; urgency=medium
+ 
+   * debian/rules:
+     - try harder and also export LC_ALL=C.UTF-8 for uitest as the
+       buildd/sbuild sets LC_ALL=POSIX already
+ 
+  -- Rene Engelhard <rene at debian.org>  Thu, 08 Jun 2017 07:21:18 +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
diff --cc rules
index 1140416,28c7cec..2ad5f26
--- a/rules
+++ b/rules
@@@ -2035,10 -2039,22 +2034,11 @@@ endi
  		export HOME=$$t; \
  		export SAL_USE_VCLPLUGIN="svp"; \
  		unset DISPLAY; \
 -		if [ -x /usr/bin/gdb ]; then ulimit -c unlimited; fi && \
 -		$(MAKE) -k check || PARALLELISM=1 $(MAKE) check && \
 -	rm -rf $$t
 -  ifeq "$(RUN_MAKE_UICHECK)" "y"
 -	$(IGNORE_MAKE_CHECK_FAILURES)t=`mktemp -q -d`; \
 -	cd $(SOURCE_TREE) && \
 -		export PATH=$(BUILD_PATH); \
 -		export TMPDIR=$$t; \
 -		export HOME=$$t; \
 -		export SAL_USE_VCLPLUGIN="svp"; \
  		export LANG=C.UTF-8; \
+ 		export LC_ALL=C.UTF-8; \
  		if [ -x /usr/bin/gdb ]; then ulimit -c unlimited; fi && \
 -		$(MAKE) -k uicheck || PARALLELISM=1 $(MAKE) uicheck && \
 +		$(MAKE) -k check || PARALLELISM=1 $(MAKE) check && \
  	rm -rf $$t
 -  endif
  ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
  	patch -p1 -R < $(CURDIR)/debian/patches/disable-db-tests.diff
  endif
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,ffdfe36..efc0c7c
--- 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