Merge branch 'debian'

diff --cc components/9990-misc-helpers.sh
Simple merge

diff --cc components/9990-netbase.sh
Simple merge

diff --cc components/9990-overlay.sh
Simple merge

diff --cc debian/changelog
index f34913f,21436cb..e2735dc
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,18 +1,39 @@@
+ live-boot (5.0~a5-1) unstable; urgency=low
+ 
+   [ Richard Nelson ]
+   * Adjusting whitespace to tabs on components/9990-overlay.sh
+   * Adjusting whitespace to tabs on components/9990-misc-helpers.sh
+   * Adjusting whitespace to tabs on components/9990-mount-http.sh
+ 
+   [ Daniel Baumann ]
+   * Wrap and sort debian control file.
+ 
+   [ Steven Shiau ]
+   * Support predictable network interface names.
+ 
+  -- Daniel Baumann <mail@daniel-baumann.ch>  Sun, 23 Aug 2015 10:55:32 +0200
+ 
 +live-boot (5.0~a4-1+grml.1) unstable; urgency=medium
 +
 +  [ Evgeni Golov ]
 +  * Import 5.0~a4-1 from Debian.
 +  * [3a7cc5f] drop stop-using-etc-fstab.d.patch, applied upstream
 +  * [ee5831d] Drop genext2fs from Depends, live-snapshot is long gone
 +  * [8e37c83] update 15_networking_grml.patch against live-boot 5.0
 +  * [600ec8b] do not run dh with quilt, we have source format 3.0
 +  * [26c670d] drop patches, we have everything in git now
 +  * [5f1c62a] create a single debian patch :/
 +  * [214cc03] use auto instead of allow-hotplug in generated /e/n/interfaces
 +    (Closes: issue1568)
 +  * [6795067] backport Allow-selecting-boot-eth-dev-by-MAC-address.patch
 +    from upstream
 +
 +  [ Laurens Vanderhoven ]
 +  * [5eb34d4] Allow +2 nameserver entries for dns= boot option
 +    (Closes: issue1234)
 +
 + -- Evgeni Golov <evgeni@grml.org>  Tue, 18 Aug 2015 14:14:10 +0200
 +
  live-boot (5.0~a4-1) unstable; urgency=low
  
    [ Tails developers ]

diff --cc debian/control
index 7cc9d87,655c5e7..378a61e
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -1,50 -1,46 +1,51 @@@
  Source: live-boot
  Section: misc
  Priority: optional
 -Maintainer: Live Systems Maintainers <debian-live@lists.debian.org>
 -Uploaders:
 - Daniel Baumann <mail@daniel-baumann.ch>,
 -Build-Depends:
 - debhelper (>= 9),
 +Maintainer: Grml Team <team@grml.org>
 +Build-Depends: debhelper (>= 9), quilt (>= 0.46-7~)
  Standards-Version: 3.9.6
 -Homepage: http://live-systems.org/devel/live-boot/
 -Vcs-Browser: http://live-systems.org/gitweb/?p=live-boot.git
 -Vcs-Git: git://live-systems.org/git/live-boot.git
 +Homepage: http://live.debian.net/devel/live-boot/
 +Vcs-Browser: http://git.grml.org/?p=live-boot-grml.git
 +Vcs-Git: git://git.grml.org/live-boot-grml.git
 +Origin: Grml
 +Bugs: mailto:bugs@grml.org
  
 -Package: live-boot
 +Package: live-boot-grml
  Architecture: all
  Depends:
-  ${misc:Depends},
 - live-boot-initramfs-tools | live-boot-backend,
 + live-boot-grml-initramfs-tools | live-boot-backend,
+  ${misc:Depends},
  Recommends:
 - live-boot-doc,
 + live-boot-grml-doc,
   live-tools,
 + eject,
 + file,
   rsync,
   uuid-runtime,
  Suggests:
-  curlftpfs,
   cryptsetup,
+  curlftpfs,
   httpfs2,
   wget,
 +Conflicts: live-boot
 +Replaces: live-boot
 +Provides: live-boot
  Description: Live System Boot Components
 - The Live Systems project maintains the components to build Debian based Live
 - systems and the official Debian Live images themselves.
 - .
   live-boot contains the components to configure a live system during the boot
   process (early userspace).
   .
   In addition to live-boot, a backend for the initrd generation is required, such
   as live-boot-initramfs-tools.
 + .
 + Please notice that this package is maintained by the grml.org team.
 + This is NOT a fork of Debian's live-boot, it's just a customized
 + version to better fit Grml's needs.
  
 -Package: live-boot-doc
 +Package: live-boot-grml-doc
  Section: doc
  Architecture: all
- Depends: ${misc:Depends}
+ Depends:
+  ${misc:Depends},
  Description: Live System Boot Components (documentation)
   The Live Systems project maintains the components to build Debian based Live
   systems and the official Debian Live images themselves.
@@@ -53,15 -49,10 +54,14 @@@
   process (early userspace).
   .
   This package contains the documentation.
 + .
 + Please notice that this package is maintained by the grml.org team.
 + This is NOT a fork of Debian's live-boot, it's just a customized
 + version to better fit Grml's needs.
  
 -Package: live-boot-initramfs-tools
 +Package: live-boot-grml-initramfs-tools
  Architecture: all
  Depends:
-  ${misc:Depends},
   busybox | busybox-initramfs,
   initramfs-tools,
   udev,