[freecol] 14/125: [freecol] committing the long gone -4 release

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository freecol.

commit 345587243d064b8c1f2201e0a9b69200cef2e7bd
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Fri Dec 14 00:02:22 2007 +0000

    [freecol] committing the long gone -4 release
---
 debian/changelog                            |  8 +++---
 debian/patches/00list                       |  3 ++-
 debian/patches/20-freecol-executable.dpatch | 12 ++++++---
 debian/patches/30-language-option.dpatch    | 39 +++++++++++++++++++++++++++++
 4 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4206c88..f3f37e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-freecol (0.7.2-4) UNRELEASED; urgency=low
+freecol (0.7.2-4) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Pull upstream revision 3270 to add a --default-locale option
+  * Used this option to detect when LC_MESSAGES is different from
+    LC_CTYPE (Closes: #450944)
 
- -- Vincent Fourmond <fourmond at debian.org>  Thu, 22 Nov 2007 19:56:08 +0100
+ -- Vincent Fourmond <fourmond at debian.org>  Mon, 26 Nov 2007 20:25:41 +0100
 
 freecol (0.7.2-3) unstable; urgency=low
 
diff --git a/debian/patches/00list b/debian/patches/00list
index 40917fd..923d2e1 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,4 +1,5 @@
 10-fix-jar-path
 15-fix-jar-manifest
 20-freecol-executable
-25-change-save-dir
\ No newline at end of file
+25-change-save-dir
+30-language-option
\ No newline at end of file
diff --git a/debian/patches/20-freecol-executable.dpatch b/debian/patches/20-freecol-executable.dpatch
index 6839ade..f487860 100755
--- a/debian/patches/20-freecol-executable.dpatch
+++ b/debian/patches/20-freecol-executable.dpatch
@@ -7,8 +7,8 @@
 @DPATCH@
 diff -urNad freecol-0.7.2~/src/freecol freecol-0.7.2/src/freecol
 --- freecol-0.7.2~/src/freecol	1970-01-01 01:00:00.000000000 +0100
-+++ freecol-0.7.2/src/freecol	2007-10-26 20:48:10.000000000 +0200
-@@ -0,0 +1,16 @@
++++ freecol-0.7.2/src/freecol	2007-11-26 20:47:51.000000000 +0100
+@@ -0,0 +1,22 @@
 +#!/bin/sh
 +
 +# Script 'greatly inspired' from the one of jabref
@@ -22,6 +22,12 @@ diff -urNad freecol-0.7.2~/src/freecol freecol-0.7.2/src/freecol
 +JAVA=${JAVA_HOME}/jre/bin/java
 +fi
 +
++# We test if LC_MESSAGES is different from LC_CTYPE, if that is the case,
++# 
++if [ "$LC_CTYPE" != "$LC_MESSAGES" -a "$LC_MESSAGES" ]; then
++    lang_argument="--default-locale=$LC_MESSAGES"
++fi
++
 +export JAVA=${JAVA:=java}
 +exec $JAVA -Xmx128M -jar /usr/share/java/freecol.jar --freecol-data \
-+    /usr/share/games/freecol "$@"
++    /usr/share/games/freecol $lang_argument "$@"
diff --git a/debian/patches/30-language-option.dpatch b/debian/patches/30-language-option.dpatch
new file mode 100755
index 0000000..d864835
--- /dev/null
+++ b/debian/patches/30-language-option.dpatch
@@ -0,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30-language-option.dpatch by  <fourmond at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad freecol-0.7.2~/src/net/sf/freecol/FreeCol.java freecol-0.7.2/src/net/sf/freecol/FreeCol.java
+--- freecol-0.7.2~/src/net/sf/freecol/FreeCol.java	2007-11-26 20:24:01.000000000 +0100
++++ freecol-0.7.2/src/net/sf/freecol/FreeCol.java	2007-11-26 20:24:01.000000000 +0100
+@@ -521,6 +521,19 @@
+                 }
+                 
+                 windowed = true;
++            } else if (args[i].length() > 16 && args[i].substring(0, 16).equals("--default-locale")) {
++                if (args[i].charAt(16) == '=') {
++                    // slightly ugly: strip encoding from LC_MESSAGES
++                    String languageID = args[i].substring(17);
++                    int index = languageID.indexOf('.');
++                    if (index > 0) {
++                        languageID = languageID.substring(0, index);
++                    }
++                    Locale.setDefault(LanguageOption.getLocale(languageID));
++                } else {
++                    printUsage();
++                    System.exit(0);
++                }
+             } else if (args[i].equals("--no-sound")) {
+                 sound = false;
+             } else if (args[i].equals("--no-memory-check")) {
+@@ -655,6 +668,8 @@
+         System.out.println("  runs FreeCol in windowed mode instead of full screen mode");
+         System.out.println("--load-savegame SAVEGAME_FILE");
+         System.out.println("  loads the given savegame.");
++        System.out.println("--default-locale=LANGUAGE[_COUNTRY[_VARIANT]]");
++        System.out.println("  sets the default locale.");
+         System.out.println("--splash[=SPLASH_IMAGE_FILE]");
+         System.out.println("  displays a splash screen while loading the game");
+         System.out.println("--no-sound");

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/freecol.git