[libreoffice] 02/02: upsttream installs fc_local.conf now even with --without-fonts...

[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 d6e75f8ab6e7042273ce8436380c6d36644b12ee
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Thu Dec 14 23:45:40 2017 +0100

    upsttream installs fc_local.conf now even with --without-fonts...
---
 changelog | 2 +-
 rules     | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/changelog b/changelog
index 1ceab2f..158af86 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.4.5~rc1~git20171213-1) UNRELEASED; urgency=medium
+libreoffice (1:5.4.5~rc1~git20171214-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
 
diff --git a/rules b/rules
index 09af84e..769323a 100755
--- a/rules
+++ b/rules
@@ -3223,12 +3223,14 @@ endif
 		ln -s /usr/share/doc/libreoffice-common/examples/$$i $(PKGDIR)-common/$(OODIR)/share/registry/$$i; \
 	done
 
-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 \
+ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
+	mv $(PKGDIR)-common/$(OODIR)/share/truetype/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