r1486 - in packages/trunk/openmortal/debian: . patches

[Bruno Fuddl-guestquot; Fuddl" Kleinert]

Author: fuddl-guest
Date: 2006-09-04 15:52:17 +0000 (Mon, 04 Sep 2006)
New Revision: 1486

Added:
   packages/trunk/openmortal/debian/patches/20_don_t_install_ttf-fonts.dpatch
Modified:
   packages/trunk/openmortal/debian/control
   packages/trunk/openmortal/debian/rules
Log:
use fonts from ttf-dejavu and ttf-dustin

Modified: packages/trunk/openmortal/debian/control
===================================================================
--- packages/trunk/openmortal/debian/control	2006-09-04 15:51:16 UTC (rev 1485)
+++ packages/trunk/openmortal/debian/control	2006-09-04 15:52:17 UTC (rev 1486)
@@ -21,6 +21,7 @@
 Package: openmortal-data
 Architecture: all
 Recommends: openmortal
+Depends: ttf-dustin, ttf-dejavu
 Description: Data files for OpenMortal
  OpenMortal is a parody of the popular coin-up game, Mortal Kombat.
  It is currently playable (maybe even enjoyable), although it is still

Added: packages/trunk/openmortal/debian/patches/20_don_t_install_ttf-fonts.dpatch
===================================================================
--- packages/trunk/openmortal/debian/patches/20_don_t_install_ttf-fonts.dpatch	                        (rev 0)
+++ packages/trunk/openmortal/debian/patches/20_don_t_install_ttf-fonts.dpatch	2006-09-04 15:52:17 UTC (rev 1486)
@@ -0,0 +1,51 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_don_t_install_ttf-fonts.dpatch by Bruno "Fuddl" Kleinert <fuddl at gmx.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: don't try to install removed ttf fonts
+
+ at DPATCH@
+diff -urNad openmortal-0.7.dfsg~/data/fonts/Makefile.am openmortal-0.7.dfsg/data/fonts/Makefile.am
+--- openmortal-0.7.dfsg~/data/fonts/Makefile.am	2004-01-30 15:50:50.000000000 +0100
++++ openmortal-0.7.dfsg/data/fonts/Makefile.am	2006-09-04 17:41:35.530899750 +0200
+@@ -2,7 +2,6 @@
+ 
+ fontsdatadir	= $(pkgdatadir)/fonts
+ fontsdata_DATA	= \
+-aardvark.ttf bradybun.ttf deadgrit.ttf thin.ttf \
+ brandybun3.png glossyfont.png CreditsFont2.png
+ 
+ EXTRA_DIST = $(fontsdata_DATA)
+diff -urNad openmortal-0.7.dfsg~/data/fonts/Makefile.in openmortal-0.7.dfsg/data/fonts/Makefile.in
+--- openmortal-0.7.dfsg~/data/fonts/Makefile.in	2004-04-30 10:26:05.000000000 +0200
++++ openmortal-0.7.dfsg/data/fonts/Makefile.in	2006-09-04 17:41:22.730099750 +0200
+@@ -83,7 +83,7 @@
+ perl_embed_ldflags = @perl_embed_ldflags@
+ 
+ fontsdatadir = $(pkgdatadir)/fonts
+-fontsdata_DATA =  aardvark.ttf bradybun.ttf deadgrit.ttf thin.ttf brandybun3.png glossyfont.png CreditsFont2.png
++fontsdata_DATA =  brandybun3.png glossyfont.png CreditsFont2.png
+ 
+ 
+ EXTRA_DIST = $(fontsdata_DATA)
+diff -urNad openmortal-0.7.dfsg~/src/main.cpp openmortal-0.7.dfsg/src/main.cpp
+--- openmortal-0.7.dfsg~/src/main.cpp	2004-04-30 10:24:24.000000000 +0200
++++ openmortal-0.7.dfsg/src/main.cpp	2006-09-04 17:42:28.050182000 +0200
+@@ -180,13 +180,13 @@
+ 
+ 	sge_TTF_AAOff();
+ 	
+-	inkFont = LoadTTF( "aardvark.ttf", 20 );
++	inkFont = LoadTTF( "DejaVuSerifCondensed-Bold.ttf", 20 );
+ 	if ( !inkFont ) return -1;
+-	impactFont = LoadTTF( "bradybun.ttf", 20 );	// gooddogc.ttf, 20
++	impactFont = LoadTTF( "DejaVuSerifCondensed-Bold.ttf", 20 );	// gooddogc.ttf, 20
+ 	if ( !impactFont ) return -1;
+-	titleFont = LoadTTF( "deadgrit.ttf", 48 );		// deadgrit.ttf, 48
++	titleFont = LoadTTF( "El_Abogado_Loco.ttf", 48 );		// deadgrit.ttf, 48
+ 	if ( !titleFont ) return -1;
+-	chatFont = LoadTTF( "thin.ttf", 20 );		// deadgrit.ttf, 48
++	chatFont = LoadTTF( "It_wasn_t_me.ttf", 20 );		// deadgrit.ttf, 48
+ 	if ( !chatFont ) return -1;
+ 
+ 	fastFont = LoadBMPFont( "brandybun3.png" );


Property changes on: packages/trunk/openmortal/debian/patches/20_don_t_install_ttf-fonts.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/trunk/openmortal/debian/rules
===================================================================
--- packages/trunk/openmortal/debian/rules	2006-09-04 15:51:16 UTC (rev 1485)
+++ packages/trunk/openmortal/debian/rules	2006-09-04 15:52:17 UTC (rev 1486)
@@ -70,6 +70,9 @@
 	dh_installmenu
 	dh_installman -popenmortal debian/openmortal.6
 	dh_link
+	dh_link -popenmortal-data usr/share/fonts/truetype/ttf-dejavu/DejaVuSerifCondensed-Bold.ttf usr/share/openmortal/fonts/ejaVuSerifCondensed-Bold.ttf
+	dh_link -popenmortal-data usr/share/fonts/truetype/dustin/El_Abogado_Loco.ttf usr/share/openmortal/fonts/El_Abogado_Loco.ttf
+	dh_link -popenmortal-data usr/share/fonts/truetype/dustin/It_wasn_t_me.ttf usr/share/openmortal/fonts/It_wasn_t_me.ttf
 	dh_strip
 	dh_compress
 	dh_fixperms