[SCM] advanced 3D real time strategy game engine branch, master, updated. debian/0.81.2.1+dfsg1-1-1-g0cddda6

[Jan Dittberner]

The following commit has been merged in the master branch:
commit 0cddda61e37d69884adc8ad3010c63bb51c58f1a
Author: Jan Dittberner <jan at dittberner.info>
Date:   Sat Mar 27 15:07:13 2010 +0100

    keep FreeSansBold.otf (OpenType font) in addition to symlinked FreeSansBold.ttf (Closes: #575512)

diff --git a/debian/changelog b/debian/changelog
index f923b35..c27274c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+spring (0.81.2.1+dfsg1-2) UNRELEASED; urgency=low
+
+  * keep FreeSansBold.otf (OpenType font) in addition to symlinked
+    FreeSansBold.ttf (Closes: #575512)
+
+ -- Jan Dittberner <jandd at debian.org>  Sat, 27 Mar 2010 15:01:02 +0100
+
 spring (0.81.2.1+dfsg1-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/rules b/debian/rules
index 20ae74b..9ac3af9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,10 +40,8 @@ override_dh_auto_install:
 	mkdir -p $(TMPINSTDIR)/etc/spring
 	echo '$$HOME/.spring' > $(TMPINSTDIR)/etc/spring/datadir
 
-	# remove the tarball included font and
-	# provide a symlink to the packaged one instead
-	rm -rf $(TMPINSTDIR)/usr/share/games/spring/fonts
-	mkdir -p $(TMPINSTDIR)/usr/share/games/spring/fonts
+	# provide a symlink to the packaged ttf font in addition to the
+	# otf version from the tarball instead
 	ln -s /usr/share/fonts/truetype/freefont/FreeSansBold.ttf $(TMPINSTDIR)/usr/share/games/spring/fonts
 
 	# Remove empty directories

-- 
advanced 3D real time strategy game engine