From ebc57739c2ef2fa44f126bc29ccdee7ea025401f Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Sat, 16 Dec 2006 18:23:47 +0100
Subject: [PATCH] grml-setlang uses utf8 by default, S-X-Vcs-Hg header for
 debian/control

---
 debian/changelog      |   9 ++++
 debian/control        |   2 +-
 usr_sbin/grml-setlang | 132 +++++++++++++++++++++++++-------------------------
 3 files changed, 77 insertions(+), 66 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2a136f9..fcb51cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+grml-scripts (0.9.8) unstable; urgency=low
+
+  * grml-setlang: use utf8 as default. Get iso stuff via $LANG-iso,
+    utf8 via $LANG or $LANG-utf8. Add grml-autoconfig (>= 0.6.9)
+    to Suggests as grml-setlang requires current language functions.
+  * Add S-X-Vcs-Hg entry to debian/control.
+
+ -- Michael Prokop <mika@grml.org>  Sat, 16 Dec 2006 18:21:58 +0100
+
 grml-scripts (0.9.7) unstable; urgency=low
 
   * qma: update vim config [thanks, wuehlmaus]
diff --git a/debian/control b/debian/control
index 293b172..19ea834 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ XS-X-Vcs-Hg: http://hg.grml.org/grml-scripts
 Package: grml-scripts
 Architecture: any
 Depends: dialog, perl, zsh, dash, w3m | links | links2, screen, console-tools | xbase-clients, grml-network, grml-etc-core
-Suggests: ruby, python, grml-x, ipcalc, hwinfo, antiword, grml-etc, grml-rebuildfstab, grml-scanpartitions, grml-files, grml-hwinfo, grml-saveconfig, pptp-linux, flite, wmii, mutt | mutt-ng, slrn, grml-docs, grml-autoconfig (>= 0.5-10), lzop
+Suggests: ruby, python, grml-x, ipcalc, hwinfo, antiword, grml-etc, grml-rebuildfstab, grml-scanpartitions, grml-files, grml-hwinfo, grml-saveconfig, pptp-linux, flite, wmii, mutt | mutt-ng, slrn, grml-docs, grml-autoconfig (>= 0.6.9), lzop
 Conflicts: scanmodem, grml-etc-core (<< 0.1-30)
 Description: some small scripts which should make life easier
  Some scripts which should make life easier. For example:
diff --git a/usr_sbin/grml-setlang b/usr_sbin/grml-setlang
index c74447b..3efda81 100755
--- a/usr_sbin/grml-setlang
+++ b/usr_sbin/grml-setlang
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Mit Okt 04 11:54:45 CEST 2006 [mika]
+# Latest change: Sam Dez 16 18:20:42 CET 2006 [mika]
 ################################################################################
 
 PN="$(basename $0)"
