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

[Rene Engelhard]

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

rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.

commit 1ec97dc65c4d5592eb1333c694e0eddd6c14a021
Merge: 59f1c46 c891290
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Thu Dec 28 13:08:56 2017 +0100

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

 control | 2 +-
 rules   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --cc rules
index c72ea00,f078afd..53f428d
--- a/rules
+++ b/rules
@@@ -3042,13 -3040,12 +3042,13 @@@ ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y
  	# this only works with --without-fonts. Otherwise we get all stuff here,
  	# not only the Symbol->OpenSymbol part... But we don't support --with-fonts
  	# build here right now anyway.
- 	mv $(PKGDIR)-common/$(OODIR)/share/fonts/truetype/fc_local.conf \
+ 	install -m644 -D workdir/CustomTarget/postprocess/fontconfig/fc_local.conf \
 -		debian/fonts-opensymbol/usr/share/fontconfig/conf.avail/30_opensymbol.conf
 +		debian/fonts-opensymbol/usr/share/fontconfig/conf.avail/30-opensymbol.conf
- 	cd debian/fonts-opensymbol/etc/fonts.d/ && \
+ 	cd debian/fonts-opensymbol/etc/fonts/conf.d/ && \
 -		ln -s /usr/share/fontconfig/conf.avail/30_opensymbol.conf
 +		ln -s /usr/share/fontconfig/conf.avail/30-opensymbol.conf
  else
  	rm -f $(PKGDIR)-common/$(OODIR)/share/fonts/truetype/opens___.ttf
 +	rm -f $(PKGDIR)-common/$(OODIR)/share/truetype/fc_local.conf
  endif
  
  	# remove extra license files

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