Merge remote branch 'grml-scripts-split/split/grml-scripts-core'

Conflicts:
	debian/changelog
	debian/control
	usr_bin/grml-init-screen

diff --git a/TODO b/TODO
new file mode 100644 (file)
index 0000000..1333ed7
--- /dev/null
+++ b/TODO
@@ -0,0 +1 @@
+TODO

diff --git a/debian/changelog b/debian/changelog
index 9c94a5d..e456675 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,19 @@ grml-scripts-core (1.4.1+nmu1) UNRELEASED; urgency=low
 
  -- Sebastian Boehm <sebastian@sometimesfood.org>  Mon, 20 Dec 2010 23:49:48 +0100
 
+grml-scripts (1.4.2) unstable; urgency=low
+
+  * [68e8f65] grml-screen/grml-init-screen: no longer use vt-is-UTF8 but
+    instead default to UTF-8. [Closes: issue959]
+
+ -- Michael Prokop <mika@grml.org>  Mon, 28 Feb 2011 12:31:27 +0100
+
+grml-scripts (1.4.1) unstable; urgency=low
+
+  * [198fea7] Move lzop from Depends to Suggests.
+
+ -- Michael Prokop <mika@grml.org>  Mon, 21 Feb 2011 13:26:13 +0100
+
 grml-scripts (1.4.0) unstable; urgency=low
 
   [ Michael Prokop ]

diff --git a/usr_bin/grml-screen b/usr_bin/grml-screen
index a33131a..ddc1a98 100755 (executable)
--- a/usr_bin/grml-screen
+++ b/usr_bin/grml-screen
@@ -59,14 +59,13 @@ fi
 
 # now run screen with config
   cd $HOME     # important for e.g. hardcopy-feature
-  # do we have a utf8 enabled terminal?
-  [ -x /usr/bin/vt-is-UTF8 ] && /usr/bin/vt-is-UTF8 -q && UTF='-U'
+
   if [ `id -u` = 0 ] ; then
-    exec screen $UTF -c /etc/grml/screenrc
+    exec screen -U -c /etc/grml/screenrc
   elif [ -r "$HOME/.screenrc" ] ; then
-    exec screen $UTF -c "$HOME/.screenrc"
+    exec screen -U -c "$HOME/.screenrc"
   else
-    exec screen $UTF -c /etc/grml/screenrc_grml
+    exec screen -U -c /etc/grml/screenrc_grml
   fi
 
 ## END OF FILE #################################################################