Adding debian version 4.0~a1-1.

VERSION

@@ -1 +1 @@
-3.0.1-1
+4.0~a1-1

backends/initramfs-tools/live.hook

@@ -143,19 +143,11 @@ then
 	copy_exec /usr/bin/eject /bin
 fi
 
-# Program: mount
-# fuse does not work with klibc mount
-copy_exec /bin/mount /bin/mount.util-linux
-
 [ "${QUIET}" ] || echo -n " utils"
 
 # Feature: Verify Checksums
-if [ -e /etc/progress-linux_version ]
-then
-	copy_exec /usr/bin/sha256sum /bin
-else
-	copy_exec /usr/bin/md5sum /bin
-fi
+copy_exec /usr/bin/sha256sum /bin
+copy_exec /usr/bin/md5sum /bin
 
 # Program: memdisk
 if [ -x /usr/bin/memdiskfind ]
@@ -244,4 +236,14 @@ case "${LIVE_DNS}" in
 		;;
 esac
 
+case "${LIVE_UNIONMOUNT}" in
+	true)
+		[ "${QUIET}" ] || echo -n " unionmount"
+
+		# UnionMount
+		# only mount from patched util-linux can do this currently
+		copy_exec /bin/mount /bin/mount_full
+		;;
+esac
+
 [ "${QUIET}" ] || echo .

debian/changelog

@@ -1,94 +1,8 @@
-live-boot (3.0.1-1) unstable; urgency=low
+live-boot (4.0~a1-1) experimental; urgency=low
 
-  [ chals ]
-  * Updating Spanish translation of live-boot man page, persistence-label.
-
-  [ Daniel Baumann ]
-  * Dropping German manpage translations stubs for the release.
-
- -- Daniel Baumann <daniel@debian.org>  Thu, 14 Feb 2013 19:33:17 +0100
-
-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) unstable; urgency=low
-
-  [ Daniel Baumann ]
-  * Adding live-tools to recommends.
-
-  [ Michal Suchanek ]
-  * Including util-linux mount in initramfs.
-
-  [ Daniel Baumann ]
-  * Making overwriting of /bin/mount within initramfs with mount.util-
-    linux dependent on fuse usage, not on some additional boot parameter.
-  * Correcting spelling typo in bug script.
-
-  [ Richard Nelson ]
-  * Update manpage information of ip= param to correctly reflect what
-    9990-netbase.sh expects.
-
-  [ Daniel Baumann ]
-  * Cleaning up manpage po files.
-
-  [ Evgeni Golov ]
-  * Do not fix mountpoints with live-persistence.conf as home-rw/live-rw.
-
- -- Daniel Baumann <daniel@debian.org>  Mon, 17 Dec 2012 20:22:50 +0100
-
-live-boot (3.0~b9-1) unstable; urgency=low
-
-  [ Tails developers ]
-  * Making the /live to /lib/live move for the persistence code.
-  * Handling already mounted persistence backing media correctly.
-  * Fixing persistence-media option when no devices are attached.
-  * Using 'local' in a safe way.
+  * Dropping specifics for squeeze based distributions.
 
- -- Daniel Baumann <daniel@debian.org>  Mon, 10 Dec 2012 20:01:21 +0100
+ -- Daniel Baumann <daniel@debian.org>  Fri, 30 Nov 2012 14:58:46 +0100
 
 live-boot (3.0~b8-1) unstable; urgency=low
 

debian/control

@@ -12,7 +12,7 @@ Vcs-Git: git://live.debian.net/git/live-boot.git
 Package: live-boot
 Architecture: all
 Depends: ${misc:Depends}, live-boot-initramfs-tools | live-boot-backend
-Recommends: live-boot-doc, live-tools, rsync, uuid-runtime
+Recommends: live-boot-doc, rsync, uuid-runtime
 Suggests: curlftpfs, cryptsetup, httpfs2, unionfs-fuse, wget
 Description: Live System Boot Scripts
  live-boot contains the scripts that configure a live system during the boot
@@ -25,8 +25,6 @@ Package: live-boot-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: live-boot (<< 3.0~a18~)
-Replaces: live-boot
 Description: Live System Boot Scripts (documentation)
  live-boot contains the scripts that configure a live system during the boot
  process (early userspace).

debian/copyright

@@ -4,7 +4,7 @@ Upstream-Contact: Debian Live Project <debian-live@lists.debian.org>
 Source: http://live.debian.net/archive/packages/live-boot/
 
 Files: *
-Copyright: 2006-2013 Daniel Baumann <daniel@debian.org>
+Copyright: 2006-2012 Daniel Baumann <daniel@debian.org>
            2005-2008 Canonical Ltd. <http://www.cannonical.com/>
            2008 Chris Lamb <chris@debian.org>
            2006-2007 Marco Amadori <marco.amadori@gmail.com>

debian/live-boot.bug-presubj

@@ -1,9 +1,9 @@
 Before submitting a bug report against live-boot, please make sure
-that you have read our guidelines for Debian Live bug reports:
+that you have read our guidlines for Debian Live bug reports:
 
   http://live.debian.net/manual/
 
-By providing the required information as outlined in the guidelines makes
+By providing the required information as outlined in the guidlines makes
 sure that we can optimally reproduce and fix bugs, not doing so wastes a
 lot of time for both the maintainers and the submitters.
 

debian/rules

@@ -15,7 +15,7 @@ override_dh_auto_install:
 	mv debian/tmp/usr/share/initramfs-tools debian/live-boot-initramfs-tools/usr/share
 
 override_dh_builddeb:
-	dh_builddeb -- -Zxz
+	dh_builddeb -- -Zxz -z9
 
 override_dh_install:
 	dh_install --fail-missing

debian/source/options

@@ -1 +1,2 @@
 compression = xz
+compression-level = 9

manpages/bin/update-version.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-boot(7) - System Boot Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
@@ -35,9 +35,7 @@ do
 	then
 		for _FILE in po/${_LANGUAGE}/*.po
 		do
-			sed -i  -e "s|^msgstr .*.2013-.*$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" \
-				-e "s|^msgstr .*.2013\"$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" \
-			"${_FILE}"
+			sed -i -e "s|^msgstr .*.2012\"$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" "${_FILE}"
 		done
 	fi
 done
@@ -47,8 +45,6 @@ if ls po/pt_BR/*.po > /dev/null 2>&1
 then
 	for _FILE in po/pt_BR/*.po
 	do
-		sed -i  -e "s|^msgstr .*.2013-.*$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" \
-			-e "s|^msgstr .*-2013\"$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" \
-		"${_FILE}"
+		sed -i -e "s|^msgstr .*-2012\"$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" "${_FILE}"
 	done
 fi