From: Evgeni Golov <evgeni@golov.de>
Date: Thu, 10 Apr 2014 06:22:53 +0000 (+0200)
Subject: Merge branch 'debian'
X-Git-Tag: v4.0.0-1+grml.1~4
X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=e071847bc4f3b01f1f0f96deea4a6da2d059ef27

Merge branch 'debian'
---

e071847bc4f3b01f1f0f96deea4a6da2d059ef27
diff --cc debian/changelog
index 1d0680f,93f73ed..9251cdc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,29 -1,21 +1,47 @@@
+ 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.
diff --cc debian/rules
index 916ea28,e59fceb..47cb519
--- a/debian/rules
+++ b/debian/rules
@@@ -1,11 -1,7 +1,11 @@@
  #!/usr/bin/make -f
  
 +build:
 +	# regular build.
 +	dh build
 +
  %:
- 	dh ${@} --with quilt
 -	dh ${@} --parallel
++	dh ${@} --with quilt --parallel
  
  override_dh_auto_install:
  	dh_auto_install -- DESTDIR=debian/tmp