r4760 - in packages/trunk/allacrost/debian: . patches

[Jordà Polo]

Author: jorda-guest
Date: 2007-11-24 18:27:08 +0000 (Sat, 24 Nov 2007)
New Revision: 4760

Added:
   packages/trunk/allacrost/debian/patches/disable_welcome.patch
Removed:
   packages/trunk/allacrost/debian/patches/01_font_size.patch
   packages/trunk/allacrost/debian/patches/02_disable_welcome.patch
Modified:
   packages/trunk/allacrost/debian/allacrost-data.links
   packages/trunk/allacrost/debian/changelog
   packages/trunk/allacrost/debian/patches/series
Log:
Update font-related issues that have been fixed upstream.


Modified: packages/trunk/allacrost/debian/allacrost-data.links
===================================================================
--- packages/trunk/allacrost/debian/allacrost-data.links	2007-11-24 18:15:04 UTC (rev 4759)
+++ packages/trunk/allacrost/debian/allacrost-data.links	2007-11-24 18:27:08 UTC (rev 4760)
@@ -1,2 +1,3 @@
-usr/share/fonts/truetype/ttf-junicode/Junicode-Regular.ttf usr/share/games/allacrost/img/fonts/vtc_switchblade_romance.ttf
+usr/share/fonts/truetype/ttf-junicode/Junicode-Regular.ttf usr/share/games/allacrost/img/fonts/junicode_regular.ttf
+usr/share/fonts/truetype/linux-libertine/LinLibertine_Re-2.6.9RO.ttf usr/share/games/allacrost/img/fonts/libertine.ttf
 usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf usr/share/games/allacrost/img/fonts/tarnhalo.ttf

Modified: packages/trunk/allacrost/debian/changelog
===================================================================
--- packages/trunk/allacrost/debian/changelog	2007-11-24 18:15:04 UTC (rev 4759)
+++ packages/trunk/allacrost/debian/changelog	2007-11-24 18:27:08 UTC (rev 4760)
@@ -1,14 +1,18 @@
-allacrost (0.0.0+svn858.dfsg-2) UNRELEASED; urgency=low
+allacrost (0.0.0+svn1122.dfsg-2) UNRELEASED; urgency=low
 
   [ Jordà Polo ]
   * Added new handmade manpages.
   * debian/control:
     + Updated long description to reflect upstream changes.
     + Added Homepage field.
+    + New allacrost-data dependency: linux-libertine.
   * debian/allacrost-editor.menu: Section changed to «Games/Tools».
   * Simplified allacrost-data.install and removed unneeded *.dirs files.
   * debian/rules: Only specify both --build and --host when it is actually
     needed.
+  * Update font-related issues that have been fixed upstream:
+    + debian/patches/01_font_size.patch: Removed, no longer needed.
+    + debian/allacrost-data.links: Links to the new fonts.
 
   [ Gonéri Le Bouder ]
   * Add a watchfile.

Deleted: packages/trunk/allacrost/debian/patches/01_font_size.patch
===================================================================
--- packages/trunk/allacrost/debian/patches/01_font_size.patch	2007-11-24 18:15:04 UTC (rev 4759)
+++ packages/trunk/allacrost/debian/patches/01_font_size.patch	2007-11-24 18:27:08 UTC (rev 4760)
@@ -1,13 +0,0 @@
-Index: allacrost/src/main.cpp
-===================================================================
---- allacrost.orig/src/main.cpp	2007-06-06 17:31:42.000000000 +0200
-+++ allacrost/src/main.cpp	2007-06-06 17:33:05.000000000 +0200
-@@ -129,7 +129,7 @@
- 	VideoManager->SetFontShadowYOffset("default", -2);
- 	VideoManager->SetFontShadowStyle("default", VIDEO_TEXT_SHADOW_BLACK);
- 
--	if (!VideoManager->LoadFont("img/fonts/vtc_switchblade_romance.ttf", "map", 24)) {
-+	if (!VideoManager->LoadFont("img/fonts/vtc_switchblade_romance.ttf", "map", 22)) {
- 		return false;
- 	}
- 

Deleted: packages/trunk/allacrost/debian/patches/02_disable_welcome.patch
===================================================================
--- packages/trunk/allacrost/debian/patches/02_disable_welcome.patch	2007-11-24 18:15:04 UTC (rev 4759)
+++ packages/trunk/allacrost/debian/patches/02_disable_welcome.patch	2007-11-24 18:27:08 UTC (rev 4760)
@@ -1,13 +0,0 @@
-Index: allacrost-0.0.0+svn824/dat/config/settings.lua
-===================================================================
---- allacrost-0.0.0+svn824.orig/dat/config/settings.lua	2007-06-06 19:00:28.000000000 +0200
-+++ allacrost-0.0.0+svn824/dat/config/settings.lua	2007-06-06 19:00:36.000000000 +0200
-@@ -14,7 +14,7 @@
- language_settings = 0;
- 
- -- First time the game is run, show welcome message if 1
--welcome = 1;
-+welcome = 0;
- 
- --[[ DEFAULT KEY SETTINGS --
- -- 

Copied: packages/trunk/allacrost/debian/patches/disable_welcome.patch (from rev 4756, packages/trunk/allacrost/debian/patches/02_disable_welcome.patch)
===================================================================
--- packages/trunk/allacrost/debian/patches/disable_welcome.patch	                        (rev 0)
+++ packages/trunk/allacrost/debian/patches/disable_welcome.patch	2007-11-24 18:27:08 UTC (rev 4760)
@@ -0,0 +1,13 @@
+Index: allacrost-0.0.0+svn824/dat/config/settings.lua
+===================================================================
+--- allacrost-0.0.0+svn824.orig/dat/config/settings.lua	2007-06-06 19:00:28.000000000 +0200
++++ allacrost-0.0.0+svn824/dat/config/settings.lua	2007-06-06 19:00:36.000000000 +0200
+@@ -14,7 +14,7 @@
+ language_settings = 0;
+ 
+ -- First time the game is run, show welcome message if 1
+-welcome = 1;
++welcome = 0;
+ 
+ --[[ DEFAULT KEY SETTINGS --
+ -- 

Modified: packages/trunk/allacrost/debian/patches/series
===================================================================
--- packages/trunk/allacrost/debian/patches/series	2007-11-24 18:15:04 UTC (rev 4759)
+++ packages/trunk/allacrost/debian/patches/series	2007-11-24 18:27:08 UTC (rev 4760)
@@ -1,2 +1 @@
-01_font_size.patch
-02_disable_welcome.patch
+disable_welcome.patch