[libreoffice] 01/01: Merge remote-tracking branch 'origin/master' 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 047623c487f9b8f0a057f546e10f46203b31da56
Merge: 5ece62c 7273cd1
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Nov 13 22:23:17 2017 +0100

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

 changelog |  2 +-
 rules     | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --cc changelog
index e0bd045,8c08132..3a50064
--- a/changelog
+++ b/changelog
@@@ -1,14 -1,28 +1,14 @@@
 -libreoffice (1:5.4.3-2) unstable; urgency=medium
 +libreoffice (1:6.0.0~beta1~git20171111-1) UNRELEASED; urgency=medium
  
 -  * debian/patches/java9-*: remove ...
 -  * debian/patches/java9.diff: ... and merge into one patch again.
 -  * debian/patches/java9.diff: backport also missing tests fix from master.
 -    Also add -Dfile.encoding=UTF8 directly to JavaClassSet.mk
 +  * New upstream snapshot
  
    * debian/rules:
 -    - remove setting JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 again
 -    - disable junit tests on 32bit archs (i386/armhf) which fail ucb_complex
 -      with a libcurl-related SIGSEGV. At least upstream those are not ran
 -      (at least for armhf) anyway on those archs.
 -
 - -- Rene Engelhard <rene at debian.org>  Mon, 13 Nov 2017 17:43:19 +0100
 -
 -libreoffice (1:5.4.3-1) unstable; urgency=medium
 -
 -  * New upstream release
 -
 -  * debian/patches/java9-jawt.diff: add from master; find jawt with Java9 and
 -    also fix odk/settings/settings.mk for it
 -  * debian/patches/java9-rhino.diff: add from master; fix rhino build with Java9
 -
 -  * debian/rules:
 -    - be consequent and enable the junit tests on armhf/arm64 now that
 +    - use (dh_)dwz and (if enabled) install the multifile file into
 +      uno-libs3-dbgsym.
 +      Thanks Matthias Klose for the hint.
 +      Make *-dbgsym depend on uno-libs3-dbgsym which should contain the above
 +      file and is recommended anyway because of the gdb helpers.
-     - be consequent and enable the junit tests on armhf/arm64 now that
++    - be consequent and enable the junit tests on arm64 now that
        those work.
      - stop passing --disable-database-connectivity for no-Base archs
        (closes: #874274)
diff --cc rules
index d8e64aa,8ffc030..c51f269
--- a/rules
+++ b/rules
@@@ -288,9 -270,10 +288,9 @@@ ifeq "$(ENABLE_JAVA)" "y
        else
          RUN_MAKE_CHECK=y
        endif
-         ifeq "$(DEB_HOST_ARCH)" "i386"
- 	  ENABLE_JUNIT4=y
-         endif
 -        RUN_MAKE_UICHECK=y
+ #        ifeq "$(DEB_HOST_ARCH)" "i386"
+ #	  ENABLE_JUNIT4=y
+ #        endif
          ifeq "$(DEB_HOST_ARCH)" "amd64"
  	  ENABLE_JUNIT4=y
          endif
@@@ -310,9 -293,10 +310,9 @@@
        else
          RUN_MAKE_CHECK=y
        endif
-         ifeq "$(DEB_HOST_ARCH)" "i386"
- 	  ENABLE_JUNIT4=y
-         endif
 -        RUN_MAKE_UICHECK=y
+ #        ifeq "$(DEB_HOST_ARCH)" "i386"
+ #	  ENABLE_JUNIT4=y
+ #        endif
          ifeq "$(DEB_HOST_ARCH)" "amd64"
  	  ENABLE_JUNIT4=y
          endif

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