[libreoffice] 01/01: cleanup: remove PACKAGE_TTF_OPENSYMBOL conditional, we *do* need to package it everytime anyways and it's maintained in here

[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 65552d1f5e65e8fe5326afc87709f802fd91675a
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Thu Dec 28 13:49:10 2017 +0100

    cleanup: remove PACKAGE_TTF_OPENSYMBOL conditional, we *do* need to package it everytime anyways and it's maintained in here
---
 rules | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/rules b/rules
index 91ba599..6adb994 100755
--- a/rules
+++ b/rules
@@ -140,7 +140,6 @@ else
   PYTHON=python$(PYTHON_VERSION)
 export PYTHON=python$(PYTHON_VERSION)
 endif
-PACKAGE_TTF_OPENSYMBOL=y
 BUILD_ONLY_EN_US=n
 ENABLE_JAVA=y
 ifeq "$(ENABLE_JAVA)" "y"
@@ -1814,9 +1813,7 @@ ifeq "$(ENABLE_JAVA)" "y"
 	cat debian/control.nlpsolver.in >> debian/control
   endif
 endif
-ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
 	cat debian/control.fonts.in >> debian/control
-endif
 ifeq "$(PACKAGE_SDK)" "y"
 	cat debian/control.sdk.in >> debian/control
 endif
@@ -3030,7 +3027,6 @@ endif
 	perl -pi -e 's,unset XENVIRONMENT,unset XENVIRONMENT\n\nexport PYTHONPATH=\"/$(OODIR)/program\"\n\n,' \
 		$(PKGDIR)-common/$(OODIR)/program/unopkg
 
-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
@@ -3043,10 +3039,6 @@ ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
 		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
-else
-	rm -f $(PKGDIR)-common/$(OODIR)/share/fonts/truetype/opens___.ttf
-	rm -f $(PKGDIR)-common/$(OODIR)/share/truetype/fc_local.conf
-endif
 
 	# remove extra license files
 	rm -rf $(PKGDIR)-common/$(OODIR)/licenses
@@ -3640,10 +3632,8 @@ endif
 		-V'pyuno-depends=$(PYUNO_DEPENDS)' \
 		-V'Binary-Version=$(BINARY_VERSION)' \
 		-v$(BINARY_VERSION)
-ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
 	dh_gencontrol -pfonts-opensymbol -- \
 		-v$(shell echo `echo $(BINARY_VERSION) | cut -d: -f1` + 1 | bc):$(shell debian/scripts/get_ttf_version.pl debian/fonts-opensymbol/usr/share/fonts/truetype/openoffice/opens___.ttf)+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
-endif
 ifeq "$(ENABLE_MEDIAWIKI)" "y"
 	dh_gencontrol -plibreoffice-wiki-publisher -- \
 		-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \

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