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

[Jan Dittberner]

The following commit has been merged in the master branch:
commit 63f678a083c29f015c5c306b52e442e51bd876bc
Author: Jan Dittberner <jandd at debian.org>
Date:   Sun Apr 4 13:32:51 2010 +0200

    use otf-freefont instead of ttf-freefont (Closes: #575512)
    
    * debian/control: depend on otf-freefont instead of ttf-freefont for
      FreeSansBold.otf (OpenType font) (Closes: #575512)
    * debian/rules: symlink to otf version of FreeSansBold

diff --git a/debian/changelog b/debian/changelog
index 8111a4f..39d3da6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 spring (0.81.2.1+dfsg1-2) UNRELEASED; urgency=low
 
-  * remove FreeSansBold.ttf symlink and keep FreeSansBold.otf (OpenType
-    font) instead (Closes: #575512)
+  * debian/control: depend on otf-freefont instead of ttf-freefont for
+    FreeSansBold.otf (OpenType font) (Closes: #575512)
+  * debian/rules: symlink to otf version of FreeSansBold
 
  -- Jan Dittberner <jandd at debian.org>  Sat, 27 Mar 2010 15:01:02 +0100
 
diff --git a/debian/control b/debian/control
index 2f2cb41..a95d00d 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,7 @@ Homepage: http://springrts.com
 
 Package: spring
 Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
-Depends: ${shlibs:Depends}, ${misc:Depends}, spring-common (= ${source:Version}), ttf-freefont
+Depends: ${shlibs:Depends}, ${misc:Depends}, spring-common (= ${source:Version}), otf-freefont
 Conflicts: spring-engine
 Recommends: springlobby | spring-lobby
 Suggests: spring-maps-deltasiege | spring-map, spring-mods-kernelpanic | spring-mod
diff --git a/debian/rules b/debian/rules
index 3d3ee0c..52ccbf7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,11 +40,11 @@ override_dh_auto_install:
 	mkdir -p $(TMPINSTDIR)/etc/spring
 	echo '$$HOME/.spring' > $(TMPINSTDIR)/etc/spring/datadir
 
-	# remove non-font files from fonts directory
-	rm -f $(TMPINSTDIR)/usr/share/games/spring/fonts/AUTHORS \
-	      $(TMPINSTDIR)/usr/share/games/spring/fonts/CREDITS \
-	      $(TMPINSTDIR)/usr/share/games/spring/fonts/COPYING \
-	      $(TMPINSTDIR)/usr/share/games/spring/fonts/README
+	# 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
+	ln -s /usr/share/fonts/opentype/freefont/FreeSansBold.otf $(TMPINSTDIR)/usr/share/games/spring/fonts
 
 	# Remove empty directories
 	find $(TMPINSTDIR) -type d -empty -delete

-- 
advanced 3D real time strategy game engine