r14534 - in packages/trunk/dccnitghtmare/debian: . patches

[Vincent Prat]

Author: vivicoder-guest
Date: 2013-08-30 19:43:18 +0000 (Fri, 30 Aug 2013)
New Revision: 14534

Modified:
   packages/trunk/dccnitghtmare/debian/control
   packages/trunk/dccnitghtmare/debian/patches/data_path
   packages/trunk/dccnitghtmare/debian/rules
Log:
Dependency to (fonts|ttf)-dejavu-core package added


Modified: packages/trunk/dccnitghtmare/debian/control
===================================================================
--- packages/trunk/dccnitghtmare/debian/control	2013-08-27 22:54:39 UTC (rev 14533)
+++ packages/trunk/dccnitghtmare/debian/control	2013-08-30 19:43:18 UTC (rev 14534)
@@ -44,7 +44,8 @@
 
 Package: dccnitghtmare-data
 Architecture: all
-Depends: ${misc:Depends}
+Depends: fonts-dejavu-core | ttf-dejavu-core,
+         ${misc:Depends}
 Recommends: dccnitghtmare (= ${binary:Version})
 Description: Post-apocalyptical 3D single player RPG - game data
  DccNiTghtmare (aka DNT) is a project to make a Free (as in free speech)

Modified: packages/trunk/dccnitghtmare/debian/patches/data_path
===================================================================
--- packages/trunk/dccnitghtmare/debian/patches/data_path	2013-08-27 22:54:39 UTC (rev 14533)
+++ packages/trunk/dccnitghtmare/debian/patches/data_path	2013-08-30 19:43:18 UTC (rev 14534)
@@ -32,3 +32,14 @@
     fileSelector->setFilter(".png");
     /*fileSelector->setFileName(part->getTextureFileName());*/
     textureWindow->setAttributes(false,true,false,false);
+--- a/src/engine/util.h
++++ b/src/engine/util.h
+@@ -149,7 +149,7 @@
+ #define DNT_FONT_ARIAL     "fnt/arial.ttf"
+ #define DNT_FONT_TIMES     "fnt/times.ttf"
+ #define DNT_FONT_COURRIER  "fnt/courrier.ttf"
+-#define DNT_FONT_SANS      "fnt/DejaVuSans.ttf"
++#define DNT_FONT_SANS      "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf"
+ #define DNT_FONT_SHEER     "fnt/sheer.ttf"
+ #define DNT_FONT_PALLADIO  "fnt/URWPalladioL-Roma.ttf"
+ 

Modified: packages/trunk/dccnitghtmare/debian/rules
===================================================================
--- packages/trunk/dccnitghtmare/debian/rules	2013-08-27 22:54:39 UTC (rev 14533)
+++ packages/trunk/dccnitghtmare/debian/rules	2013-08-30 19:43:18 UTC (rev 14534)
@@ -5,6 +5,8 @@
 
 # hardening flags
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+# temporary data directory
+export DATA_DIR = debian/tmp/usr/local/share/dccnitghtmare/data
 
 %:
 	dh $@ --parallel
@@ -22,9 +24,11 @@
 
 override_dh_install:
 	# removing extra license files
-	rm debian/tmp/usr/local/share/dccnitghtmare/data/characters/portraits/sources/nubux/license.txt
-	rm debian/tmp/usr/local/share/dccnitghtmare/data/music/license.txt
-	rm debian/tmp/usr/local/share/dccnitghtmare/data/texturas/floor_outdoor/ofslayer/license.txt
-	rm debian/tmp/usr/local/share/dccnitghtmare/data/texturas/roads/streetlines/license.txt
-	rm debian/tmp/usr/local/share/dccnitghtmare/data/texturas/wall/license.txt
+	rm $(DATA_DIR)/characters/portraits/sources/nubux/license.txt
+	rm $(DATA_DIR)/music/license.txt
+	rm $(DATA_DIR)/texturas/floor_outdoor/ofslayer/license.txt
+	rm $(DATA_DIR)/texturas/roads/streetlines/license.txt
+	rm $(DATA_DIR)/texturas/wall/license.txt
+	# removing extra font files
+	rm $(DATA_DIR)/fnt/DejaVuSans.ttf
 	dh_install