From 83e54408a5eb4bccc74e89fe63f2bd4817239d94 Mon Sep 17 00:00:00 2001
From: "martin@piware.de" <>
Date: Wed, 13 Aug 2008 09:45:07 +0200
Subject: [PATCH 01/18] Do not install xresprobe, it is not necessary any more
 and in universe now.

---
 debian/changelog |  7 +++++++
 livecd.sh        | 12 ++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1152001d..941b7422 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (0.63) UNRELEASED; urgency=low
+
+  * Do not install xresprobe, it is not necessary any more and in universe
+    now.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 13 Aug 2008 09:44:40 +0200
+
 livecd-rootfs (0.62) intrepid; urgency=low
 
   * Use 'set -eu' rather than putting -eu on the #! line, so that running
diff --git a/livecd.sh b/livecd.sh
index bba7449b..c20e1d44 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -173,29 +173,29 @@ Flags: seen
     case "$FS" in
 	ubuntu|ubuntu-lpia|ubuntu-dvd)
 	    LIST="$LIST minimal^ standard^ ubuntu-desktop^"
-	    LIVELIST="ubuntu-live^ xresprobe laptop-detect casper lupin-casper"
+	    LIVELIST="ubuntu-live^ laptop-detect casper lupin-casper"
 	    ;;
 	kubuntu|kubuntu-dvd)
 	    LIST="$LIST minimal^ standard^ kubuntu-desktop^"
-	    LIVELIST="kubuntu-live^ xresprobe laptop-detect casper lupin-casper"
+	    LIVELIST="kubuntu-live^ laptop-detect casper lupin-casper"
 	    ;;
 	kubuntu-kde4)
 	    LIST="$LIST minimal^ standard^ kubuntu-kde4-desktop^"
-	    LIVELIST="language-support-en kubuntu-kde4-live^ xresprobe laptop-detect casper lupin-casper"
+	    LIVELIST="language-support-en kubuntu-kde4-live^ laptop-detect casper lupin-casper"
 	    COMP="main restricted universe multiverse"
 	    ;;
 	edubuntu|edubuntu-dvd)
 	    LIST="$LIST minimal^ standard^ edubuntu-desktop^"
-	    LIVELIST="edubuntu-live^ xresprobe laptop-detect casper lupin-casper"
+	    LIVELIST="edubuntu-live^ laptop-detect casper lupin-casper"
 	    ;;
 	xubuntu)
 	    LIST="$LIST minimal^ standard^ xterm libgoffice-gtk-0-6 xubuntu-desktop^"
-	    LIVELIST="xubuntu-live^ xresprobe laptop-detect casper lupin-casper"
+	    LIVELIST="xubuntu-live^ laptop-detect casper lupin-casper"
 	    COMP="main restricted universe multiverse"
 	    ;;
 	gobuntu)
 	    LIST="$LIST minimal^ standard^ gobuntu-desktop^"
-	    LIVELIST="gobuntu-live^ xresprobe laptop-detect casper lupin-casper"
+	    LIVELIST="gobuntu-live^ laptop-detect casper lupin-casper"
 	    COMP="main"
 	    ;;
 	base)

From b336d1f95a4b9c24d55cdccf6331fb0b59a1ef9e Mon Sep 17 00:00:00 2001
From: "martin@piware.de" <>
Date: Wed, 13 Aug 2008 09:45:20 +0200
Subject: [PATCH 02/18] releasing version 0.63

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 941b7422..0b53b4c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-livecd-rootfs (0.63) UNRELEASED; urgency=low
+livecd-rootfs (0.63) intrepid; urgency=low
 
   * Do not install xresprobe, it is not necessary any more and in universe
     now.
 
- -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 13 Aug 2008 09:44:40 +0200
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 13 Aug 2008 09:45:15 +0200
 
 livecd-rootfs (0.62) intrepid; urgency=low
 

From 5484289aa59d52807c35a672ebdf1fb03fa2f704 Mon Sep 17 00:00:00 2001
From: Steve Kowalik <stevenk@ubuntu.com>
Date: Fri, 22 Aug 2008 18:11:52 +1000
Subject: [PATCH 03/18] * Add support for building Ubuntu MID images.     -
 Includes changing the kernel name for lpia due to the lack of meta      
 package for the time being.

