[libreoffice] 01/01: more fontconfig install fixes, sigh

[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 e0d43e46375384460be915726fb96df0e9a68044
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sun Dec 17 12:43:36 2017 +0100

    more fontconfig install fixes, sigh
---
 rules | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/rules b/rules
index d12424c..df0de5b 100755
--- a/rules
+++ b/rules
@@ -3037,13 +3037,12 @@ ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
 	mkdir -p debian/fonts-opensymbol/usr/share/fonts/truetype/openoffice
 	mv $(PKGDIR)-common/$(OODIR)/share/fonts/truetype/opens___.ttf \
 		debian/fonts-opensymbol/usr/share/fonts/truetype/openoffice
-	rm -rf $(PKGDIR)-common/$(OODIR)/share/fonts/truetype
 	mkdir -p debian/fonts-opensymbol/etc/fonts/conf.d
 	mkdir -p debian/fonts-opensymbol/usr/share/fontconfig/conf.avail
 	# 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/ && \
 		ln -s /usr/share/fontconfig/conf.avail/30_opensymbol.conf

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