Handle package/task list changes in live-build 3.0~a22-1.

debian/changelog

@@ -1,3 +1,9 @@
+livecd-rootfs (2.8) UNRELEASED; urgency=low
+
+  * Handle package/task list changes in live-build 3.0~a22-1.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 17 Jun 2011 08:24:52 +0100
+
 livecd-rootfs (2.7) oneiric; urgency=low
 
   * Install xubuntu-live for xubuntu, not edubuntu-live (LP: #800211).

live-build/auto/config

@@ -19,8 +19,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 ()
 {
@@ -29,7 +28,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
 }
 
@@ -40,7 +39,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
 }