[SCM] Packaging for scorched3d branch, master, updated. upstream/42.1dfsg-33-gb44fce0

[Gonéri Le Bouder]

The following commit has been merged in the master branch:
commit b44fce013251bf3c185b10626fc734c6e55677d3
Author: Gonéri Le Bouder <goneri at rulezlan.org>
Date:   Thu Aug 27 01:28:58 2009 +0200

    * Reuse fonts from ttf-dejavu-core

diff --git a/debian/changelog b/debian/changelog
index b0627db..09e6c68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,8 @@ scorched3d (42.1dfsg-2) unstable; urgency=low
   * Add myself in uploaders
   * Bump standard version: 3.8.3
    - add a not about the use of quilt
-  * Fix the Vcs, they were broken since the git migration 
+  * Fix the Vcs, they were broken since the git migration
+  * Reuse fonts from ttf-dejavu-core 
 
  -- Gonéri Le Bouder <goneri at rulezlan.org>  Wed, 26 Aug 2009 23:26:27 +0200
 
diff --git a/debian/control b/debian/control
index da945d0..03d3b3e 100644
--- a/debian/control
+++ b/debian/control
@@ -59,6 +59,7 @@ Description: 3D artillery game similar to Scorched Earth, debug data
 Package: scorched3d-data
 Architecture: all
 Recommends: scorched3d
+Depends: ttf-dejavu-core
 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 5ceaa37..6caeab6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,6 +73,11 @@ install: build
 	dh_prep
 	dh_installdirs
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	# already in ttf-dejavu-core
+	rm debian/tmp/usr/share/games/scorched3d/data/fonts/dejavusans.ttf
+	#Which one it that?
+	#rm debian/tmp/usr/share/games/scorched3d/data/fonts/dejavusconbd.ttf
+	rm debian/tmp/usr/share/games/scorched3d/data/fonts/dejavusmobd.ttf
 	mkdir -p debian/tmp/usr/share/bug/scorched3d
 	cp debian/presubj debian/tmp/usr/share/bug/scorched3d/
 	uudecode -o debian/scorched3d.png debian/scorched3d.png.uu 
diff --git a/debian/scorched3d-data.links b/debian/scorched3d-data.links
new file mode 100644
index 0000000..af31331
--- /dev/null
+++ b/debian/scorched3d-data.links
@@ -0,0 +1,2 @@
+/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

-- 
Packaging for scorched3d