---
 debian/changelog |  8 ++++++++
 livecd.sh        | 24 +++++++++++++++++++++---
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0b53b4c6..0a426a68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (0.64) intrepid; urgency=low
+
+  * Add support for building Ubuntu MID images.
+    - Includes changing the kernel name for lpia due to the lack of meta
+      package for the time being.
+
+ -- Steve Kowalik <stevenk@ubuntu.com>  Fri, 22 Aug 2008 18:10:38 +1000
+
 livecd-rootfs (0.63) intrepid; urgency=low
 
   * Do not install xresprobe, it is not necessary any more and in universe
diff --git a/livecd.sh b/livecd.sh
index c20e1d44..33b0ba62 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -73,7 +73,7 @@ select_mirror () {
     case $ARCH in
 	i386|amd64)
 	    case $FS in
-		ubuntu-lpia)
+		ubuntu-lpia|ubuntu-mid)
 		    USERMIRROR=http://ports.ubuntu.com/ubuntu-ports
 		    SECMIRROR=${USERMIRROR}
 		    SECSRCMIRROR=${SRCMIRROR}
@@ -139,7 +139,7 @@ fi
 
 for arg in "$@"; do
     case "$arg" in
-	ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-kde4|xubuntu|gobuntu|base|tocd)
+	ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-kde4|xubuntu|gobuntu|ubuntu-mid|base|tocd)
 	    ;;
 	*)
 	    echo bad name >&2;
@@ -198,6 +198,11 @@ Flags: seen
 	    LIVELIST="gobuntu-live^ laptop-detect casper lupin-casper"
 	    COMP="main"
 	    ;;
+    ubuntu-mid)
+        LIST="$LIST minimal^ ubuntu-mid casper xserver-xorg-input-evtouch usplash"
+        LIVELIST=""
+        COMP="main restricted universe multiverse"
+        ;;
 	base)
 	    LIST="$LIST minimal^ standard^"
 	    LIVELIST="casper lupin-casper"
@@ -296,7 +301,7 @@ link_in_boot = $link_in_boot
 	i386)		LIST="$LIST linux-generic";;
 
 	# and the bastard stepchildren
-	lpia)		LIST="$LIST linux-lpia";;
+	lpia)		LIST="$LIST linux-image-2.6.26-1-lpia";;
 	ia64)		LIST="$LIST linux-itanium linux-mckinley";;
 	hppa)		LIST="$LIST linux-hppa32 linux-hppa64";;
 	powerpc)	LIST="$LIST linux-powerpc linux-powerpc64-smp";;
@@ -304,6 +309,19 @@ link_in_boot = $link_in_boot
 	*)		echo "Unknown architecture: no kernel."; exit 1;;
     esac
 
+    if [ $FS = "ubuntu-mid" ]; then
+      case "$SUBARCH" in
+        *proprietary*)
+          case "$SUBARCH" in
+            menlow*)
+              LIST="$LIST marvell-8686-firmware-9 psb-video libgl1-mesa-dri-psb xorg-modules-xpsb"
+              ;;
+          esac
+          LIST="$LIST mobile-usb-client-utils mobile-usb-host-utils"
+          ;;
+      esac
+    fi
+
     for x in $EXCLUDE; do
 	LIST="$(without_package "$x" "$LIST")"
     done

From c02a8c004eb7bdc2113e8c2b9efe5c7647403e7d Mon Sep 17 00:00:00 2001
From: Steve Kowalik <stevenk@ubuntu.com>
Date: Tue, 9 Sep 2008 09:25:52 +1000
Subject: [PATCH 04/18] Fiddle the kernel name for lpia.

---
 debian/changelog | 6 ++++++
 livecd.sh        | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0a426a68..e7c8d0bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (0.65) intrepid; urgency=low
+
+  * Fiddle the kernel name for lpia.
+
+ -- Steve Kowalik <stevenk@ubuntu.com>  Tue, 09 Sep 2008 09:21:10 +1000
+
 livecd-rootfs (0.64) intrepid; urgency=low
 
   * Add support for building Ubuntu MID images.
