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

[Vincent Prat]

Author: vivicoder-guest
Date: 2013-08-31 17:10:58 +0000 (Sat, 31 Aug 2013)
New Revision: 14537

Added:
   packages/trunk/dccnitghtmare/debian/patches/fonts
Modified:
   packages/trunk/dccnitghtmare/debian/control
   packages/trunk/dccnitghtmare/debian/patches/data_path
   packages/trunk/dccnitghtmare/debian/patches/series
   packages/trunk/dccnitghtmare/debian/rules
Log:
Provided fonts replaced by equivalent packaged ones


Modified: packages/trunk/dccnitghtmare/debian/control
===================================================================
--- packages/trunk/dccnitghtmare/debian/control	2013-08-31 04:49:46 UTC (rev 14536)
+++ packages/trunk/dccnitghtmare/debian/control	2013-08-31 17:10:58 UTC (rev 14537)
@@ -44,7 +44,10 @@
 
 Package: dccnitghtmare-data
 Architecture: all
-Depends: fonts-dejavu-core | ttf-dejavu-core,
+Depends: fonts-dejavu-core,
+         fonts-liberation,
+         fonts-linex,
+         fonts-johnsmith-induni,
          ${misc:Depends}
 Recommends: dccnitghtmare (= ${binary:Version})
 Description: Post-apocalyptical 3D single player RPG - game data

Modified: packages/trunk/dccnitghtmare/debian/patches/data_path
===================================================================
--- packages/trunk/dccnitghtmare/debian/patches/data_path	2013-08-31 04:49:46 UTC (rev 14536)
+++ packages/trunk/dccnitghtmare/debian/patches/data_path	2013-08-31 17:10:58 UTC (rev 14537)
@@ -32,14 +32,3 @@
     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"
- 

Added: packages/trunk/dccnitghtmare/debian/patches/fonts
===================================================================
--- packages/trunk/dccnitghtmare/debian/patches/fonts	                        (rev 0)
+++ packages/trunk/dccnitghtmare/debian/patches/fonts	2013-08-31 17:10:58 UTC (rev 14537)
@@ -0,0 +1,43 @@
+Author: Vincent Prat <vinceprat at free.fr>
+Description: fonts in data/fnt replaced by equivalent packaged ones
+--- a/src/engine/util.h
++++ b/src/engine/util.h
+@@ -146,12 +146,12 @@
+ /********************************************************************
+  *                             fonts                                *
+  ********************************************************************/
+-#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_SHEER     "fnt/sheer.ttf"
+-#define DNT_FONT_PALLADIO  "fnt/URWPalladioL-Roma.ttf"
++#define DNT_FONT_ARIAL     "/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf"
++#define DNT_FONT_TIMES     "/usr/share/fonts/truetype/liberation/LiberationSerif-Regular.ttf"
++#define DNT_FONT_COURRIER  "/usr/share/fonts/truetype/freefont/FreeMono.ttf"
++#define DNT_FONT_SANS      "/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf"
++#define DNT_FONT_SHEER     "/usr/share/fonts/truetype/linex/elegital.ttf"
++#define DNT_FONT_PALLADIO  "/usr/share/fonts/opentype/fonts-johnsmith-induni/IndUni-P/IndUni-P-Roman.otf"
+ 
+ 
+ 
+--- a/src/etc/dirs.cpp
++++ b/src/etc/dirs.cpp
+@@ -51,7 +51,7 @@
+ #endif
+ 
+    /* Try to open locally */
+-   file = "../data/fnt/arial.ttf";
++   file = "../data/dnt.ico";
+    if((arq = fopen(file.c_str(),"r")))
+    {
+       fclose(arq);
+@@ -61,7 +61,7 @@
+    {
+       /* Try to open at defined datadir */
+       file = dataDir;
+-      file += "/fnt/arial.ttf";
++      file += "/dnt.ico";
+       if((arq = fopen(file.c_str(),"r")))
+       {
+          dataPath = dataDir;

Modified: packages/trunk/dccnitghtmare/debian/patches/series
===================================================================
--- packages/trunk/dccnitghtmare/debian/patches/series	2013-08-31 04:49:46 UTC (rev 14536)
+++ packages/trunk/dccnitghtmare/debian/patches/series	2013-08-31 17:10:58 UTC (rev 14537)
@@ -1,3 +1,4 @@
 name_change
 data_path
 tools
+fonts

Modified: packages/trunk/dccnitghtmare/debian/rules
===================================================================
--- packages/trunk/dccnitghtmare/debian/rules	2013-08-31 04:49:46 UTC (rev 14536)
+++ packages/trunk/dccnitghtmare/debian/rules	2013-08-31 17:10:58 UTC (rev 14537)
@@ -30,5 +30,5 @@
 	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
+	rm -r $(DATA_DIR)/fnt/
 	dh_install