Import patches-unapplied version 0.32 to ubuntu/gutsy

Imported using git-ubuntu import.

Changelog parent: 13c07f49ddcb79b22e3766ef0d97369bde85b416

New changelog entries:
  * For Edubuntu images, include the intersection of edubuntu-ship-addon and
    edubuntu-live in manifest-desktop, so that packages also on the add-on
    CD aren't removed after installation by ubiquity.

debian/changelog

@@ -1,3 +1,11 @@
+livecd-rootfs (0.32) gutsy; urgency=low
+
+  * For Edubuntu images, include the intersection of edubuntu-ship-addon and
+    edubuntu-live in manifest-desktop, so that packages also on the add-on
+    CD aren't removed after installation by ubiquity.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sat, 21 Jul 2007 14:43:09 +0100
+
 livecd-rootfs (0.31) gutsy; urgency=low
 
   * Remove a duplicate "copyright" from debian/copyright.  Typing is hard.

debian/control

@@ -7,7 +7,7 @@ Standards-Version: 3.6.1.0
 
 Package: livecd-rootfs
 Architecture: all
-Depends: debootstrap, rsync, python-minimal | python, procps, squashfs-tools
+Depends: debootstrap, rsync, python-minimal | python, procps, squashfs-tools, grep-dctrl
 Suggests: partimage
 Description: construction script for the livecd rootfs
  livecd-rootfs provides the script used to create the root filesystem

livecd.sh

@@ -269,6 +269,17 @@ link_in_boot = $link_in_boot
     chroot ${ROOT} dpkg-query -W --showformat='${Package} ${Version}\n' \
 	> livecd.${FSS}.manifest-desktop
     chroot $ROOT apt-get -y install $LIVELIST </dev/null
+    case $FS in
+	edubuntu)
+	    chroot $ROOT apt-cache dumpavail | \
+		grep-dctrl -nsPackage -FTask edubuntu-ship-addon -a \
+				      -FTask edubuntu-live | \
+		sort -u | \
+		xargs chroot $ROOT \
+		    dpkg-query -W --showformat='${Package} ${Version}\n' \
+		>> livecd.${FSS}.manifest-desktop
+	    ;;
+    esac
     chroot ${ROOT} dpkg-query -W --showformat='${Package} ${Version}\n' \
 	> livecd.${FSS}.manifest
     kill_users