diff --git a/livecd.sh b/livecd.sh
index 33b0ba62..92f3d44d 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -301,7 +301,7 @@ link_in_boot = $link_in_boot
 	i386)		LIST="$LIST linux-generic";;
 
 	# and the bastard stepchildren
-	lpia)		LIST="$LIST linux-image-2.6.26-1-lpia";;
+	lpia)		LIST="$LIST linux-image-2.6.27-2-lpia";;
 	ia64)		LIST="$LIST linux-itanium linux-mckinley";;
 	hppa)		LIST="$LIST linux-hppa32 linux-hppa64";;
 	powerpc)	LIST="$LIST linux-powerpc linux-powerpc64-smp";;

From c26e39184a5def9132efeea15b67df6e468d84ea Mon Sep 17 00:00:00 2001
From: Steve Kowalik <stevenk@ubuntu.com>
Date: Thu, 11 Sep 2008 19:06:20 +1000
Subject: [PATCH 05/18] * Remove a bunch of seeded packages from ubuntu-mid's
 LIST.   * Move casper from ubuntu-mid's LIST to LIVELIST.   * Add ubiquity to
 ubuntu-mid's LIVELIST.

---
 debian/changelog | 8 ++++++++
 livecd.sh        | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e7c8d0bf..4bc4395a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (0.66) intrepid; urgency=low
+
+  * Remove a bunch of seeded packages from ubuntu-mid's LIST.
+  * Move casper from ubuntu-mid's LIST to LIVELIST.
+  * Add ubiquity to ubuntu-mid's LIVELIST.
+
+ -- Steve Kowalik <stevenk@ubuntu.com>  Thu, 11 Sep 2008 19:02:52 +1000
+
 livecd-rootfs (0.65) intrepid; urgency=low
 
   * Fiddle the kernel name for lpia.
diff --git a/livecd.sh b/livecd.sh
index 92f3d44d..22fb998a 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -199,8 +199,8 @@ Flags: seen
 	    COMP="main"
 	    ;;
     ubuntu-mid)
-        LIST="$LIST minimal^ ubuntu-mid casper xserver-xorg-input-evtouch usplash"
-        LIVELIST=""
+        LIST="$LIST minimal^ ubuntu-mid"
+        LIVELIST="casper ubiquity"
         COMP="main restricted universe multiverse"
         ;;
 	base)

From ce517079a131bef6f1f7a1ce465c705231f2b66f Mon Sep 17 00:00:00 2001
From: Steve Kowalik <stevenk@ubuntu.com>
Date: Mon, 15 Sep 2008 16:42:42 +1000
Subject: [PATCH 06/18] Bump lpia's kernel to -3

---
 debian/changelog | 6 ++++++
 livecd.sh        | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 4bc4395a..969828c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (0.67) intrepid; urgency=low
+
+  * Bump linux-lpia to -3.
+
+ -- Steve Kowalik <stevenk@ubuntu.com>  Mon, 15 Sep 2008 16:41:34 +1000
+
 livecd-rootfs (0.66) intrepid; urgency=low
 
   * Remove a bunch of seeded packages from ubuntu-mid's LIST.
diff --git a/livecd.sh b/livecd.sh
index 22fb998a..ee3191d0 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -301,7 +301,7 @@ link_in_boot = $link_in_boot
 	i386)		LIST="$LIST linux-generic";;
 
 	# and the bastard stepchildren
-	lpia)		LIST="$LIST linux-image-2.6.27-2-lpia";;
+	lpia)		LIST="$LIST linux-image-2.6.27-3-lpia";;
 	ia64)		LIST="$LIST linux-itanium linux-mckinley";;
 	hppa)		LIST="$LIST linux-hppa32 linux-hppa64";;
 	powerpc)	LIST="$LIST linux-powerpc linux-powerpc64-smp";;

From 7aba4c9dc3e999ae71b002fe0121eace3f34e4ed Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Mon, 22 Sep 2008 11:47:04 +0100
Subject: [PATCH 07/18] Unmount /proc/sys/fs/binfmt_misc, in case
 binfmt-support is installed and manages to mount it.

