Import patches-unapplied version 2.14 to ubuntu/oneiric

Imported using git-ubuntu import.

Changelog parent: fe516c7a7f

New changelog entries:
  * Handle package/task list changes in live-build 3.0~a22-1.
  * Handle local sources.list changes in live-build 3.0~a22-1.

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (2.14) oneiric; urgency=low
+
+  * Handle package/task list changes in live-build 3.0~a22-1.
+  * Handle local sources.list changes in live-build 3.0~a22-1.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 13 Jul 2011 19:06:29 +0100
+
 livecd-rootfs (2.13) oneiric; urgency=low
 
   * Didn't realize that you can pass multiple projects to BuildLiveCD.

debian/control

@@ -8,7 +8,7 @@ Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk
 
 Package: livecd-rootfs
 Architecture: all
-Depends: ${misc:Depends}, debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, fdupes, lsb-release, lzma, e2fsprogs, live-build (>= 3.0~a21-1ubuntu1)
+Depends: ${misc:Depends}, debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, fdupes, lsb-release, lzma, e2fsprogs, live-build (>= 3.0~a22-1ubuntu1)
 Suggests: partimage
 Description: construction script for the livecd rootfs
  livecd-rootfs provides the script used to create the root filesystem

live-build/auto/config

@@ -24,8 +24,7 @@ if [ -z "$MIRROR" ]; then
 	esac
 fi
 
-mkdir -p config/chroot_local-tasklists config/chroot_local-packagelists
+mkdir -p config/task-lists config/package-lists
-rm -f config/chroot_local-tasklists/livecd-rootfs.list config/chroot_local-packagelists/livecd-rootfs.list
 
 add_task ()
 {
@@ -34,7 +33,7 @@ add_task ()
 	local task
 
 	for task; do
-		echo "$task" >> "config/chroot_local-tasklists/livecd-rootfs.list.$pass"
+		echo "$task" >> "config/task-lists/livecd-rootfs.chroot_$pass.list"
 	done
 }
 
@@ -45,7 +44,7 @@ add_package ()
 	local pkg
 
 	for pkg; do
-		echo "$pkg" >> "config/chroot_local-packagelists/livecd-rootfs.list.$pass"
+		echo "$pkg" >> "config/package-lists/livecd-rootfs.chroot_$pass.list"
 	done
 }
 
@@ -209,7 +208,7 @@ case $PROJECT in
 	*-dvd)
 		. config/bootstrap
 
-		cat > config/chroot_sources/dvd.binary << EOF
+		cat > config/archives/dvd.binary.list << EOF
 deb $LB_PARENT_MIRROR_BINARY $SUITE universe multiverse
 deb $LB_PARENT_MIRROR_BINARY_SECURITY $SUITE-security universe multiverse
 deb $LB_PARENT_MIRROR_BINARY_VOLATILE $SUITE-updates universe multiverse