Merge remote-tracking branch 'upstream/master'

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

Conflicts:
	backend/initramfs-tools/live.hook
	components/0020-read-only
	components/9990-aaa-fixme.sh
	components/9990-cmdline-old
	debian/changelog

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
index 2ef7946,c0382ab..29fe1fb
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,17 +1,33 @@@
+ live-boot (1:20160511) unstable; urgency=medium
+ 
+   * Team upload.
+   * Update build system to rely on "dpkg-parsechangelog -S Version" instead
+     of outdated VERSION file.
+   * No longer modify PATH to point to /root and thus stop using executables
+     from /root. Closes: #823069
+   * Drop debian/source/local-options as the only option it contained was
+     not applicable to 3.0 (native) source format.
+   * Drop debian/source/options and dh_builddeb override as XZ compression is
+     the default now.
+ 
+  -- Raphaël Hertzog <hertzog@debian.org>  Wed, 11 May 2016 11:40:37 +0200
+ 
 +live-boot (1:20151213+grml.1) unstable; urgency=medium
 +
 +  [ Evgeni Golov ]
 +  * Merge latest Debian changes.
 +  * [aea94ce] add gbp.conf
 +  * [9f0266a] fix "unexpected operator" error when stopping live-boot
 +  * [83abdd6] Revert "restore support for old persistence media"
 +  * [09d8468] remove debian/patches
 +  * [0c43d97] make package native as in Debian
 +  * [1a226f4] Revert "use auto instead of allow-hotplug in generated /e/n/interfaces"
 +
 +  [ Riccardo Murri ]
 +  * [3f6c7f2] Allow selecting boot eth dev by MAC address
 +
 + -- Evgeni Golov <evgeni@grml.org>  Thu, 07 Jan 2016 08:47:27 +0100
 +
  live-boot (1:20151213) unstable; urgency=medium
  
    [ Iain R. Learmonth ]

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 .'