---
 debian/changelog | 7 +++++++
 livecd.sh        | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 969828c0..af1d5147 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (0.68) UNRELEASED; urgency=low
+
+  * Unmount /proc/sys/fs/binfmt_misc, in case binfmt-support is installed
+    and manages to mount it.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 22 Sep 2008 11:46:43 +0100
+
 livecd-rootfs (0.67) intrepid; urgency=low
 
   * Bump linux-lpia to -3.
diff --git a/livecd.sh b/livecd.sh
index ee3191d0..6ba7c5c7 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -152,7 +152,7 @@ ROOT=$(pwd)/chroot-livecd/	# trailing / is CRITICAL
 for FS in "$@"; do
     FSS="$FS${SUBARCH:+-$SUBARCH}"
     IMG=livecd.${FSS}.fsimg
-    MOUNTS="${ROOT}dev/pts ${ROOT}dev/shm ${ROOT}.dev ${ROOT}dev ${ROOT}proc ${ROOT}sys"
+    MOUNTS="${ROOT}dev/pts ${ROOT}dev/shm ${ROOT}.dev ${ROOT}dev ${ROOT}proc/sys/fs/binfmt_misc ${ROOT}proc ${ROOT}sys"
     DEV=""
     COMP="main restricted"
 

From 3a77c96af7943c5ceb757ef470051f6ef5aff668 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Mon, 22 Sep 2008 11:52:12 +0100
Subject: [PATCH 08/18] Move MOUNTS variable into cleanup function for clarity;
 it's used nowhere else.

---
 debian/changelog | 2 ++
 livecd.sh        | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index af1d5147..05aef7c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ livecd-rootfs (0.68) UNRELEASED; urgency=low
 
   * Unmount /proc/sys/fs/binfmt_misc, in case binfmt-support is installed
     and manages to mount it.
+  * Move MOUNTS variable into cleanup function for clarity; it's used
+    nowhere else.
 
  -- Colin Watson <cjwatson@ubuntu.com>  Mon, 22 Sep 2008 11:46:43 +0100
 
diff --git a/livecd.sh b/livecd.sh
index 6ba7c5c7..7d2b7637 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -24,7 +24,9 @@ set -eu
 # Depends: debootstrap, rsync, python-minimal|python, procps, squashfs-tools
 
 cleanup() {
-    for mnt in $MOUNTS ${ROOT}lib/modules/*/volatile ${ROOT}var/{lock,run}; do
+    for mnt in ${ROOT}dev/pts ${ROOT}dev/shm ${ROOT}.dev ${ROOT}dev \
+	       ${ROOT}proc/sys/fs/binfmt_misc ${ROOT}proc ${ROOT}sys \
+	       ${ROOT}lib/modules/*/volatile ${ROOT}var/{lock,run}; do
 	umount $mnt || true
     done
 
@@ -152,7 +154,6 @@ ROOT=$(pwd)/chroot-livecd/	# trailing / is CRITICAL
 for FS in "$@"; do
     FSS="$FS${SUBARCH:+-$SUBARCH}"
     IMG=livecd.${FSS}.fsimg
-    MOUNTS="${ROOT}dev/pts ${ROOT}dev/shm ${ROOT}.dev ${ROOT}dev ${ROOT}proc/sys/fs/binfmt_misc ${ROOT}proc ${ROOT}sys"
     DEV=""
     COMP="main restricted"
 

From c38a8adb560c035d2f50957dc8707b5e19e47762 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Mon, 22 Sep 2008 11:53:53 +0100
Subject: [PATCH 09/18] releasing version 0.68

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 05aef7c1..51f763fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-livecd-rootfs (0.68) UNRELEASED; urgency=low
+livecd-rootfs (0.68) intrepid; urgency=low
 
   * Unmount /proc/sys/fs/binfmt_misc, in case binfmt-support is installed
     and manages to mount it.
   * Move MOUNTS variable into cleanup function for clarity; it's used
     nowhere else.
 
- -- Colin Watson <cjwatson@ubuntu.com>  Mon, 22 Sep 2008 11:46:43 +0100
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 22 Sep 2008 11:52:22 +0100
 
 livecd-rootfs (0.67) intrepid; urgency=low
 

From 0bc6444a940bf18b2d1c2ad4e26571f9a990247f Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Tue, 23 Sep 2008 12:44:24 +0200
Subject: [PATCH 10/18] add ubuntu-mobile

---
 livecd.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/livecd.sh b/livecd.sh
index 7d2b7637..5863a172 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -141,7 +141,7 @@ fi
 
 for arg in "$@"; do
     case "$arg" in
-	ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-kde4|xubuntu|gobuntu|ubuntu-mid|base|tocd)
+       ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-kde4|xubuntu|gobuntu|ubuntu-mid|ubuntu-mobile|base|tocd)
 	    ;;
 	*)
 	    echo bad name >&2;
