[boinc] 03/03: Use system fonts, go for unstable

[Gianfranco Costamagna]

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

locutusofborg pushed a commit to branch master
in repository boinc.

commit 85a1a372218f8c763b98e03e04b416e9ebf2beb2
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Aug 14 10:13:56 2017 +0200

    Use system fonts, go for unstable
---
 debian/changelog |  3 ++-
 debian/rules     | 23 +++++++++++++----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 64eb387..7996cd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
-boinc (7.8.1+dfsg-1) unstable; urgency=medium
+boinc (7.8.1+dfsg-1) unstable; urgency=low
 
   * New upstream major release, patch refresh.
   * Update copyright file
+  * Tweak server package to use system fonts
   * Drop patches addressed upstream.
   * Upload to unstable.
   * Bump std-version to 4.0.0
diff --git a/debian/rules b/debian/rules
index 31481ef..0094664 100755
--- a/debian/rules
+++ b/debian/rules
@@ -384,15 +384,18 @@ ifeq (,$(ENABLE_SERVER_TEST))
 	echo "I: Installing example scientific applications"
 	mkdir -p $(CURDIR)/debian/tmp/samples
 	cp $(SAMPLES) $(CURDIR)/debian/tmp/samples || echo "W: Could not install samples ($(SAMPLES))"
-	for i in `ls $(CURDIR)/debian/tmp/usr/share/boinc-server-maker/html/drupal/sites/all/libraries/fonts/*.ttf`; do \
-		rm -r $(CURDIR)/debian/tmp/usr/share/boinc-server-maker/html/drupal/sites/all/libraries/fonts/$i ;\
-		ln -s /usr/share/fonts/truetype/dejavu/$i $(CURDIR)/debian/tmp/usr/share/boinc-server-maker/html/drupal/sites/all/libraries/fonts/$i ; \
-	done;
-
-	for i in `ls $(CURDIR)/debian/tmp/usr/share/boinc-server-maker/html/drupal/sites/default/boinc/themes/boinc/fonts/*`; do \
-		rm -r $(CURDIR)/debian/tmp/usr/share/boinc-server-maker/html/drupal/sites/default/boinc/themes/boinc/fonts/$i ;\
-		ln -s /usr/share/fonts-font-awesome/fonts/$i $(CURDIR)/debian/tmp/usr/share/boinc-server-maker/html/drupal/sites/default/boinc/themes/boinc/fonts/$i; \
-	done;
+	cd $(CURDIR)/debian/tmp/usr/share/boinc-server-maker/html/drupal/sites/all/libraries/fonts/ ; \
+	for i in `ls *.ttf`; do \
+		rm -r "$$i" ; \
+		ln -sf "/usr/share/fonts/truetype/dejavu/$$i" . ; \
+	done; \
+	cd -
+	cd $(CURDIR)/debian/tmp/usr/share/boinc-server-maker/html/drupal/sites/default/boinc/themes/boinc/fonts/ ; \
+	for i in `ls *`; do \
+		rm -r "$$i" ; \
+		ln -sf "/usr/share/fonts-font-awesome/fonts/$$i" . ; \
+	done; \
+	cd -
 
 endif
 	for i in $(CURDIR)/debian/*/usr/bin ; \
@@ -429,7 +432,7 @@ override_dh_fixperms:
 	  debian/boinc-client/usr/share/boinc-client/udev-cpu_share \
 	  debian/boinc-client/usr/share/bug/boinc-client/script \
 	  debian/boinc-manager/usr/share/doc/boinc-manager/examples/run-boincmgr || true
-	[ -d  debian/boinc-server-maker ] && chmod +x \
+	[ -d debian/boinc-server-maker ] && chmod +x \
 	  debian/boinc-server-maker/usr/share/boinc-server-maker/html/ops/delete_job_files || true
 
 override_dh_strip:

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