X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fchangelog;h=ef101f77a7ea5620b27c284b6a3673c28d8234b4;hb=refs%2Ftags%2Fv4.0_alpha19-1%2Bgrml.2;hp=e05323e9fa43b0103ddcf4f546fc68c254156376;hpb=20f7af935a25294ceac8b39ed01c0ac61a1915c1;p=live-boot-grml.git

diff --git a/debian/changelog b/debian/changelog
index e05323e..ef101f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,19 @@
+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