From: Ulrich Dangel <mru@grml.org>
Date: Mon, 18 Apr 2011 21:23:59 +0000 (+0200)
Subject: Merge remote branch 'grml-scripts-split/split/grml-scripts'
X-Git-Tag: v1.4.3~6
X-Git-Url: http://git.grml.org/?p=grml-scripts.git;a=commitdiff_plain;h=6ae790e9215b65d8394ef3a379f0bdc48474a6c3

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

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

6ae790e9215b65d8394ef3a379f0bdc48474a6c3
diff --cc debian/changelog
index dee69c0,58e1fc2..94556c7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -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 --cc debian/control
index fb62ce1,09f05d4..2e69aec
--- a/debian/control
+++ b/debian/control
@@@ -11,13 -11,16 +11,16 @@@ Vcs-Browser: http://git.grml.org/?p=grm
  
  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, lockfile-progs
 -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. For example:
-  code2color, grml-mutt, grml-slrn, iimage, lesspipe.sh
-  make_chroot_jail.sh, sepdate.pl, sepdate.rb, sepdate.sh*, wwwis.
+  Some scripts which should make life easier.
+  .
+  While the package grml-scripts-core only contains some core scripts
+  needed by grml-etc-core, this package contains some other scripts in
+  addition, such as: grml-mutt, grml-slrn, iimage, make_chroot_jail.sh,
+  sepdate.pl, sepdate.rb, sepdate.sh*, wwwis.
   .
   Notice: not all the packages which are required in all the scripts
   are in the "Depends:" line. If you want to get a full featured