@@ -204,6 +204,11 @@ Flags: seen
         LIVELIST="casper ubiquity"
         COMP="main restricted universe multiverse"
         ;;
+        ubuntu-mobile)
+            LIST="$LIST minimal^ ubuntu-mobile"
+            LIVELIST="casper ubiquity"
+            COMP="main restricted universe multiverse"
+            ;;
 	base)
 	    LIST="$LIST minimal^ standard^"
 	    LIVELIST="casper lupin-casper"

From 5c00530e212ee172a6349cbf5d32e4a5ea4e0762 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Tue, 23 Sep 2008 12:52:32 +0200
Subject: [PATCH 11/18] releasing version 0.69

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 51f763fd..1da5adbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (0.69) intrepid; urgency=low
+
+  * add ubuntu-mobile to build targets
+
+ -- Oliver Grawert <ogra@osiris>  Tue, 23 Sep 2008 12:46:50 +0200
+
 livecd-rootfs (0.68) intrepid; urgency=low
 
   * Unmount /proc/sys/fs/binfmt_misc, in case binfmt-support is installed

From 06355625434bd6864260abf44f883b503cfcd99f Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Tue, 23 Sep 2008 12:57:52 +0200
Subject: [PATCH 12/18] releasing version 0.69

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1da5adbb..4f1c8d0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ livecd-rootfs (0.69) intrepid; urgency=low
 
   * add ubuntu-mobile to build targets
 
- -- Oliver Grawert <ogra@osiris>  Tue, 23 Sep 2008 12:46:50 +0200
+ -- Oliver Grawert <ogra@ubuntu.com>  Tue, 23 Sep 2008 12:46:50 +0200
 
 livecd-rootfs (0.68) intrepid; urgency=low
 

From dd3fdde358b379ee0a024bb706b47f0204e163fc Mon Sep 17 00:00:00 2001
From: Steve Kowalik <stevenk@ubuntu.com>
Date: Fri, 26 Sep 2008 16:10:32 +1000
Subject: [PATCH 13/18] linux-lpia-meta exists, change lpia's kernel back to
 linux-lpia.

---
 debian/changelog | 6 ++++++
 livecd.sh        | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 4f1c8d0a..cbf7d03c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (0.70) intrepid; urgency=low
+
+  * linux-lpia-meta exists, change lpia's kernel back to linux-lpia.
+
+ -- Steve Kowalik <stevenk@ubuntu.com>  Fri, 26 Sep 2008 16:09:54 +1000
+
 livecd-rootfs (0.69) intrepid; urgency=low
 
   * add ubuntu-mobile to build targets
diff --git a/livecd.sh b/livecd.sh
index 5863a172..fec85f5a 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -307,7 +307,7 @@ link_in_boot = $link_in_boot
 	i386)		LIST="$LIST linux-generic";;
 
 	# and the bastard stepchildren
-	lpia)		LIST="$LIST linux-image-2.6.27-3-lpia";;
+	lpia)		LIST="$LIST linux-lpia";;
 	ia64)		LIST="$LIST linux-itanium linux-mckinley";;
 	hppa)		LIST="$LIST linux-hppa32 linux-hppa64";;
 	powerpc)	LIST="$LIST linux-powerpc linux-powerpc64-smp";;

