[libreoffice] 04/06: set JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 in build-indep (needed for Java9 in reportbuilder)

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libreoffice.

commit f3741655a8f1974f766879d31e764ae6ce6a00c7
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Nov 7 07:29:07 2017 +0100

    set JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 in build-indep (needed for Java9 in reportbuilder)
---
 changelog | 6 ++++--
 rules     | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/changelog b/changelog
index 4364b83..a16bacf 100644
--- a/changelog
+++ b/changelog
@@ -10,7 +10,9 @@ libreoffice (1:5.4.3-1) unstable; urgency=medium
     - stop passing --disable-database-connectivity for no-Base archs
       (closes: #874274)
     - explicitly use openjdk 9 on i386 now that #876069 is fixed. Allow
-      it as the only one by explicitly using --with-jvm-path 
+      it as the only one by explicitly using --with-jvm-path
+    - set JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 in build-indep (needed for
+      Java9 in reportbuilder) 
     - make testsuite failures on i386 fatal again
   * debian/rules, debian/shlibs.override.mysql-connector-c++:
     temporarily force a lower dependency on libmysqlcppconn7v5, works
@@ -21,7 +23,7 @@ libreoffice (1:5.4.3-1) unstable; urgency=medium
     apparmor profiles (add missing /). mv_conffile the files to the new
     name...
 
- -- Rene Engelhard <rene at debian.org>  Tue, 07 Nov 2017 00:39:09 +0100
+ -- Rene Engelhard <rene at debian.org>  Tue, 07 Nov 2017 07:29:33 +0100
 
 libreoffice (1:5.4.3~rc1-2) unstable; urgency=medium
 
diff --git a/rules b/rules
index dcd1fb9..e949dfb 100755
--- a/rules
+++ b/rules
@@ -2016,7 +2016,7 @@ endif
 	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` $(MAKE) build-nocheck
+	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
 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