r8877 - in packages/trunk/glest/debian: . patches

[Siegfried-Angel Gevatter Pujals]

Author: rainct-guest
Date: 2009-02-17 22:51:45 +0000 (Tue, 17 Feb 2009)
New Revision: 8877

Added:
   packages/trunk/glest/debian/patches/fix-glest-ini
Modified:
   packages/trunk/glest/debian/changelog
   packages/trunk/glest/debian/glest.sh
   packages/trunk/glest/debian/patches/series
Log:
* debian/patches/fix-glest-ini:
   - Change "english.lng" to just "english".
* debian/glest.sh:
   - If there is an existing glest.ini file, change "<langname.lng>" to
     just "<langname>".

Modified: packages/trunk/glest/debian/changelog
===================================================================
--- packages/trunk/glest/debian/changelog	2009-02-17 22:17:25 UTC (rev 8876)
+++ packages/trunk/glest/debian/changelog	2009-02-17 22:51:45 UTC (rev 8877)
@@ -24,6 +24,11 @@
      - Update the copyright to match the directory structure changes.
   * debian/docs:
      - Upstream's README files have no interesting content; remove it.
+  * debian/patches/fix-glest-ini:
+     - Change "english.lng" to just "english".
+  * debian/glest.sh:
+     - If there is an existing glest.ini file, change "<langname.lng>" to
+       just "<langname>".
 
  -- Siegfried-Angel Gevatter Pujals <rainct at ubuntu.com>  Tue, 17 Feb 2009 21:08:33 +0100
 

Modified: packages/trunk/glest/debian/glest.sh
===================================================================
--- packages/trunk/glest/debian/glest.sh	2009-02-17 22:17:25 UTC (rev 8876)
+++ packages/trunk/glest/debian/glest.sh	2009-02-17 22:51:45 UTC (rev 8877)
@@ -3,7 +3,12 @@
 DIR=$HOME/.glest
 [ -d $DIR ] || mkdir $DIR
 cd $DIR
-[ -f glest.ini ] || cp /usr/lib/glest/glest.ini .
+if [ -f glest.ini ]; then
+    # Update for Glest 3.2.1
+    sed -i 's/\.lng//' glest.ini
+else
+    cp /usr/lib/glest/glest.ini .
+fi
 [ -h glest ] || ln -s /usr/lib/glest/glest .
 [ -f servers.ini ] || cp $MAINDIR/servers.ini .
 for i in data docs scenarios techs tilesets; do

Added: packages/trunk/glest/debian/patches/fix-glest-ini
===================================================================
--- packages/trunk/glest/debian/patches/fix-glest-ini	                        (rev 0)
+++ packages/trunk/glest/debian/patches/fix-glest-ini	2009-02-17 22:51:45 UTC (rev 8877)
@@ -0,0 +1,13 @@
+Index: glest-3.2.1/mk/linux/glest.ini
+===================================================================
+--- glest-3.2.1.orig/mk/linux/glest.ini	2009-02-17 23:40:58.000000000 +0100
++++ glest-3.2.1/mk/linux/glest.ini	2009-02-17 23:42:34.000000000 +0100
+@@ -23,7 +23,7 @@
+ FontConsole=-*-*-*-*-*-*-12-*-*-*-*-*-*-*
+ FontDisplay=-*-*-*-*-*-*-12-*-*-*-*-*-*-*
+ FontMenu=-*-*-*-*-*-*-12-*-*-*-*-*-*-*
+-Lang=english.lng
++Lang=english
+ MaxLights=1
+ NetworkConsistencyChecks=1
+ PhotoMode=0

Modified: packages/trunk/glest/debian/patches/series
===================================================================
--- packages/trunk/glest/debian/patches/series	2009-02-17 22:17:25 UTC (rev 8876)
+++ packages/trunk/glest/debian/patches/series	2009-02-17 22:51:45 UTC (rev 8877)
@@ -1,2 +1,3 @@
 nomapeditor
 do-not-link-unneeded-libs
+fix-glest-ini