[libreoffice] 03/03: git update; recommend noto fonts

[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 e091a2c9b8df4a851af9f0ca1930a8552e1d0caa
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Nov 11 11:53:07 2017 +0100

    git update; recommend noto fonts
---
 changelog                                                |  5 ++++-
 control                                                  |  3 +++
 control.in                                               |  3 +++
 patches/disable-some-sc-tests-with-internal-cppunit.diff |  4 ++--
 patches/java9-jawt.diff                                  | 13 -------------
 patches/series                                           |  1 -
 6 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/changelog b/changelog
index bfc3e2b..6a105b7 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:6.0.0~beta1~git20171107-1) UNRELEASED; urgency=medium
+libreoffice (1:6.0.0~beta1~git20171111-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
 
@@ -25,6 +25,9 @@ libreoffice (1:6.0.0~beta1~git20171107-1) UNRELEASED; urgency=medium
     name...
   * debian/control.in: make -core conflict against openjdk-{6,7,8}-jre-headless
     on i386- -java-common would make more sense, but it's Arch: all..
+  * debian/control.in:
+    - add fonts-noto-hinted, fonts-noto-mono, fonts-noto-unhinted to
+      Recommends
 
  -- Rene Engelhard <rene at debian.org>  Tue, 07 Nov 2017 20:59:01 +0100
 
diff --git a/control b/control
index 73ff527..a5e0ae4 100644
--- a/control
+++ b/control
@@ -209,6 +209,9 @@ Recommends: fonts-crosextra-caladea,
             fonts-crosextra-carlito,
             fonts-dejavu,
             fonts-linuxlibertine,
+            fonts-noto-hinted,
+            fonts-noto-mono,
+            fonts-noto-unhinted,
             fonts-open-sans,
             fonts-sil-gentium-basic,
             libreoffice-librelogo,
diff --git a/control.in b/control.in
index 2737176..a56a447 100644
--- a/control.in
+++ b/control.in
@@ -39,6 +39,9 @@ Recommends: ${java-common-depends},
             fonts-dejavu,
             fonts-linuxlibertine,
             fonts-open-sans,
+            fonts-noto-hinted,
+            fonts-noto-mono,
+            fonts-noto-unhinted,
             libreoffice-script-provider-bsh,
             libreoffice-script-provider-js,
             libreoffice-script-provider-python,
diff --git a/patches/disable-some-sc-tests-with-internal-cppunit.diff b/patches/disable-some-sc-tests-with-internal-cppunit.diff
index 443ea86..d97bf42 100644
--- a/patches/disable-some-sc-tests-with-internal-cppunit.diff
+++ b/patches/disable-some-sc-tests-with-internal-cppunit.diff
@@ -22,9 +22,9 @@ index 338ad5cdf609..ce60c12de35e 100644
  	CppunitTest_sc_bugfix_test \
  	CppunitTest_sc_filters_test \
  	CppunitTest_sc_rangelst_test \
-@@ -56,12 +56,19 @@ endif
+@@ -58,12 +58,19 @@ endif
+ 
  $(eval $(call gb_Module_add_slowcheck_targets,sc, \
- 	CppunitTest_sc_condformats \
  	CppunitTest_sc_new_cond_format_api \
 -	CppunitTest_sc_subsequent_filters_test \
  	CppunitTest_sc_subsequent_export_test \
diff --git a/patches/java9-jawt.diff b/patches/java9-jawt.diff
deleted file mode 100644
index e6dc3ee..0000000
--- a/patches/java9-jawt.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
-index 2813959f5dec..684c39edae91 100644
---- a/odk/settings/settings.mk
-+++ b/odk/settings/settings.mk
-@@ -376,7 +376,7 @@ COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS)
- 
- EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs -Wl,--no-whole-archive
- LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)"
--LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)"
-+LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)" -L"$(OO_SDK_JAVA_HOME)/lib"
- 
- URE_MISC=$(OFFICE_PROGRAM_PATH)
- 
diff --git a/patches/series b/patches/series
index a3ae0c6..063d940 100644
--- a/patches/series
+++ b/patches/series
@@ -32,4 +32,3 @@ cppunit-optional.diff
 disable-unused-test-programs.diff
 ww8export-HAVE_MORE_FONTS.diff
 tdf108963-test.diff
-java9-jawt.diff

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