X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fchangelog;h=59df2c074b357c55fca6b845c26303d151177b22;hb=fdf285d157bf1558728e0b6b6bea3b4f78a7b108;hp=8092959d4ffac96aead2398fecb993d5a887c236;hpb=a6e250845a22f7b54e2936a64e98430ed3c79194;p=live-boot-grml.git

diff --git a/debian/changelog b/debian/changelog
index 8092959..59df2c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,53 @@
+live-boot (4.0~alpha21-1+grml.1) UNRELEASED; urgency=medium
+
+  * Import 4.0~alpha21 from Debian.
+
+ -- Evgeni Golov <evgeni@grml.org>  Thu, 10 Apr 2014 08:29:49 +0200
+
+live-boot (4.0~alpha21-1) unstable; urgency=low
+
+  * Building with dh --parallel.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 31 Mar 2014 21:55:30 +0200
+
+live-boot (4.0~alpha20-1) unstable; urgency=low
+
+  [ Trent W. Buck ]
+  * Fix cut-and-paste typo verify-checksums -> panic.
+
+  [ Evgeni Golov ]
+  * Properly check if $rc_server1 is not "0.0.0.0".
+  * Supporting resolvconf in the squashfs.
+  * Do not throw warnings when /tmp/custom_mounts.list does not exist.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Mon, 31 Mar 2014 21:38:22 +0200
+
+live-boot (4.0~alpha19-1+grml.3) unstable; urgency=medium
+
+  * [8acc928] try to be smarter when booting a squashfs image from
+              the network and using resolvconf in it.
+
+ -- Evgeni Golov <evgeni@grml.org>  Tue, 25 Mar 2014 17:49:22 +0100
+
+live-boot (4.0~alpha19-1+grml.2) unstable; urgency=medium
+
+  * [805c218] VLAN support via boot option "vlan=<vid>:<phydevice>"
+
+ -- Michael Prokop <mika@grml.org>  Mon, 17 Mar 2014 23:43:24 +0100
+
+live-boot (4.0~alpha19-1+grml.1) unstable; urgency=medium
+
+  * Sync Debian's 4.0~alpha19-1.
+  * update our patches on top of Debian's 4.0~alpha19
+    Droped patches:
+     - 43_fix_udev_usage_in_is_nice_device.patch
+     - 44_fix_mdadm_usage_for_findiso.patch
+  * move Grml-specific patches to a separate subfolder
+  * move reverts/restores of old upstream behaviour to an own subdir
+  * consolidate Grml network related patches into 15_networking_grml.patch
+
+ -- Evgeni Golov <evgeni@grml.org>  Sat, 08 Mar 2014 13:59:28 +0100
+
 live-boot (4.0~alpha19-1) experimental; urgency=low
 
   * Updating copyright notices for 2014.