[debian-edu-commits] debian-edu/pkg-team/ 16/25: debian/rules: No fonts shipped with GOsa² src:package in Debian anymore.

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository gosa.

commit e387e43652f7ddc699c1cb21dedbbaba43e26e7e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Aug 11 18:59:52 2014 +0200

    debian/rules: No fonts shipped with GOsa² src:package in Debian anymore.
---
 debian/rules | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 61d53d0..1ec7876 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,10 @@ override_dh_compress:
 	gzip -d debian/gosa/usr/share/doc/gosa/gosa.conf.gz
 
 override_dh_install:
-	dh_install --exclude=*ttf
+
+	# Run dh_install first...
+	dh_install
+
 	# silence several lintian warnings (package-contains-empty-directory).
 	touch debian/gosa/usr/share/gosa/html/plugins/references/.placeholder
 	test -f debian/gosa/usr/share/gosa/locale/core/en/LC_MESSAGES/messages.po || \
@@ -68,7 +71,8 @@ get-orig-source: $(patsubst %,$(PKG)-%_$(VER)$(DTYPE).orig.tar.gz,$(PLUGINS))
 	    rm -f   html/include/slider.js \
 	    rm -f   html/include/sound.js \
 	    rm -f   html/include/unittest.js \
-	    rm -f   html/themes/fonts/*.ttf \
+	    rm -f   html/themes/default/fonts/*.ttf \
+	    rm -f   include/pChart/*.ttf \
 	    $(NULL)
 	rm ../$(PKG)_$(VER)$(DTYPE).orig-gosa-core.tar.gz
 	cd $(PKD)/../ && tar czf ../$(PKG)_$(VER)$(DTYPE).orig-gosa-core.tar.gz gosa-core-$(VER) && rm -rf gosa-core-$(VER)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/gosa.git