Merge remote-tracking branch 'upstream/master'

git://anonscm.debian.org/debian-live/live-boot.git

Conflicts:
	components/9990-aaa-fixme.sh

diff --cc backend/initramfs-tools/live.hook
Simple merge

diff --cc components/9990-cmdline-old
Simple merge

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

diff --cc debian/changelog
Simple merge

diff --cc debian/rules
index 1d71477,0ed4818..c7f8b71
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -11,24 -7,11 +11,21 @@@ override_dh_auto_install
        dh_auto_install -- DESTDIR=debian/tmp
  
        # Removing useless files
 -      rm -f debian/tmp/usr/share/doc/live-boot/COPYING
 +      rm -f debian/tmp/usr/share/doc/live-boot-grml/COPYING
 +      rm -f debian/lib/live/boot/FIXME
  
        # live-boot-initramfs-tools
 -      mkdir -p debian/live-boot-initramfs-tools/usr/share
 -      mv debian/tmp/usr/share/initramfs-tools debian/live-boot-initramfs-tools/usr/share
 +      mkdir -p debian/live-boot-grml-initramfs-tools/usr/share
 +      mv debian/tmp/usr/share/initramfs-tools debian/live-boot-grml-initramfs-tools/usr/share
 +
 +      # this is needed because dpatch doesn't do file modes on diffs
 +      # and we can't execute this fix during build stage as new files
 +      # might be installed during dh_quilt_patch
 +      chmod a+rx debian/live-boot-grml-initramfs-tools/usr/share/initramfs-tools/scripts/*
 +      chmod a+rx debian/live-boot-grml-initramfs-tools/usr/share/initramfs-tools/hooks/*
  
- override_dh_builddeb:
-       dh_builddeb -- -Zxz
- 
  override_dh_install:
        dh_install --fail-missing
 +
 +override_dh_installinit:
 +      dh_installinit -p live-boot-grml --no-restart-on-upgrade --no-start --update-rcd-params='start 89 0 6 .'