From: Michael Prokop <devnull@localhost>
Date: Mon, 15 Oct 2007 17:04:04 +0000 (+0200)
Subject: Merge branches
X-Git-Tag: 0.0.5~4
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=5e15575ecc8def9071b2aeae3c201db5d8e622e4;hp=cb199c185207f47f5be48b3119d05965207fb6a3

Merge branches
---

diff --git a/debian/changelog b/debian/changelog
index 7ddcbb5..69483ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,10 @@ grml-live (0.0.5) unstable; urgency=low
     This has been integrated in a new class named "RELEASE".
   * Added support for new kernel version 2.6.23-grml to
     GRML_FULL.
+  * Use uxterm as x-terminal-emulator and fall back to xterm
+    only it uxterm is not available.
+  * Support /etc/locale.gen.grml - it's used by default in
+    class GRML_FULL and a new class named LOCALES.
   * New class SID - /etc/grml/fai/config/package_config/SID:
     - this class is used for packages that are known to cause
       problems with Debian/etch but work with Debian/sid
diff --git a/etc/grml/fai/config/scripts/GRMLBASE/25-locales b/etc/grml/fai/config/scripts/GRMLBASE/25-locales
index c774164..58f080d 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/25-locales
+++ b/etc/grml/fai/config/scripts/GRMLBASE/25-locales
@@ -4,14 +4,21 @@
 # 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 or any later version.
-# Latest change: Tue Sep 18 19:46:58 CEST 2007 [mika]
+# Latest change: Mon Oct 15 19:00:15 CEST 2007 [mika]
 ################################################################################
 
 set -u
 set -e
 
-# FIXME: replace it with /etc/locale.gen.grml finally!
-cp $target/etc/locale.gen.minimal $target/etc/locale.gen
+# use full locales setup only in classes GRML_FULL and LOCALES
+if ifclass GRML_FULL || ifclass LOCALES ; then
+   echo 'Using /etc/locale.gen.grml for locales generation'
+   cp $target/etc/locale.gen.grml $target/etc/locale.gen
+else
+   echo 'Using /etc/locale.gen.minimal for locales generation'
+   cp $target/etc/locale.gen.minimal $target/etc/locale.gen
+fi
+
 $ROOTCMD locale-gen
 
 ## END OF FILE #################################################################
diff --git a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
index 977c5db..91a608f 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
+++ b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
@@ -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 or any later version.
-# Latest change: Sat Oct 06 13:04:13 CEST 2007 [mika]
+# Latest change: Mon Oct 15 18:57:56 CEST 2007 [mika]
 ################################################################################
 
 set -u
@@ -14,7 +14,9 @@ if [ -r $target/usr/bin/vim.basic ] ; then
    $ROOTCMD update-alternatives --set editor /usr/bin/vim.basic
 fi
 
-if [ -r $target/usr/bin/xterm ] ; then
+if [ -r $target/usr/bin/uxterm ] ; then
+   $ROOTCMD update-alternatives --set x-terminal-emulator /usr/bin/uxterm
+elif [ -r $target/usr/bin/xterm ] ; then
    $ROOTCMD update-alternatives --set x-terminal-emulator /usr/bin/xterm
 fi