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

[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 dab24bf92c72202fd0a2136a39817227c6eff475
Merge: 3bbf574 e0d43e4
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Dec 17 12:44:22 2017 +0100

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

 rules | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --cc rules
index 328d63d,df0de5b..80363e0
--- a/rules
+++ b/rules
@@@ -3025,9 -3042,9 +3024,9 @@@ 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/truetype/fc_local.conf \
+ 	mv $(PKGDIR)-common/$(OODIR)/share/fonts/truetype/fc_local.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
  else
  	rm -f $(PKGDIR)-common/$(OODIR)/share/fonts/truetype/opens___.ttf

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