Merge branch 'debian-next' into master-next

Conflicts:
	debian/changelog

diff --cc debian/changelog
index 9464591,233cca9..cdf691c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,50 +1,60 @@@
+ live-boot (3.0.0-1) unstable; urgency=low
+ 
+   [ Daniel Baumann ]
+   * Updating manpage year handling for 2013.
+ 
+   [ Richard Nelson ]
+   * Replace noprompt with noeject on manpage.
+ 
+   [ Daniel Baumann ]
+   * Updating noeject description in manpage.
+ 
+   [ chals ]
+   * Updating Spanish translation in respect to noeject.
+ 
+   [ Daniel Baumann ]
+   * Dropping dpkg compression level.
+   * Calling df with -P to avoid line wraps with overly long mountpoints.
+ 
+   [ Tails developers ]
+   * Improving test for /etc/fstab.d support by testing for its existence
+     instead of /run's one.
+ 
+   [ Daniel Baumann ]
+   * Removing some dead code in netbase parts.
+ 
+   [ Gaudenz Steinlin ]
+   * Fixing support for multiple squashfs images (Closes: #696494).
+   * Fixing mounting of rootfs, cow and medium filesystems (Closes:
+     #696495).
+ 
+   [ Daniel Baumann ]
+   * Correcting persistence-label handling fwrt/ legacy live-boot 2.x
+     support, thanks to Mike Gach <gach.mqt@gmail.com> (Closes: #697873).
+ 
+  -- Daniel Baumann <daniel@debian.org>  Tue, 12 Feb 2013 08:23:17 +0100
+ 
+ live-boot (3.0~b11-1) unstable; urgency=low
+ 
+   * Updating year in copyright file.
+   * Supporting legacy filenames for checksums in debian within verify-
+     checksums.
+   * Correcting legacy filename for checksum files.
+   * By default including sha256sum only in progress-linux, keep md5sum
+     legacy for debian.
+ 
+  -- Daniel Baumann <daniel@debian.org>  Wed, 02 Jan 2013 11:32:21 +0100
+ 
 +live-boot (3.0~b10-1+grml.1) unstable; urgency=low
 +
 +  [ Evgeni Golov ]
 +  * [795263e] refresh 29_support_dns_in_initramfs.patch against
 +    current upstream
 +  * [2045fef] drop 43_do_not_fix_mountpoints_with_live-persistence.patch,
 +    applied upstream
 +
 + -- Michael Prokop <mika@grml.org>  Tue, 18 Dec 2012 01:41:16 +0100
 +
  live-boot (3.0~b10-1) unstable; urgency=low
  
    [ Daniel Baumann ]

diff --cc debian/rules
index 65404fe,ba9bb63..916ea28
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -15,17 -11,11 +15,17 @@@ override_dh_auto_install
        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 -z9
+       dh_builddeb -- -Zxz
  
  override_dh_install:
        dh_install --fail-missing