Merge debian/changelog

[grml-scripts-core.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index e7ecb29..8caf1f6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+grml-scripts (1.1.18) UNRELEASED; urgency=low
+
+  * Add lzop to Depends. [Closes: issue613]
+  * blacklist: use /etc/modprobe.d/grml.conf instead of
+    /etc/modprobe.d/grml. New module-init-tools will
+    use only files using the .conf suffix.
+  * Add new script grml-exec-wrapper.
+
+ -- Michael Prokop <mika@grml.org>  Tue, 03 Mar 2009 10:35:12 +0100
+
 grml-scripts (1.1.17) unstable; urgency=low
 
   [ Ulrich Dangel ]
@@ -7,7 +17,11 @@ grml-scripts (1.1.17) unstable; urgency=low
     osd_server.py depends on them.
     [Closes: issue172]
 
- -- Michael Prokop <mika@grml.org>  Thu, 12 Feb 2009 19:26:04 +0100
+  [ Michael Prokop ]
+  * Adjust Makefile to get rid of '.sp' sequences in asciidoc
+    manpages. [Closes: issue567]
+
+ -- Michael Prokop <mika@grml.org>  Thu, 12 Feb 2009 20:49:56 +0100
 
 grml-scripts (1.1.16) unstable; urgency=low