[SCM] WarMUX PKG branch, master, updated. 66851e07400683a8c4f568dcbe5477c849ec6dbc

[Felix Geyer]

The following commit has been merged in the master branch:
commit e9575e6a326ff2b18ef769006803e218668b3dae
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Sun Feb 13 00:31:39 2011 +0100

    Adapt to upstream replacing DejaVu with the Ubuntu font.
    
    The ubuntu-font-family package isn't in Debian yet so
    we have to install the font.

diff --git a/debian/control b/debian/control
index 608dcdc..c6753e7 100644
--- a/debian/control
+++ b/debian/control
@@ -74,7 +74,7 @@ Description: stand alone server and game index server for WarMUX
 
 Package: warmux-data
 Architecture: all
-Depends: ttf-dejavu, ttf-vlgothic, ttf-wqy-microhei, ${misc:Depends}
+Depends: ttf-vlgothic, ttf-wqy-microhei, ${misc:Depends}
 Replaces: wormux-data (<< 1:11.01)
 Breaks: wormux-data (<< 1:11.01)
 Description: data files for the WarMUX game
diff --git a/debian/rules b/debian/rules
index ef40dec..124c9b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ override_dh_auto_install:
 	dh_auto_install
 	
 	# these font files will be replaced with symlinks
-	rm debian/tmp/usr/share/games/warmux/font/DejaVuSans.ttf
+	#rm debian/tmp/usr/share/games/warmux/font/Ubuntu-R.ttf
 	rm debian/tmp/usr/share/games/warmux/font/VL-Gothic-Regular.ttf
 	rm debian/tmp/usr/share/games/warmux/font/wqy-microhei-lite.ttc
 	
diff --git a/debian/warmux-data.links b/debian/warmux-data.links
index ac70ed5..6f96538 100644
--- a/debian/warmux-data.links
+++ b/debian/warmux-data.links
@@ -1,3 +1,3 @@
-usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf usr/share/games/warmux/font/DejaVuSans.ttf
+#usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-R.ttf usr/share/games/warmux/font/Ubuntu-R.ttf
 usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf usr/share/games/warmux/font/VL-Gothic-Regular.ttf
 usr/share/fonts/truetype/wqy/wqy-microhei.ttc usr/share/games/warmux/font/wqy-microhei-lite.ttc

-- 
WarMUX PKG