From 8d7abf1cb806e1871e58ec22e5158811c0887ed0 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Mon, 29 Sep 2008 23:23:53 +0200
Subject: [PATCH 14/18] switch ubuntu-mobile from metapackage installation to
 mobile-mobile task

---
 livecd.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/livecd.sh b/livecd.sh
index fec85f5a..066895cc 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -205,7 +205,7 @@ Flags: seen
         COMP="main restricted universe multiverse"
         ;;
         ubuntu-mobile)
-            LIST="$LIST minimal^ ubuntu-mobile"
+            LIST="$LIST minimal^ mobile-mobile^"
             LIVELIST="casper ubiquity"
             COMP="main restricted universe multiverse"
             ;;

From 0c7f73a1565fb4f50962228f1ba1c498cf89f8ac Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Mon, 29 Sep 2008 23:25:13 +0200
Subject: [PATCH 15/18] releasing version 0.71

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cbf7d03c..3387b683 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (0.71) intrepid; urgency=low
+
+  * change mobile to use the mobile-mobile task instead of teh metapackage for
+    building images
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Mon, 29 Sep 2008 23:24:15 +0200
+
 livecd-rootfs (0.70) intrepid; urgency=low
 
   * linux-lpia-meta exists, change lpia's kernel back to linux-lpia.

From 7917071ab33daca74d42df6379247a61ebd38883 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Thu, 9 Oct 2008 02:12:29 +0100
Subject: [PATCH 16/18] * Fix source mirror for -updates in generated
 sources.list (it was   incorrect for ports architectures). * Fix description
 of universe in generated sources.list: packages there   are expected to be
 under a free licence. * Enable universe and multiverse for DVDs (there isn't
 generally enough   space on CDs; see LP #105511).

---
 debian/changelog | 11 +++++++++++
 livecd.sh        | 50 +++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3387b683..20fe55e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+livecd-rootfs (0.72) UNRELEASED; urgency=low
+
+  * Fix source mirror for -updates in generated sources.list (it was
+    incorrect for ports architectures).
+  * Fix description of universe in generated sources.list: packages there
+    are expected to be under a free licence.
+  * Enable universe and multiverse for DVDs (there isn't generally enough
+    space on CDs; see LP #105511).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 09 Oct 2008 02:08:25 +0100
+
 livecd-rootfs (0.71) intrepid; urgency=low
 
   * change mobile to use the mobile-mobile task instead of teh metapackage for
diff --git a/livecd.sh b/livecd.sh
index 066895cc..c038bd47 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -240,6 +240,12 @@ Flags: seen
     case "$FS" in
 	*-dvd)
 	    LIVELIST="$LIVELIST ${FS}-live^"
+	    UNIVERSE=1
+	    MULTIVERSE=1
+	    ;;
+	*)
+	    UNIVERSE=
+	    MULTIVERSE=
 	    ;;
     esac
 
@@ -414,21 +420,47 @@ deb-src ${SECSRCMIRROR} ${STE}-security ${COMP}
 ## Major bug fix updates produced after the final release of the
 ## distribution.
 deb ${USERMIRROR} ${STE}-updates ${COMP}
-deb-src ${USERMIRROR} ${STE}-updates ${COMP}
+deb-src ${SRCMIRROR} ${STE}-updates ${COMP}
 
+@@EOF
+    if [ "$UNIVERSE" ]; then
+	COMMENT=
+    else
+	cat << @@EOF >> ${ROOT}etc/apt/sources.list
 ## Uncomment the following two lines to add software from the 'universe'
 ## repository.
+@@EOF
+	COMMENT='# '
+    fi
+    cat << @@EOF >> ${ROOT}etc/apt/sources.list
+## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
+## team. Also, please note that software in universe WILL NOT receive any
+## review or updates from the Ubuntu security team.
+${COMMENT}deb ${USERMIRROR} $STE universe
+${COMMENT}deb-src ${SRCMIRROR} $STE universe
+${COMMENT}deb ${USERMIRROR} ${STE}-updates universe
+${COMMENT}deb-src ${SRCMIRROR} ${STE}-updates universe
+${COMMENT}deb ${SECMIRROR} ${STE}-security universe
+${COMMENT}deb-src ${SECSRCMIRROR} ${STE}-security universe
+
+@@EOF
+    if [ "$MULTIVERSE" ]; then
+	COMMENT=
+    else
+	COMMENT='# '
+    fi
+    cat << @@EOF >> ${ROOT}etc/apt/sources.list
 ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
 ## team, and may not be under a free licence. Please satisfy yourself as to
 ## your rights to use the software. Also, please note that software in
