[libreoffice] 01/01: Merge remote-tracking branch 'origin/debian-experimental-5.4' into debian-experimental-6.0

Sun Dec 3 21:28:38 UTC 2017

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 539d1582f1d47589ce8e64b1a7db56b48b6b9413
Merge: af4cc3c d2348ad
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Dec 3 22:28:21 2017 +0100

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

 changelog                        | 11 ++++++++++-
 libreoffice-common.bug-script.in |  6 ++++++
 patches/apparmor-complain.diff   | 26 ++++++++++++++++++++++++++
 patches/series                   |  1 +
 rules                            | 19 ++++++++++++++++++-
 5 files changed, 61 insertions(+), 2 deletions(-)

diff --cc changelog
index 620c45a,3140316..74381e4

--- a/changelog
+++ b/changelog
@@@ -1,38 -1,39 +1,47 @@@
 -libreoffice (1:5.4.4~rc1-1) UNRELEASED; urgency=medium
 -
 -  * New upstream release candidate
 +libreoffice (1:6.0.0~beta2~git20171130-1) UNRELEASED; urgency=medium
  
+   * debian/patches/apparmor-complain.diff: set complain mode for oosplash
+     and soffice.bin profiles
+ 
 +  * debian/control.in: remove openjdk conflicts ...
 +  * debian/rules: ... and make them Depends in JAVA_RUNTIME_DEPENDS for the
 +    Java-using packages. Also allow openjdk-9 everywhere
 +  This doesn't prevent usage of the "broken" JDK but otherwise we "break"
 +  jodconverter/natbraille in testing... And linux 4.14.2-1 is also supposed to
 +  fix the regression finally...
 +  This also closes: #882436
 +
    * debian/libreoffice-common.{triggers,postinst}.in,
      debian/shell-lib-lool.sh: add trigger updating LOOLs systemplate
    * debian/libreoffice-common.triggers.in: switch to interest-noawait triggers
  
-  -- Rene Engelhard <rene at debian.org>  Mon, 27 Nov 2017 21:41:01 +0100
+   * debian/rules:
+     - stop installing disabled symlinks for apparmor
+     - actually install the OpenSymbol fontconfig snippet into a 
+       /etc/fonts.d/30_opensymbol.conf
+   * debian/libreoffice-common.bug-script.in: run aa-status
+ 
 - -- Rene Engelhard <rene at debian.org>  Sat, 02 Dec 2017 12:05:38 +0100
 -
 -libreoffice (1:5.4.3-4) unstable; urgency=medium
 -
 -  * debian/control.in: remove openjdk conflicts ...
 -  * debian/rules: ... and make them Depends in JAVA_RUNTIME_DEPENDS for the
 -    Java-using packages. Also allow openjdk-9 everywhere
 -  This doesn't prevent usage of the "broken" JDK but otherwise we "break"
 -  jodconverter/natbraille in testing... And linux 4.14.2-1 is also supposed to
 -  fix the regression finally...
 -  This also closes: #882436
 -
+  -- Rene Engelhard <rene at debian.org>  Sat, 02 Dec 2017 01:01:41 +0100
  
 -libreoffice (1:5.4.3-3) unstable; urgency=medium
 +libreoffice (1:6.0.0~beta1-1) experimental; urgency=medium
 +
 +  * New upstream beta release
  
 -  * debian/patches/icu-60.diff: backport icu 60 support patch from master
 +  * debian/patches/ww8export-HAVE_MORE_FONTS.diff: move ...
 +  * debian/patches/disable-tests-somehow-needing-more-fonts.diff: ... here
 +    and patch also ooxmlexport4
  
    * 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 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.
      - replace some manual dpkg-parsechangelog calls with
        $(DEB_VERSION) and $(DEB_DISTRIBUTION) and fix logic for
        --disable-dependency-tracking
diff --cc patches/series
index e3d0b7f,52dade8..67407c8
--- a/patches/series
+++ b/patches/series
@@@ -30,5 -31,10 +30,6 @@@ no-openssl.dif
  disable-some-sc-tests-with-internal-cppunit.diff
  cppunit-optional.diff
  disable-unused-test-programs.diff
 -gb_SUPPRESS_TESTS.diff
 -stop-shipping-mimelnk-desktop-files.diff
 -icu-no-icu-config.diff
 -ww8export-HAVE_MORE_FONTS.diff
 -java9.diff
 -icu-60.diff
 +disable-tests-somehow-needing-more-fonts.diff
 +tdf108963-test.diff
+ apparmor-complain.diff
diff --cc rules
index 4eee153,9a0053b..a1f7b73
--- a/rules
+++ b/rules
@@@ -3205,6 -3228,28 +3205,23 @@@ endi
  		ln -s /usr/share/doc/libreoffice-common/examples/$$i $(PKGDIR)-common/$(OODIR)/share/registry/$$i; \
  	done
  
 -	# install font config. Doesn't get installed with
 -	# --without-fonts.
 -	# FIXME: Shouldn't this be in /etc/fonts/conf.d with a symlink here?
 -	install -m644 -D workdir/CustomTarget/postprocess/fontconfig/fc_local.conf \
 -		$(PKGDIR)-common/$(OODIR)/share/fonts/truetype/fc_local.conf
+ ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
+ 	# generate fontconfig file. Upstream creates a fc_local.conf in
+ 	# postprocess but it might also contain other font stuff, so do it
+ 	# manually
+ 	mkdir -p debian/fonts-opensymbol/usr/share/fontconfig/conf.avail
+ 	mkdir -p debian/fonts-opensymbol/etc/fonts.d/
+ 	( \
+ 	  echo "<?xml version="1.0"?>"; \
+ 	  echo "<!DOCTYPE fontconfig SYSTEM "fonts.dtd">"; \
+ 	  echo "<fontconfig>"; \
+ 	) > debian/fonts-opensymbol/usr/share/fontconfig/conf.avail/30_opensymbol.conf
+ 	cat $(SOURCE_TREE)/extras/source/truetype/symbol/fc_local.snippet >> debian/fonts-opensymbol/usr/share/fontconfig/conf.avail/30_opensymbol.conf
+ 	echo "</fontconfig>" >> debian/fonts-opensymbol/usr/share/fontconfig/conf.avail/30_opensymbol.conf
+ 	cd debian/fonts-opensymbol/etc/fonts.d/ && \
+ 		ln -s /usr/share/fontconfig/conf.avail/30_opensymbol.conf
+ endif
+ 
  	# register technical.dic
  	perl -pi -e 's/standard.dic;/standard.dic;technical.dic;/' $(PKGDIR)-common/$(OODIR)/share/registry/main.xcd
  

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

