Merge remote branch 'grml-scripts-split/split/grml-scripts-core'
authorUlrich Dangel <mru@grml.org>
Mon, 18 Apr 2011 20:49:32 +0000 (22:49 +0200)
committerUlrich Dangel <mru@grml.org>
Mon, 18 Apr 2011 20:49:32 +0000 (22:49 +0200)
Conflicts:
debian/changelog
debian/control
usr_bin/grml-init-screen

1  2 
debian/changelog

@@@ -1,16 -1,9 +1,22 @@@
+ grml-scripts-core (1.4.1+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 ]