From: Ulrich Dangel <uli@spamt.net>
Date: Wed, 4 Nov 2009 10:10:04 +0000 (+0100)
Subject: Increased version number and updated changelog.
X-Git-Tag: v0.9.18~1
X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=commitdiff_plain;h=4bf11c554938c67e8f502300f7acb0f34fa13166

Increased version number and updated changelog.
---

diff --git a/debian/changelog b/debian/changelog
index edc8bd5..07d404b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+grml2usb (0.9.18) UNRELEASED; urgency=low
+
+  * Also set GRML_DEFAULT when running with --dry-run. Thanks to Moritz
+    Augsburger for the bug report.
+  * Make sure that --grub-mbr requires --grub. Thanks to Moritz
+    Augsburger and mika for the bug report.
+
+ -- Ulrich Dangel <mru@grml.org>  Wed, 04 Nov 2009 11:09:02 +0100
+
 grml2usb (0.9.17) unstable; urgency=low
 
   [ Michael Prokop ]
diff --git a/grml2usb b/grml2usb
index 05d3b38..752e2b5 100755
--- a/grml2usb
+++ b/grml2usb
@@ -20,7 +20,7 @@ import fileinput
 import glob
 
 # global variables
-PROG_VERSION = "0.9.17"
+PROG_VERSION = "0.9.18-pre1"
 MOUNTED = set()  # register mountpoints
 TMPFILES = set() # register tmpfiles
 DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier for syslinux.cfg