[SCM] Packaging for scorched3d branch, master, updated. debian/43.2a.dfsg-6-13-gc06df20

[Stephen M. Webb]

The following commit has been merged in the master branch:
commit 36b5fcd06484cbc218dd81296c7476b411e87c23
Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
Date:   Wed Feb 8 14:51:13 2012 -0500

    replaced the embedded copy of DejaVuCondensedBold font with the system one

diff --git a/debian/changelog b/debian/changelog
index 3f88892..08a354d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ scorched3d (43.3+dfsg-1) precise; urgency=low
   * update to debhelper compat level 9
   * removed embedded copy of GLEW library (closes: #634843)
   * added dpkg Pre-Depends to -dbg and -data packages for xz compression
+  * replaced the embedded copy of DejaVuCondensedBold font with the system one
 
- -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Wed, 08 Feb 2012 14:38:16 -0500
+ -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Wed, 08 Feb 2012 14:50:10 -0500
 
 scorched3d (43.2a.dfsg-6) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 3001fc0..eba9b9d 100644
--- a/debian/control
+++ b/debian/control
@@ -62,7 +62,7 @@ Package: scorched3d-data
 Architecture: all
 Suggests: scorched3d
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ttf-dejavu-core, ${misc:Depends}
+Depends: ttf-dejavu-core, ttf-dejavu-extra, ${misc:Depends}
 Description: data files for Scorched3D game
  Scorched3D is a game based heavily on the classic DOS game Scorched Earth
  "The Mother Of All Games". Scorched3D adds amongst other new features
diff --git a/debian/rules b/debian/rules
index a6b4945..bc10dc1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,11 +41,12 @@ override_dh_builddeb:
 	dh_builddeb -- -Zxz
 
 override_dh_auto_install:
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	dh_auto_install
 	# Both fonts are in ttf-dejavu-core. Remove them here and create
 	# symlinks later on by debian/scorched3d-data
 	rm debian/tmp/usr/share/games/scorched3d/data/fonts/dejavusans.ttf
 	rm debian/tmp/usr/share/games/scorched3d/data/fonts/dejavusmobd.ttf
+	rm debian/tmp/usr/share/games/scorched3d/data/fonts/dejavusconbd.ttf
 	mkdir -p debian/tmp/usr/share/bug/scorched3d
 	cp debian/presubj debian/tmp/usr/share/bug/scorched3d/
 	mkdir -p debian/tmp/usr/share/icons/hicolor/48x48/apps
diff --git a/debian/scorched3d-data.links b/debian/scorched3d-data.links
index af31331..e1e83cc 100644
--- a/debian/scorched3d-data.links
+++ b/debian/scorched3d-data.links
@@ -1,2 +1,3 @@
 /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf /usr/share/games/scorched3d/data/fonts/dejavusans.ttf
 /usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf /usr/share/games/scorched3d/data/fonts/dejavusmobd.ttf
+/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansCondensed-Bold.ttf /usr/share/games/scorched3d/data/fonts/dejavusconbd.ttf

-- 
Packaging for scorched3d