[libreoffice] 01/01: fix merge...

[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 f3582f5c01cf35044af9f546cf6201044adf5a72
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Thu Dec 28 13:11:41 2017 +0100

    fix merge...
---
 rules | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/rules b/rules
index 53f428d..91ba599 100755
--- a/rules
+++ b/rules
@@ -3030,9 +3030,6 @@ endif
 	perl -pi -e 's,unset XENVIRONMENT,unset XENVIRONMENT\n\nexport PYTHONPATH=\"/$(OODIR)/program\"\n\n,' \
 		$(PKGDIR)-common/$(OODIR)/program/unopkg
 
-	# 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.
 ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
 	mkdir -p debian/fonts-opensymbol/usr/share/fonts/truetype/openoffice
 	mv $(PKGDIR)-common/$(OODIR)/share/fonts/truetype/opens___.ttf \
@@ -3042,7 +3039,7 @@ 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/fonts/truetype/fc_local.conf \
 		debian/fonts-opensymbol/usr/share/fontconfig/conf.avail/30-opensymbol.conf
 	cd debian/fonts-opensymbol/etc/fonts/conf.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