[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 be51d786c5185ac4fc7356881c08394d6a47370a
Merge: 8ec51d3 b8402ba
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sat Jul 15 10:17:10 2017 +0000

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

 changelog | 6 ++++--
 rules     | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --cc changelog
index fe6487d,4101f67..6a58469
--- a/changelog
+++ b/changelog
@@@ -1,7 -1,28 +1,7 @@@
- libreoffice (1:5.4.0~rc2-1) UNRELEASED; urgency=medium
 -libreoffice (1:5.3.4-4) unstable; urgency=medium
++libreoffice (1:5.4.0~rc2-1) experimental; urgency=medium
  
 -  * debian/tests/*: more cleanups for newer autopkgtests; use allow-stderr
 -    instead of manual 2>&1
 -  * debian/tests/sdk-examples: export HOME=$WORKDIR in the hope it will fix
 -    the unopkg calls
 -
 -  * debian/rules:
 -    - make i386 make check notfatal for now given the i386 Java Stack Clash
 -      regression
 +  * New upstream release candidate
  
 - -- Rene Engelhard <rene at debian.org>  Fri, 14 Jul 2017 21:17:52 +0000
 -
 -libreoffice (1:5.3.4-3) unstable; urgency=medium
 -
 -  * reupload with proper control.
 -
 - -- Rene Engelhard <rene at debian.org>  Tue, 11 Jul 2017 21:29:43 +0000
 -
 -libreoffice (1:5.3.4-2) unstable; urgency=medium
 -
 -  * debian/patches/icu-59-uchar.diff: backport patch from 5.4 to fix build
 -    with ICU 59 (this only affects some internal libs, but...)
 -  * debian/patches/sdk-cat-sed-bin.diff: fix bin/distro-install-sdk;
 -    cat and sed are in /bin... How did this ever work?
    * debian/patches/mediawiki-oor-replace.diff: back to ="fuse" for Paths.xcu
      as otherwise it overwrites Template paths and breaks the python wizards
      (closes: #867209)
@@@ -21,61 -42,15 +21,63 @@@
      pyuno-import test import pyuno while uno-import does import uno
      (the uichecks do the former). Add python3 dependency for safety.
    * debian/test/control: sort by importance
 +  * debian/tests/: unapply patch after the make (or on error) so that the
 +    next test can patch it...
 +  * debian/tests/*: more cleanups for newer autopkgtests; use allow-stderr
 +    instead of manual 2>&1
 +
 +  * debian/rules:
 +    - be consequent and set RUN_PYTESTS=n (and RUN_MAKE_UICHECK=n) where we set
 +      RUN_MAKE_CHECK=n
 +    - be consequent and add $(IGNORE_MAKE_CHECK_FAILURES) also to the "extra"
 +      test runs
 +    - disable the tests on bigendian archs: hang (failures non-fatal anyway.)
++    - make i386 make check notfatal for now given the i386 Java Stack Clash
++      regression
 +  * debian/control.in:
 +    - make -common Conflicts: older mediawikis to go sure
 +
-  -- Rene Engelhard <rene at debian.org>  Thu, 13 Jul 2017 23:06:04 +0200
++ -- Rene Engelhard <rene at debian.org>  Sat, 15 Jul 2017 10:16:28 +0000
 +
 +libreoffice (1:5.4.0~rc1-1) experimental; urgency=medium
  
 - -- Rene Engelhard <rene at debian.org>  Tue, 11 Jul 2017 20:52:21 +0200
 +  * New upstream release candidate
  
 -libreoffice (1:5.3.4-1) unstable; urgency=medium
 +  * debian/tests/control.in, debian/tests/uicheck,
 +    debian/tests/patches/uicheck-standalone.diff: add initial version
 +    of autopgktest running uitest 
  
 -  * New upstream release
 +  * debian/rules, debian/patches/system-xmlsec.diff: backport patch from
 +    master and add conditional for system-xmlsec. use it.
  
 +  * debian/rules, debian/control.lokit.in:
 +    - move /usr/share/gir-1.0/LOKDocView-0.1.gir to libreofficekit-dev and
 +      make libreofficekit-dev depend on gir1.2-lokdocview-0.1 as per gir
 +      policy
 +  * debian/rules:
 +    - clean up JRE Depends; we consider java6_architectures as Java arch, so
 +      let's remove the Java5 alternatives
 +  * debian/copyright, debian/source/include-binaries: remove xmlsec
 +  * debian/rules:
 +    - fix dh_missing call
 +  * debian/tests/sdk-examples: DevelopersGuide/OfficeDev/DesktopEnvironment
 +    needs -ljawt. Build this to check this and the JAVA_PROC_TYPE setting also.
 +
 + -- Rene Engelhard <rene at debian.org>  Mon, 26 Jun 2017 19:25:59 +0200
 +
 +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
diff --cc rules
index 2faf5b7,920e654..c6d5b1b
--- a/rules
+++ b/rules
@@@ -597,19 -572,10 +597,19 @@@ ifeq "$(ENABLE_GLTF)" "y
    $(eval $(call gen_no_archs,OOO_COLLADA_ARCHS))
  endif
  
 +# let's do this only on archs where we have chromium, which is supposedly even only the archs
 +# where alsp pdfium is supported.
 +OOO_PDFIUM_ARCHS := i386 amd64 armhf arm64
 +ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_PDFIUM_ARCHS)))
 +ENABLE_PDFIUM=y
 +else
 +ENABLE_PDFIUM=n
 +endif
 +
  IGNORE_MAKE_CHECK_FAILURES=-
- ifeq (i386,$(DEB_HOST_ARCH))
-   IGNORE_MAKE_CHECK_FAILURES:=
- endif
+ #ifeq (i386,$(DEB_HOST_ARCH))
+ #  IGNORE_MAKE_CHECK_FAILURES:=
+ #endif
  ifeq (amd64,$(DEB_HOST_ARCH))
    IGNORE_MAKE_CHECK_FAILURES:=
  endif

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