[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 5ece62cc95eb2bac359f0fe957953a8c6a36ac56
Merge: e091a2c 50cf74e
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Nov 11 11:56:09 2017 +0100

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

 changelog | 5 -----
 rules     | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --cc changelog
index 6a105b7,460fc0a..e0bd045
--- a/changelog
+++ b/changelog
@@@ -1,23 -1,34 +1,18 @@@
 -libreoffice (1:5.4.3-2) UNRELEASED; 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
 -
 -  * debian/rules:
 -    - remove setting JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 again
 -
 - -- Rene Engelhard <rene at debian.org>  Fri, 10 Nov 2017 23:21:50 +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
 +  * New upstream snapshot
  
-   * debian/patches/java9-jawt.diff: add from master; fix
-     odk/settings/settings.mk for jawt with Java9
- 
    * debian/rules:
 +    - 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
        those work.
      - stop passing --disable-database-connectivity for no-Base archs
        (closes: #874274)
      - explicitly use and depend on openjdk 9 on i386 now that #876069 is fixed.
--    - set JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 in build-indep (needed for
--      Java9 in reportbuilder) 
 -  * debian/rules, debian/shlibs.override.mysql-connector-c++:
 -    temporarily force a lower dependency on libmysqlcppconn7v5, works
 -    also with 1.1.7 and we don't get blocked by mariadb-10.1...
    * debian/libreoffice-sdbc-firebird.maintscript: remove (redundant)
      $DPKG_MAINTSCRIPT_PACKAGE and update version (closes: #880426)
    * debian/rules, debian/libreoffice-common.maintscript: fix path in/for
diff --cc rules
index 6b812f4,246f426..d8e64aa
--- a/rules
+++ b/rules
@@@ -2000,9 -2013,11 +2000,9 @@@ endi
  	PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) \
  	MARIADBCONFIG=$(MARIADBCONFIG) \
  	FIREBIRD_CFLAGS=$(FIREBIRD_CFLAGS) FIREBIRD_LIBS=$(FIREBIRD_LIBS) \
 -	OPENCOLLADA_CFLAGS=$(OPENCOLLADA_CFLAGS) OPENCOLLADA_LIBS=$(OPENCOLLADA_LIBS) \
 -	COLLADA2GLTF_CFLAGS=$(COLLADA2GLTF_CFLAGS) COLLADA2GLTF_LIBS=$(COLLADA2GLTF_LIBS) \
  	./autogen.sh $(CONFIGURE_FLAGS) $(CONFIGURE_FLAGS_INDEP)
  
- 	PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 $(MAKE) build-nocheck
+ 	PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build-nocheck
  ifeq "$(BUILD_TEST_PACKAGE)" "y"
    ifeq "$(ENABLE_JUNIT4)" "y"
  	PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) Jar_{OOoRunner,test,ConnectivityTools}

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