[SCM] Debian packaging of wesnoth branch, devel, updated. debian/1.9.13-1-3-g2f4de8f

[Gerfried Fuchs]

The following commit has been merged in the devel branch:
commit 6cb593a9eae08a85911599daf2f2ac4c8a3fc00f
Author: Gerfried Fuchs <rhonda at debian.org>
Date:   Thu Jan 12 10:10:57 2012 +0100

    Upstream now uses fonts-droid instead of ttf-wqy-zenhei

diff --git a/debian/changelog b/debian/changelog
index 978aa8a..b18e323 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 wesnoth-1.9 (1:1.9.14-1) unstable; urgency=low
 
   * New upstream 1.10 release candidate.
+  * Upstream now uses fonts-droid instead of ttf-wqy-zenhei.
 
  -- 
 
diff --git a/debian/control b/debian/control
index e736e9e..bb00482 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-games/wesnoth.git;a=summary
 Package: wesnoth-1.9-data
 Architecture: all
 Depends: ${misc:Depends}, ttf-dejavu
-Recommends: ttf-wqy-zenhei (>= 0.8.38-1)
+Recommends: fonts-droid
 Suggests: wesnoth-1.9-music
 Description: data files for Wesnoth (branch 1.9)
  This package contains the sound files and graphics for Wesnoth. It is required
diff --git a/debian/control.in b/debian/control.in
index 6e17107..2e18f37 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -18,7 +18,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-games/wesnoth.git;a=summary
 Package: wesnoth-BRANCH-data
 Architecture: all
 Depends: ${misc:Depends}, ttf-dejavu
-Recommends: ttf-wqy-zenhei (>= 0.8.38-1)
+Recommends: fonts-droid
 Suggests: wesnoth-BRANCH-music
 Description: data files for Wesnoth (branch BRANCH)
  This package contains the sound files and graphics for Wesnoth. It is required
diff --git a/debian/rules b/debian/rules
index 6246ad1..16edd1f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -129,12 +129,12 @@ binary-common:
 # Build architecture independant packages using the common target.
 binary-indep: install
 	# workaround for dh_link (mis)behavior, see BTS#445550
-	for i in ttf-dejavu/DejaVuSans.ttf; \
+	for i in ttf-dejavu/DejaVuSans.ttf droid/DroidSansJapanese.ttf; \
 		do ln -s /usr/share/fonts/truetype/$$i \
 	       	debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/games/wesnoth/$(BRANCH_VERSION)/fonts/`basename $$i`; \
 		done
-	ln -s /usr/share/fonts/truetype/wqy/wqy-zenhei.ttc \
-	       	debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/games/wesnoth/$(BRANCH_VERSION)/fonts/wqy-zenhei.ttc
+	ln -s /usr/share/fonts/truetype/droid/DroidSansFallback.ttf \
+	       	debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/games/wesnoth/$(BRANCH_VERSION)/fonts/DroidSansFallbackFull.ttf
 
 	# rename icons versioned
 	mv debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/icons/wesnoth-icon.png \

-- 
Debian packaging of wesnoth