Merge branch 'debian': Imported 3.0~b8-1 from Debian Live

Conflicts:
	debian/control

VERSION

@@ -1 +1 @@
-3.0~b6-1
+3.0~b8-1

backends/initramfs-tools/live.hook

@@ -8,7 +8,7 @@ set -e
 
 # Reading configuration file from filesystem and live-media
 for _FILE in /etc/live/boot.conf /etc/live/boot/* \
-	     /lib/live/image/live/boot.conf /lib/live/image/live/boot/*
+	     /lib/live/mount/media/live/boot.conf /lib/live/mount/media/live/boot/*
 do
 	if [ -e "${_FILE}" ]
 	then

debian/changelog

@@ -1,3 +1,32 @@
+live-boot (3.0~b8-1) unstable; urgency=low
+
+  * Removing eject from recommends, the script that ejects the live medium
+    is in live-config these days.
+  * Removing file from recommends, no usage of file in live-boot anymore.
+  * Updating package lists in bug script to match current implementations.
+  * Adding dpkg-source local options.
+
+ -- Daniel Baumann <daniel@debian.org>  Fri, 30 Nov 2012 14:48:16 +0100
+
+live-boot (3.0~b7-1) unstable; urgency=low
+
+  [ Daniel Baumann ]
+  * Updating file paths for /lib/live/mount. See
+    http://lists.debian.org/debian-live/2012/10/msg00021.html for more
+    information.
+  * Renaming /lib/live/mount/image to /lib/live/mount/medium. See
+    http://lists.debian.org/debian-live/2012/10/msg00023.html for more
+    information.
+  * Updating package descriptions.
+  * Properly wrap package descriptions to 80 characters per line.
+
+  [ Tails developers ]
+  * Adding support for the previous persistence configuration file name,
+    for compatibility with systems that have been deployed with live-
+    persistence.conf already.
+
+ -- Daniel Baumann <daniel@debian.org>  Wed, 07 Nov 2012 15:04:32 +0100
+
 live-boot (3.0~b6-1) unstable; urgency=low
 
   * Including hfs and hfsplus modules in initrd to access filesystems on

debian/control

@@ -12,15 +12,15 @@ Bugs: mailto:bugs@grml.org
 
 Package: live-boot-grml
 Architecture: all
-Depends: ${misc:Depends}, genext2fs, live-boot-grml-initramfs-tools
+Depends: ${misc:Depends}, genext2fs, live-boot-grml-initramfs-tools | live-boot-backend
 Recommends: live-boot-grml-doc, eject, file, rsync, uuid-runtime
 Conflicts: live-boot
 Replaces: live-boot
 Provides: live-boot
 Suggests: curlftpfs, cryptsetup, httpfs2, unionfs-fuse, wget
-Description: Debian Live - System Boot Scripts
- live-boot contains the scripts that configure a Debian Live system during the
- boot process (early userspace).
+Description: Live System Boot Scripts
+ live-boot contains the scripts that 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.
@@ -33,12 +33,11 @@ Package: live-boot-grml-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: live-boot (<< 3.0~a18~), live-boot-doc
-Replaces: live-boot, live-boot-doc
-Provides: live-boot-doc
-Description: Debian Live - System Boot Scripts (documentation)
- live-boot contains the scripts that configure a Debian Live system during the
- boot process (early userspace).
+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).
  .
  This package contains the documentation.
  .
@@ -53,10 +52,9 @@ Depends:
 Conflicts: live-boot-backend
 Replaces: live-boot-backend
 Provides: live-boot-backend
-Breaks: klibc-utils (<< 2.0-2)
-Description: Debian Live - System Boot Scripts (initramfs-tools backend)
- live-boot contains the scripts that configure a Debian Live system during the
- boot process (early userspace).
+Description: Live System Boot Scripts (initramfs-tools backend)
+ live-boot contains the scripts that configure a live system during the boot
+ process (early userspace).
  .
  This package contains the initramfs-tools backend.
  .

debian/live-boot-grml.bug-script

@@ -1,15 +1,15 @@
 #!/bin/sh
 
 # Checking depends
-dpkg -l busybox file initramfs-tools sudo udev user-setup
+dpkg -l busybox busybox-initramfs initramfs-tools udev
 
 # Checking recommends
-dpkg -l eject uuid-runtime wget
+dpkg -l rsync uuid-runtime
 
 # Checking suggests
-dpkg -l loop-aes-utils curlftpfs genext2fs httpfs2 squashfs-tools mtd-tools
+dpkg -l curlftpfs cryptsetup httpfs2 unionfs-fuse wget
 
 # Checking other packages
-dpkg -l cryptsetup plymouth
+dpkg -l plymouth
 
 exit 0

debian/source/local-options

@@ -0,0 +1 @@
+abort-on-upstream-changes

manpages/de/live-boot.de.7

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 02.10.2012 3.0~b6\-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 30.11.2012 3.0~b8\-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-boot\fP \- System Boot Scripts

manpages/de/persistence.conf.de.5

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT conf 02.10.2012 3.0~b6\-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 30.11.2012 3.0~b8\-1 "Debian Live Project"
 
 .SH NAME
 \fBpersistence.conf\fP \- Configuration file for persistence media in live\-boot

manpages/en/live-boot.7

@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2012\-10\-02 3.0~b6-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2012\-11\-30 3.0~b8-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-boot\fR \- System Boot Scripts

manpages/en/persistence.conf.5

@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT conf 2012\-10\-02 3.0~b6-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 2012\-11\-30 3.0~b8-1 "Debian Live Project"
 
 .SH NAME
 \fBpersistence.conf\fR \- Configuration file for persistence media in

manpages/es/live-boot.es.7

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 02.10.2012 3.0~b6\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT 7 30.11.2012 3.0~b8\-1 "Proyecto Debian Live"
 
 .SH NOMBRE
 \fBlive\-boot\fP \- Scripts de Arranque del Sistema

manpages/es/persistence.conf.es.5

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT conf 02.10.2012 3.0~b6\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT conf 30.11.2012 3.0~b8\-1 "Proyecto Debian Live"
 
 .SH NOMBRE
 \fBpersistence.conf\fP \- Fichero para configurar medios de almacenamiento con

manpages/po/de/live-boot.7.po

@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 3.0~b6-1\n"
-"POT-Creation-Date: 2012-10-02 10:38+0300\n"
+"Project-Id-Version: live-boot 3.0~b8-1\n"
+"POT-Creation-Date: 2012-11-30 14:47+0100\n"
 "PO-Revision-Date: 2012-04-08 22:48+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2012-10-02"
-msgstr "02.10.2012"
+msgid "2012-11-30"
+msgstr "30.11.2012"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "3.0~b6-1"
-msgstr "3.0~b6-1"
+msgid "3.0~b8-1"
+msgstr "3.0~b8-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1

manpages/po/de/persistence.conf.5.po

@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 3.0~b6-1\n"
-"POT-Creation-Date: 2012-10-02 10:38+0300\n"
+"Project-Id-Version: live-boot 3.0~b8-1\n"
+"POT-Creation-Date: 2012-11-30 14:47+0100\n"
 "PO-Revision-Date: 2012-04-08 22:48+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2012-10-02"
-msgstr "02.10.2012"
+msgid "2012-11-30"
+msgstr "30.11.2012"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "3.0~b6-1"
-msgstr "3.0~b6-1"
+msgid "3.0~b8-1"
+msgstr "3.0~b8-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1

manpages/po/es/live-boot.7.po

@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 3.0~b6-1\n"
-"POT-Creation-Date: 2012-10-02 10:38+0300\n"
+"Project-Id-Version: live-boot 3.0~b8-1\n"
+"POT-Creation-Date: 2012-11-30 14:47+0100\n"
 "PO-Revision-Date: 2012-06-07 20:29+0200\n"
 "Last-Translator: Carlos Zuferri «chals» <chals@altorricon.com>\n"
 "Language-Team:  none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2012-10-02"
-msgstr "02.10.2012"
+msgid "2012-11-30"
+msgstr "30.11.2012"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "3.0~b6-1"
-msgstr "3.0~b6-1"
+msgid "3.0~b8-1"
+msgstr "3.0~b8-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1

manpages/po/es/persistence.conf.5.po

@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 3.0~b6-1\n"
-"POT-Creation-Date: 2012-10-02 10:38+0300\n"
+"Project-Id-Version: live-boot 3.0~b8-1\n"
+"POT-Creation-Date: 2012-11-30 14:47+0100\n"
 "PO-Revision-Date: 2012-06-07 19:11+0200\n"
 "Last-Translator: Carlos Zuferri «chals» <chals@altorricon.com>\n"
 "Language-Team:  none\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2012-10-02"
-msgstr "02.10.2012"
+msgid "2012-11-30"
+msgstr "30.11.2012"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "3.0~b6-1"
-msgstr "3.0~b6-1"
+msgid "3.0~b8-1"
+msgstr "3.0~b8-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1

manpages/pot/live-boot.7.pot

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2012-10-02 10:38+0300\n"
+"POT-Creation-Date: 2012-11-30 14:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2012-10-02"
+msgid "2012-11-30"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "3.0~b6-1"
+msgid "3.0~b8-1"
 msgstr ""
 
 #. type: TH

manpages/pot/persistence.conf.5.pot

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2012-10-02 10:38+0300\n"
+"POT-Creation-Date: 2012-11-30 14:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2012-10-02"
+msgid "2012-11-30"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "3.0~b6-1"
+msgid "3.0~b8-1"
 msgstr ""
 
 #. type: TH

scripts/boot/9990-aaa-fixme.sh

@@ -5,7 +5,7 @@ export PATH="/root/usr/bin:/root/usr/sbin:/root/bin:/root/sbin:/usr/bin:/usr/sbi
 echo "/root/lib" >> /etc/ld.so.conf
 echo "/root/usr/lib" >> /etc/ld.so.conf
 
-mountpoint="/live/image"
+mountpoint="/live/medium"
 alt_mountpoint="/media"
 LIVE_MEDIA_PATH="live"
 
@@ -44,6 +44,7 @@ old_root_overlay_label="live-rw"
 old_home_overlay_label="home-rw"
 custom_overlay_label="persistence"
 persistence_list="persistence.conf"
+old_persistence_list="live-persistence.conf"
 
 if [ ! -f /live.vars ]
 then

scripts/boot/9990-main.sh

@@ -146,8 +146,8 @@ Main ()
 	esac
 
 	# Move to the new root filesystem so that programs there can get at it.
-	mkdir -p /root/lib/live/image
-	mount --move /live/image /root/lib/live/image
+	mkdir -p /root/lib/live/mount/medium
+	mount --move /live/medium /root/lib/live/mount/medium
 
 	# aufs2 in kernel versions around 2.6.33 has a regression:
 	# directories can't be accessed when read for the first the time,
@@ -158,8 +158,8 @@ Main ()
 	# Move findiso directory to the new root filesystem so that programs there can get at it.
 	if [ -d /live/findiso ]
 	then
-		mkdir -p /root/lib/live/findiso
-		mount -n --move /live/findiso /root/lib/live/findiso
+		mkdir -p /root/lib/live/mount/findiso
+		mount -n --move /live/findiso /root/lib/live/mount/findiso
 	fi
 
 	# if we do not unmount the ISO we can't run "fsck /dev/ice" later on
@@ -169,10 +169,10 @@ Main ()
 	then
 		losetup -d /dev/loop0
 
-		if is_mountpoint /root/lib/live/findiso
+		if is_mountpoint /root/lib/live/mount/findiso
 		then
-			umount /root/lib/live/findiso
-			rmdir --ignore-fail-on-non-empty /root/lib/live/findiso \
+			umount /root/lib/live/mount/findiso
+			rmdir --ignore-fail-on-non-empty /root/lib/live/mount/findiso \
 				>/dev/null 2>&1 || true
 		fi
 	fi