[SCM] WarMUX PKG branch, master, updated. 56e3341e6284e349bc18f9d2f25a3d896d61f2c8

[Felix Geyer]

The following commit has been merged in the master branch:
commit b45d31fa0c40663e702145997a16e700136f906a
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Fri Jun 17 12:50:45 2011 +0200

    Use DejaVu Sans as the default font.

diff --git a/debian/changelog b/debian/changelog
index 90294aa..42b9edb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ warmux (1:11.04.1+repack-1) UNRELEASED; urgency=low
   * New upstream release.
   * Remove the embedded copy of the Ubuntu font as it is not considered
     DFSG-free.
+    - Use the DejaVu Sans font instead.
   * Update the package description as Warmux supports playing against
     computer opponents. (Closes: #624798)
 
diff --git a/debian/control b/debian/control
index 4bfd179..cc97bdd 100644
--- a/debian/control
+++ b/debian/control
@@ -60,7 +60,7 @@ Description: stand alone server and game index server for WarMUX
 
 Package: warmux-data
 Architecture: all
-Depends: ttf-vlgothic, ttf-wqy-microhei, ${misc:Depends}
+Depends: ttf-dejavu-core, 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 53292d0..b01fad1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,13 +7,13 @@ CXXFLAGS += -Wall -Wextra
 
 override_dh_auto_configure:
 	dh_auto_configure -- --with-datadir-name=\$${prefix}/share/games/warmux \
-	  --bindir=\$${prefix}/games --enable-servers --enable-fribidi
+	  --bindir=\$${prefix}/games --enable-servers --enable-fribidi \
+	  --with-font-path=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
 
 override_dh_auto_install:
 	dh_auto_install
 	
 	# these font files will be replaced with symlinks
-	#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 6f96538..ae7b138 100644
--- a/debian/warmux-data.links
+++ b/debian/warmux-data.links
@@ -1,3 +1,2 @@
-#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