-## universe WILL NOT receive any review or updates from the Ubuntu security
-## team.
-# deb ${USERMIRROR} $STE universe
-# deb-src ${SRCMIRROR} $STE universe
-# deb ${USERMIRROR} ${STE}-updates universe
-# deb-src ${USERMIRROR} ${STE}-updates universe
-# deb ${USERMIRROR} ${STE}-security universe
-# deb-src ${USERMIRROR} ${STE}-security universe
+## multiverse WILL NOT receive any review or updates from the Ubuntu
+## security team.
+${COMMENT}deb ${USERMIRROR} $STE multiverse
+${COMMENT}deb-src ${SRCMIRROR} $STE multiverse
+${COMMENT}deb ${USERMIRROR} ${STE}-updates multiverse
+${COMMENT}deb-src ${SRCMIRROR} ${STE}-updates multiverse
+${COMMENT}deb ${SECMIRROR} ${STE}-security multiverse
+${COMMENT}deb-src ${SECSRCMIRROR} ${STE}-security multiverse
 @@EOF
     mv ${ROOT}etc/apt/trusted.gpg.$$ ${ROOT}etc/apt/trusted.gpg
 

From 43dee9a8ba7dbd1f7104b734be5d9d766ade8242 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Thu, 9 Oct 2008 02:21:07 +0100
Subject: [PATCH 17/18] releasing version 0.72

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 20fe55e7..25dd6a59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-livecd-rootfs (0.72) UNRELEASED; urgency=low
+livecd-rootfs (0.72) intrepid; urgency=low
 
   * Fix source mirror for -updates in generated sources.list (it was
     incorrect for ports architectures).
@@ -7,7 +7,7 @@ livecd-rootfs (0.72) UNRELEASED; urgency=low
   * Enable universe and multiverse for DVDs (there isn't generally enough
     space on CDs; see LP #105511).
 
- -- Colin Watson <cjwatson@ubuntu.com>  Thu, 09 Oct 2008 02:08:25 +0100
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 09 Oct 2008 02:13:41 +0100
 
 livecd-rootfs (0.71) intrepid; urgency=low
 

From 2139c16ad616fa4ff69d9700f3fa63acb56ae872 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Fri, 31 Oct 2008 12:38:20 +0000
Subject: [PATCH 18/18] Add ubuntu-umpc support (equivalent to previous
 ubuntu-mobile).

---
 debian/changelog | 6 ++++++
 livecd.sh        | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 25dd6a59..90a5a95c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (0.73) UNRELEASED; urgency=low
+
+  * Add ubuntu-umpc support (equivalent to previous ubuntu-mobile).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 31 Oct 2008 12:38:00 +0000
+
 livecd-rootfs (0.72) intrepid; urgency=low
 
   * Fix source mirror for -updates in generated sources.list (it was
diff --git a/livecd.sh b/livecd.sh
index c038bd47..e9b006e4 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -141,7 +141,7 @@ fi
 
 for arg in "$@"; do
     case "$arg" in
-       ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-kde4|xubuntu|gobuntu|ubuntu-mid|ubuntu-mobile|base|tocd)
+       ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-kde4|xubuntu|gobuntu|ubuntu-mid|ubuntu-mobile|ubuntu-umpc|base|tocd)
 	    ;;
 	*)
 	    echo bad name >&2;
@@ -204,7 +204,7 @@ Flags: seen
         LIVELIST="casper ubiquity"
         COMP="main restricted universe multiverse"
         ;;
-        ubuntu-mobile)
+        ubuntu-mobile|ubuntu-umpc)
             LIST="$LIST minimal^ mobile-mobile^"
             LIVELIST="casper ubiquity"
             COMP="main restricted universe multiverse"