[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 3064a61cbca9add93ed70b7b801ef51cceb0b282
Merge: 9a3de73 1cba223
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sun Dec 17 00:12:10 2017 +0100

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

 rules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --cc rules
index 681f67f,78843ee..d12424c
--- a/rules
+++ b/rules
@@@ -3043,13 -3040,12 +3043,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.
 -	install -m644 -D workdir/CustomTarget/postprocess/fontconfig/fc_local.conf \
 +	mv $(PKGDIR)-common/$(OODIR)/share/truetype/fc_local.conf \
  		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
+ 	cd debian/fonts-opensymbol/etc/fonts.d/ && \
+ 		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