Merge branches

[grml-live.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index c3e65cd..2319eee 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-grml-live (0.0.15) unstable; urgency=low
+grml-live (0.1) unstable; urgency=low
 
+  * Bump version number to 0.1 as we ship grml-live with the
+    upcoming stable versions.
   * Use /usr/bin/vim.tiny as alternativ for vi.
   * Add new packages to GRML_FULL:
     - at76-usb-modules-2.6.23-grml64
@@ -20,7 +22,7 @@ grml-live (0.0.15) unstable; urgency=low
   * /etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot:
     remove packages via dpkg instead of apt-get. Thanks for the
     bugreport and the patch, Lupe Christoph! [Closes: issue367]
-  * Add SQUASHFS_ZLIB template to grml-live.conf.
+  * Use -no-progress option for mksquashfs only if it's supported.
 
  -- Michael Prokop <mika@grml.org>  Fri, 11 Jan 2008 01:56:01 +0100