@@ -78,71 +78,73 @@ which locales should be generated by locale-gen)
 please run 'dpkg-reconfigure locale' manually.
 
 Configuration will be written to $CONFFILE" 0 0 0 \
- at austrian off \
- at-utf8 'austria (unicode version)' off \
- au australian off \
- au-utf8 'austrial (unicode version)' off \
- be belgian off \
- be-utf8 'belgian (unicode version)' off \
- bg bulgarian off \
- bg-utf8 'bulgarian (unicode version)' off \
- br brazilian off \
- br-utf8 'brazilian (unicode version)' off \
- ch swiss off \
- ch-utf8 'swiss (unicode version)' off \
+ at 'austria (unicode version)' off \
+ at-iso 'austrian (iso version)' off \
+ au 'austrial (unicode version)' off \
+ au-iso 'australian (iso version)' off \
+ be 'belgian (unicode version)' off \
+ be-iso 'belgian (iso version)' off \
+ bg 'bulgarian (unicode version)' off \
+ bg-iso 'bulgarian (iso version)' off \
+ br 'brazilian (unicode version)' off \
+ br-iso 'brazilian (iso version)' off \
+ ch 'swiss (unicode version)' off \
+ ch-iso 'swiss (iso version)' off \
  cf 'french canadian' off \
- cn chinese off \
- cn-utf8 'chinese (unicode version)' off \
- cs czech off \
- cs-utf8 'czech (unicode version)' off \
- cz czech off \
- cz-utf8 'czech (unicode version)' off \
- de german off \
- de-utf8 'german (unicode version)' off \
- dk dansk off \
- dk-utf8 'dansk (unicode version)' off \
- da dansk off \
- da-utf8 'dansk (unicode version)' off \
- el greek off \
- el-utf8 'greek (unicode version)' off \
- en 'english [us] (default)' on \
- es spanish off \
- es-utf8 'spanish (unicode version)' off \
- fi finnish off \
- fi-utf8 'finnish (unicode version)' off \
- fr frensh off \
- fr-utf8 'frensh (unicode version)' off \
- ga 'irish gaeilge' off \
- ga-utf8 'irish gaeilge (unicode version)' off \
- he hebrew off \
- he-utf8 'hebrew (unicode version)' off \
- il hebrew off \
- il-utf8 'hebrew (unicode version)' off \
- ie irish off \
- ie-utf8 'irish (unicode version)' off \
- it italian off \
- it-utf8 'italian (unicode version)' off \
- ja japanese off \
- ja-utf8 'japanese (unicode version)' off \
- nl dutch off \
- nl-utf8 'dutch (unicode version)' off \
- pl off polish \
- pl-utf8 'polish (unicode version)' off \
- pt portuguese off \
- pt-utf8 'portuguese (unicode version)' off \
- ru russian off \
- ru-utf8 'russian (unicode version)' off \
- sk slovak off \
- sk-utf8 'slovak (unicode version)' off \
- sl slovenian off \
- sl-utf8 'slovenian (unicode version)' off \
- tr turkish off \
- tr-utf8 'turkish (unicode version)' off \
- tw 'chinese (traditional)' off \
- tw-utf8 'chinese (traditional) (unicode version)' off \
- uk british off \
- uk-utf8 'british (unicode version)' off \
- us-utf8 'american (unicode version)' off \
+ cn 'chinese (unicode version)' off \
+ cn-iso 'chinese (iso version)' off \
+ cs 'czech (unicode version)' off \
+ cs-iso 'czech (iso version)' off \
+ cz 'czech (unicode version)' off \
+ cz-iso 'czech (iso version)' off \
+ de 'german (unicode version)' off \
+ de-iso 'german (iso version)' off \
+ dk 'dansk (unicode version)' off \
+ dk-iso 'dansk (iso version)' off \
+ da 'dansk (unicode version)' off \
+ da-iso 'dansk (iso version)' off \
+ el 'greek (unicode version)' off \
+ el-iso 'greek (iso version)' off \
+ en 'english [us] (unicode version, grml default)' on \
+ en-iso 'english [us] (iso version)' off \
+ es 'spanish (unicode version)' off \
+ es-iso 'spanish (iso version)' off \
+ fi 'finnish (unicode version)' off \
+ fi-iso 'finnish (iso version)' off \
+ fr 'frensh (unicode version)' off \
+ fr-iso 'frensh (iso version)' off \
+ ga 'irish gaeilge (unicode version)' off \
+ ga-iso 'irish gaeilge (iso version)' off \
+ he 'hebrew (unicode version)' off \
+ he-iso 'hebrew (iso version)' off \
+ il 'hebrew (unicode version)' off \
+ il-iso 'hebrew (iso version)' off \
+ ie 'irish (unicode version)' off \
+ ie-iso 'irish (iso version)' off \
+ it 'italian (unicode version)' off \
+ it-iso 'italian (iso version)' off \
+ ja 'japanese (unicode version)' off \
+ ja-iso 'japanese (iso version)' off \
+ nl 'dutch (unicode version)' off \
+ nl-iso 'dutch (iso version)' off \
+ pl 'polish (unicode version)' off \
+ pl-iso 'polisch (iso version)' off \
+ pt 'portuguese (unicode version)' off \
+ pt-iso 'portuguese (iso version)' off \
+ ru 'russian (unicode version)' off \
+ ru-iso 'russian (iso version)' off \
+ sk 'slovak (unicode version)' off \
+ sk-iso 'slovak (iso version)' off \
+ sl 'slovenian (unicode version)' off \
+ sl-iso 'slovenian (iso version)' off \
+ tr 'turkish (unicode version)' off \
+ tr-iso 'turkish (iso version)' off \
+ tw 'chinese (traditional) (unicode version)' off \
+ tw-iso 'chinese (traditional) (iso version)' off \
+ uk 'british (unicode version)' off \
+ uk-iso 'british (iso version)' off \
+ us 'american (unicode version)' off \
+ us-iso 'american (iso version)' off \
 )
 
   retval=$?
-- 
2.1.4