[libreoffice] 02/02: apparently in 6.0 fc_local.conf is _not_ installed per upstream. yay for consistency.

Rene Engelhard rene at moszumanska.debian.org
Sat Dec 16 22:47:56 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 cb21ed581b992dab122eac8f1d08803089a507a1
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Dec 16 23:46:59 2017 +0100

    apparently in 6.0 fc_local.conf is _not_ installed per upstream. yay for consistency.
---
 rules | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/rules b/rules
index bdf299a..e9dea8f 100755
--- a/rules
+++ b/rules
@@ -3209,10 +3209,9 @@ endif
 	# not only the Symbol->OpenSymbol part... But we don't support --with-fonts
 	# build here right now anyway.
 ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
-	mv $(PKGDIR)-common/$(OODIR)/share/truetype/fc_local.conf \
+	# 6.0 doesn't install this...
+	cp workdir/CustomTarget/postprocess/fontconfig/fc_local.conf \
 		debian/fonts-opensymbol/usr/share/fontconfig/conf.avail/30_opensymbol.conf
-else
-	rm -f $(PKGDIR)-common/$(OODIR)/share/truetype/fc_local.conf
 endif
 
 	# register technical.dic

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



More information about the Pkg-openoffice-commits mailing list