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

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

diff --git a/debian/changelog b/debian/changelog
index 58e1fc2..94556c7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,22 @@
-grml-scripts (1.4.1+nmu1) UNRELEASED; urgency=low
+grml-scripts (1.4.3+nmu1) UNRELEASED; urgency=low
 
   * Split grml-scripts into grml-scripts and grml-scripts-core (NMU).
 
  -- 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/debian/control b/debian/control
index 09f05d4..2e69aec 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,8 @@ Vcs-Browser: http://git.grml.org/?p=grml-scripts.git
 
 Package: grml-scripts
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, less, dialog, perl, zsh, dash, links | w3m | links2, screen, grml-network, grml-etc-core, libterm-readkey-perl, lzop, lockfile-progs, grml-scripts-core (>= 1.4.1)
-Suggests: ruby, python, grml-x, ipcalc, hwinfo, antiword, grml-etc, grml-rebuildfstab, grml-files, grml-hwinfo, pptp-linux, flite, wmii, mutt, slrn, grml-docs, grml-autoconfig (>= 0.6.9), dirvish, sudo, idesk, xlockmore, python-dbus, notification-daemon, grml-quickconfig, libwebservice-google-suggest-perl
+Depends: ${shlibs:Depends}, ${misc:Depends}, less, dialog, perl, zsh, dash, links | w3m | links2, screen, grml-network, grml-etc-core, libterm-readkey-perl, lockfile-progs, grml-scripts-core
+Suggests: ruby, python, grml-x, ipcalc, hwinfo, antiword, grml-etc, grml-rebuildfstab, grml-files, grml-hwinfo, pptp-linux, flite, wmii, mutt, slrn, grml-docs, grml-autoconfig (>= 0.6.9), dirvish, sudo, idesk, xlockmore, python-dbus, notification-daemon, grml-quickconfig, libwebservice-google-suggest-perl, 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.

diff --git a/usr_bin/grml-init-screen b/usr_bin/grml-init-screen
index 183df63..20587d8 100755 (executable)
--- a/usr_bin/grml-init-screen
+++ b/usr_bin/grml-init-screen
@@ -17,7 +17,6 @@
 # now start screen:
   cd $HOME
   # do we have a utf8 enabled terminal?
-  [ -x /usr/bin/vt-is-UTF8 ] && /usr/bin/vt-is-UTF8 -q && UTF='-U'
-  /usr/bin/screen $UTF -c /etc/grml/screenrc ; exec /bin/zsh
+  /usr/bin/screen -U -c /etc/grml/screenrc ; exec /bin/zsh
 
 ## END OF FILE #################################################################