[SCM] Wormux PKG branch, master, updated. 3d810152742ad43723a615c6cdfaddbdac384896

[Felix Geyer]

The following commit has been merged in the master branch:
commit b7a5526fac5d231516e100a95a2f84c49d5a66b9
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Tue Oct 5 20:33:06 2010 +0200

    Use the font from ttf-wqy-microhei instead of shipping our own copy.

diff --git a/debian/changelog b/debian/changelog
index beadea1..b0f8616 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,8 @@ wormux (1:0.9.2.1-1) unstable; urgency=low
   * Convert package from cdbs to dh7 rules.
   * Switch to source package format 3.0 (quilt).
   * Tighten dependency on wormux-data.
-  * Add ttf-vlgothic to wormux-data Depends.
+  * Add ttf-vlgothic and ttf-wqy-microhei to the wormux-data dependencies as
+    we create symlinks to these fonts instead of shipping our own copy.
   * Patch upstream desktop file instead of providing our own.
     - Add 02_desktop_file.patch.
   * Add myself to Uploaders.
@@ -20,7 +21,7 @@ wormux (1:0.9.2.1-1) unstable; urgency=low
   * Fix FTBFS on kfreebsd.
     - Add 04_fix_build_kfreebsd.patch.
 
- -- Felix Geyer <debfx-pkg at fobos.de>  Tue, 05 Oct 2010 18:53:25 +0200
+ -- Felix Geyer <debfx-pkg at fobos.de>  Tue, 05 Oct 2010 20:30:16 +0200
 
 wormux (1:0.8.5-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index e50b564..b1fb7df 100644
--- a/debian/control
+++ b/debian/control
@@ -71,7 +71,7 @@ Description: stand alone server and game index server for wormux
 
 Package: wormux-data
 Architecture: all
-Depends: ttf-dejavu, ttf-vlgothic, ${misc:Depends}
+Depends: ttf-dejavu, ttf-vlgothic, ttf-wqy-microhei, ${misc:Depends}
 Breaks: wormux (<< 0.8beta2-1)
 Description: data files for the wormux game
  Wormux is a free game where funny animals fight on a 2D map with
diff --git a/debian/rules b/debian/rules
index 189425f..dbc9cb9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,7 @@ override_dh_auto_install:
 	# these font files will be replaced with symlinks
 	rm debian/tmp/usr/share/games/wormux/font/DejaVuSans.ttf
 	rm debian/tmp/usr/share/games/wormux/font/VL-Gothic-Regular.ttf
+	rm debian/tmp/usr/share/games/wormux/font/wqy-microhei-lite.ttc
 	
 	cp debian/tmp/usr/share/games/wormux/wormux_32x32.xpm debian/tmp/usr/share/pixmaps/wormux.xpm
 
diff --git a/debian/wormux-data.links b/debian/wormux-data.links
index b29faa3..7a2dd19 100644
--- a/debian/wormux-data.links
+++ b/debian/wormux-data.links
@@ -1,2 +1,3 @@
 usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf usr/share/games/wormux/font/DejaVuSans.ttf
 usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf usr/share/games/wormux/font/VL-Gothic-Regular.ttf
+usr/share/fonts/truetype/wqy/wqy-microhei.ttc usr/share/games/wormux/font/wqy-microhei-lite.ttc

-- 
Wormux PKG