From 34ab86114e45363ececb1ba9eca9638b49852223 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Fri, 17 May 2013 14:34:51 +0200
Subject: [PATCH 01/54] remove qt5-proper PPA from ubuntu touch builds

---
 debian/changelog                                    |  6 ++++++
 .../canonical-qt5-edgers-qt5-proper.key.chroot      | 13 -------------
 .../canonical-qt5-edgers-qt5-proper.list.chroot     |  2 --
 3 files changed, 6 insertions(+), 15 deletions(-)
 delete mode 100644 live-build/ubuntu-touch/archives/canonical-qt5-edgers-qt5-proper.key.chroot
 delete mode 100644 live-build/ubuntu-touch/archives/canonical-qt5-edgers-qt5-proper.list.chroot

diff --git a/debian/changelog b/debian/changelog
index 9960728a..261b5038 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.134) UNRELEASED; urgency=low
+
+  * remove qt5-proper PPA from ubuntu touch builds
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Fri, 17 May 2013 14:33:35 +0200
+
 livecd-rootfs (2.133) saucy; urgency=low
 
   * drop online-accounts-qt5-staging PPA from ubuntu-touch images
diff --git a/live-build/ubuntu-touch/archives/canonical-qt5-edgers-qt5-proper.key.chroot b/live-build/ubuntu-touch/archives/canonical-qt5-edgers-qt5-proper.key.chroot
deleted file mode 100644
index 83949e5a..00000000
--- a/live-build/ubuntu-touch/archives/canonical-qt5-edgers-qt5-proper.key.chroot
+++ /dev/null
@@ -1,13 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: SKS 1.1.4
-Comment: Hostname: keyserver.ubuntu.com
-
-mI0ET3w4DgEEALUP5dk6tHWN0wBgONu56CAd16JFgihSA7J9U1nDurpL7IqcAf45Rw+7dqKk
-xqrb8B3RPRNdy4IF+acen54vGtkYkAMZNLh2BD045f4OlrMeVmxwM+SluTu3L2m/hPBDFbwA
-cOHKj6gMQ64roS6cEV9SMf6kjskRRMVNiofW16tZABEBAAG0JkxhdW5jaHBhZCBQUEEgZm9y
-IENhbm9uaWNhbCBRdDUgRWRnZXJziLgEEwECACIFAk98OA4CGwMGCwkIBwMCBhUIAgkKCwQW
-AgMBAh4BAheAAAoJENEQZREXlRiy1j0D/jXaGUmzxCku1wRqrt4ZtTN7cvJTXA/Olj4plcZT
-Cyxg7RmTvFgBeg5fJ6LzYRDiiDDTqVVW2xbZlLu6ig25dQYmHUJZUb1DPPMPbzm0w1yQna+D
-hhRzfHXa2Zo9U39wnYt6yjaljwZKnYcbDCsvTKyWyW9jx/YBCFUUg/SJPDF7
-=ZCi0
------END PGP PUBLIC KEY BLOCK-----
diff --git a/live-build/ubuntu-touch/archives/canonical-qt5-edgers-qt5-proper.list.chroot b/live-build/ubuntu-touch/archives/canonical-qt5-edgers-qt5-proper.list.chroot
deleted file mode 100644
index 8eac4b26..00000000
--- a/live-build/ubuntu-touch/archives/canonical-qt5-edgers-qt5-proper.list.chroot
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/canonical-qt5-edgers/qt5-proper/ubuntu @DISTRIBUTION@ main
-# deb-src http://ppa.launchpad.net/canonical-qt5-edgers/qt5-proper/ubuntu @DISTRIBUTION@ main

From 0eb97485387a12eb8aeacaa87ec05a09b8551983 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Fri, 17 May 2013 14:35:16 +0200
Subject: [PATCH 02/54] releasing version 2.134

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

diff --git a/debian/changelog b/debian/changelog
index 261b5038..0a86162b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-livecd-rootfs (2.134) UNRELEASED; urgency=low
+livecd-rootfs (2.134) saucy; urgency=low
 
   * remove qt5-proper PPA from ubuntu touch builds
 

From 80b0abec4eec1575ddf99941c555b66d1236429d Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Wed, 22 May 2013 17:32:49 +0100
Subject: [PATCH 03/54] BuildLiveCD: Time out lockfile after 12 hours, which
 should be enough for even the longest build queue to clear.

---
 BuildLiveCD      | 3 ++-
 debian/changelog | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/BuildLiveCD b/BuildLiveCD
index 508e56a6..fe4aed11 100755
--- a/BuildLiveCD
+++ b/BuildLiveCD
@@ -97,7 +97,8 @@ fi
 FS="$1"
 shift
 
-lockfile ~/buildLiveCD.lock || exit 1
+# 12 hours should be enough for even the longest build queue to clear.
+lockfile -8 -r$((12 * 60 * 60 / 8)) ~/buildLiveCD.lock || exit 1
 trap "finish" 0
 trap "rm -f ~/buildLiveCD.lock; exit 1" 1 2 3 15
 exec > $BUILD_LOG 2>&1
diff --git a/debian/changelog b/debian/changelog
index 0a86162b..98421f82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.135) UNRELEASED; urgency=low
+
+  * BuildLiveCD: Time out lockfile after 12 hours, which should be enough
+    for even the longest build queue to clear.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 22 May 2013 17:32:23 +0100
+
 livecd-rootfs (2.134) saucy; urgency=low
 
   * remove qt5-proper PPA from ubuntu touch builds

From ce32cc1fe6163916916f362c96955a523a5e4f83 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Mon, 27 May 2013 14:37:30 +0200
Subject: [PATCH 04/54] add live-build script for subarch specific Ubuntu Touch
 initrd and boot image creation

---
 debian/changelog      |  7 ++++++-
 live-build/auto/build | 27 +++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 98421f82..bd9c69fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 livecd-rootfs (2.135) UNRELEASED; urgency=low
 
+  [ Colin Watson ]
   * BuildLiveCD: Time out lockfile after 12 hours, which should be enough
     for even the longest build queue to clear.
 
- -- Colin Watson <cjwatson@ubuntu.com>  Wed, 22 May 2013 17:32:23 +0100
+  [ Oliver Grawert ]
+  * add live-build script for subarch specific Ubuntu Touch initrd
+    and boot image creation
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Mon, 27 May 2013 14:34:17 +0200
 
 livecd-rootfs (2.134) saucy; urgency=low
 
diff --git a/live-build/auto/build b/live-build/auto/build
index c6a068ba..ef730b2d 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -403,6 +403,33 @@ if [ "$SUBARCH" = "ac100" ] || [ "$SUBARCH" = "nexus7" ]; then
 
 fi
 
+if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
+	for subarch in maguro manta grouper mako; do
+
+		lb chroot_proc install "$@"
+		lb chroot_sysfs install "$@"
+		lb chroot_devpts install "$@"
+
+		kpkg="$(apt-cache depends linux-image-$subarch|grep Depends|sed -e 's/  Depends: //')"
+		kver=${kpkg#linux-image-}
+		Chroot chroot "apt-get -y install $kpkg"
+
+		bootimgcfg="/usr/share/initramfs-tools-ubuntu-touch/bootimg.cfg-${subarch}"
+		Chroot chroot "env FLASH_KERNEL_SKIP=1 update-initramfs -k $kver -t -u -v"
+		Chroot chroot "abootimg --create /boot/bootimg-${subarch}.img -f $bootimgcfg -r /boot/initrd.img-${kver} -k /boot/vmlinuz-${kver}"
+
+		Chroot chroot "apt-get -y purge $kpkg"
+
+		lb chroot_devpts remove "$@"
+		lb chroot_sysfs remove "$@"
+		lb chroot_proc remove "$@"
+
+		cp "chroot/boot/bootimg-${subarch}.img" "$PREFIX-${subarch}-boot.img"
+		rm "chroot/boot/bootimg-${subarch}.img" "/chroot/boot/initrd.img-"* "/chroot/boot/vmlinuz-"*
+	done
+	Chroot chroot "apt-get -y purge crda wireless-regdb"
+fi
+
 # LTSP chroot building (only in 32bit and for Edubuntu (DVD))
 case $PROJECT in
 	edubuntu-dvd)

From 878953785b523cdfaf9f21878b30662f74c2e854 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Mon, 27 May 2013 14:59:11 +0200
Subject: [PATCH 05/54] releasing version 2.135

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

diff --git a/debian/changelog b/debian/changelog
index bd9c69fe..7db25f7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-livecd-rootfs (2.135) UNRELEASED; urgency=low
+livecd-rootfs (2.135) saucy; urgency=low
 
   [ Colin Watson ]
   * BuildLiveCD: Time out lockfile after 12 hours, which should be enough

From b870dec921143a9bc7bfcbafcbc2ea9473f21f51 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Mon, 27 May 2013 18:16:06 +0200
Subject: [PATCH 06/54] determine the value for $kver inside the chroot, use -c
 and drop -t with update-initramfs for ubuntu-touch

---
 debian/changelog      | 7 +++++++
 live-build/auto/build | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7db25f7e..87ccf6de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.136) UNRELEASED; urgency=low
+
+  * ubuntu-touch: determine the value for $kver inside the chroot, not
+    outside. Use -c and drop -t with update-initramfs
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Mon, 27 May 2013 18:13:05 +0200
+
 livecd-rootfs (2.135) saucy; urgency=low
 
   [ Colin Watson ]
diff --git a/live-build/auto/build b/live-build/auto/build
index ef730b2d..d44aecde 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -410,12 +410,12 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
 		lb chroot_sysfs install "$@"
 		lb chroot_devpts install "$@"
 
-		kpkg="$(apt-cache depends linux-image-$subarch|grep Depends|sed -e 's/  Depends: //')"
+		kpkg="$(Chroot chroot apt-cache depends linux-image-$subarch|grep Depends|sed -e 's/  Depends: //')"
 		kver=${kpkg#linux-image-}
 		Chroot chroot "apt-get -y install $kpkg"
 
 		bootimgcfg="/usr/share/initramfs-tools-ubuntu-touch/bootimg.cfg-${subarch}"
-		Chroot chroot "env FLASH_KERNEL_SKIP=1 update-initramfs -k $kver -t -u -v"
+		Chroot chroot "env FLASH_KERNEL_SKIP=1 update-initramfs -k $kver -c -v"
 		Chroot chroot "abootimg --create /boot/bootimg-${subarch}.img -f $bootimgcfg -r /boot/initrd.img-${kver} -k /boot/vmlinuz-${kver}"
 
 		Chroot chroot "apt-get -y purge $kpkg"

From 6b08ca545e276d69f071f6b7275b89b689324f2f Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Mon, 27 May 2013 18:16:24 +0200
Subject: [PATCH 07/54] releasing version 2.136

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

diff --git a/debian/changelog b/debian/changelog
index 87ccf6de..8d767d67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-livecd-rootfs (2.136) UNRELEASED; urgency=low
+livecd-rootfs (2.136) saucy; urgency=low
 
   * ubuntu-touch: determine the value for $kver inside the chroot, not
     outside. Use -c and drop -t with update-initramfs

From e7feae48381b040de7ddf7d6e71a31942949a221 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Mon, 27 May 2013 18:26:52 +0200
Subject: [PATCH 08/54] clean chroot/var/lib/initramfs-tools/ after building
 initrds

---
 debian/changelog      | 6 ++++++
 live-build/auto/build | 1 +
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8d767d67..ea3d7629 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.137) UNRELEASED; urgency=low
+
+  * clear up /var/lib/initramfs-tools/ in teh chroot after building initrds
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Mon, 27 May 2013 18:25:51 +0200
+
 livecd-rootfs (2.136) saucy; urgency=low
 
   * ubuntu-touch: determine the value for $kver inside the chroot, not
diff --git a/live-build/auto/build b/live-build/auto/build
index d44aecde..8ff3db2e 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -427,6 +427,7 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
 		cp "chroot/boot/bootimg-${subarch}.img" "$PREFIX-${subarch}-boot.img"
 		rm "chroot/boot/bootimg-${subarch}.img" "/chroot/boot/initrd.img-"* "/chroot/boot/vmlinuz-"*
 	done
+	rm -rf chroot/var/lib/initramfs-tools/*
 	Chroot chroot "apt-get -y purge crda wireless-regdb"
 fi
 

From d7ec3fcc955d483c555c4ef5256c4a82b616a617 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Tue, 28 May 2013 11:14:39 +0200
Subject: [PATCH 09/54] remove ubuntu-touch/hooks/49-setup-demo-assets.chroot

---
 debian/changelog                                  |  5 +++--
 .../hooks/49-setup-demo-assets.chroot             | 15 ---------------
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100755 live-build/ubuntu-touch/hooks/49-setup-demo-assets.chroot

diff --git a/debian/changelog b/debian/changelog
index ea3d7629..a0efeb17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 livecd-rootfs (2.137) UNRELEASED; urgency=low
 
-  * clear up /var/lib/initramfs-tools/ in teh chroot after building initrds
+  * clear up /var/lib/initramfs-tools/ in the chroot after building initrds
+  * remove ubuntu-touch/hooks/49-setup-demo-assets.chroot
 
- -- Oliver Grawert <ogra@ubuntu.com>  Mon, 27 May 2013 18:25:51 +0200
+ -- Oliver Grawert <ogra@ubuntu.com>  Tue, 28 May 2013 11:13:57 +0200
 
 livecd-rootfs (2.136) saucy; urgency=low
 
diff --git a/live-build/ubuntu-touch/hooks/49-setup-demo-assets.chroot b/live-build/ubuntu-touch/hooks/49-setup-demo-assets.chroot
deleted file mode 100755
index feb5d70e..00000000
--- a/live-build/ubuntu-touch/hooks/49-setup-demo-assets.chroot
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# Extract pictures to user
-tar -C /home/phablet/Pictures/ --strip-components=1 -xzf \
-    /usr/share/demo-assets/pictures.tgz
-chown -R phablet:phablet /home/phablet/Pictures
-
-# Copy videos to user
-cp -p /usr/share/demo-assets/videos/* /home/phablet/Videos/
-chown -R phablet:phablet /home/phablet/Videos
-
-# Set up fake telepathy-logger data
-mkdir -p /home/phablet/.local/share/TpLogger/logs
-cp -aRp /usr/share/demo-assets/telephony-app/* /home/phablet/.local/share/TpLogger/logs
-chown -R phablet.phablet /home/phablet/.local/

From 3ff5a4a4db2176963ce41bcc60dbea9e7af93794 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Tue, 28 May 2013 11:45:43 +0200
Subject: [PATCH 10/54] handle sources.list in ubuntu-touch initrd creation

---
 debian/changelog      |  1 +
 live-build/auto/build | 30 ++++++++++++++++++++++--------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a0efeb17..e57abf78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ livecd-rootfs (2.137) UNRELEASED; urgency=low
 
   * clear up /var/lib/initramfs-tools/ in the chroot after building initrds
   * remove ubuntu-touch/hooks/49-setup-demo-assets.chroot
+  * handle sources.list in ubuntu-touch initrd creation
 
  -- Oliver Grawert <ogra@ubuntu.com>  Tue, 28 May 2013 11:13:57 +0200
 
diff --git a/live-build/auto/build b/live-build/auto/build
index 8ff3db2e..e093e98b 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -404,12 +404,19 @@ if [ "$SUBARCH" = "ac100" ] || [ "$SUBARCH" = "nexus7" ]; then
 fi
 
 if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
-	for subarch in maguro manta grouper mako; do
+	touchsubarches="maguro manta grouper mako"
 
-		lb chroot_proc install "$@"
-		lb chroot_sysfs install "$@"
-		lb chroot_devpts install "$@"
+	sourceslist="chroot/etc/apt/sources.list"
 
+	lb chroot_proc install "$@"
+	lb chroot_sysfs install "$@"
+	lb chroot_devpts install "$@"
+
+	mv "${sourceslist}" "${sourceslist}.orig"
+	echo "deb http://ftpmaster.internal/ubuntu/ $codename main universe" >$sourceslist
+	Chroot chroot "apt-get -y update"
+
+	for subarch in $touchsubarches; do
 		kpkg="$(Chroot chroot apt-cache depends linux-image-$subarch|grep Depends|sed -e 's/  Depends: //')"
 		kver=${kpkg#linux-image-}
 		Chroot chroot "apt-get -y install $kpkg"
@@ -420,15 +427,22 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
 
 		Chroot chroot "apt-get -y purge $kpkg"
 
-		lb chroot_devpts remove "$@"
-		lb chroot_sysfs remove "$@"
-		lb chroot_proc remove "$@"
-
 		cp "chroot/boot/bootimg-${subarch}.img" "$PREFIX-${subarch}-boot.img"
 		rm "chroot/boot/bootimg-${subarch}.img" "/chroot/boot/initrd.img-"* "/chroot/boot/vmlinuz-"*
 	done
+
+	lb chroot_devpts remove "$@"
+	lb chroot_sysfs remove "$@"
+	lb chroot_proc remove "$@"
+
 	rm -rf chroot/var/lib/initramfs-tools/*
 	Chroot chroot "apt-get -y purge crda wireless-regdb"
+	Chroot chroot "apt-get -y clean"
+
+	mv $sourceslist.orig $sourceslist
+	for file in $(find chroot/var/lib/apt/lists/ -name ftpmaster.internal*); do
+		rm $file
+	done
 fi
 
 # LTSP chroot building (only in 32bit and for Edubuntu (DVD))

From 78d65603c60d250de13e3b67cbc8cf89c1618bc5 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Tue, 28 May 2013 11:46:14 +0200
Subject: [PATCH 11/54] releasing version 2.137

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

diff --git a/debian/changelog b/debian/changelog
index e57abf78..aee51826 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-livecd-rootfs (2.137) UNRELEASED; urgency=low
+livecd-rootfs (2.137) saucy; urgency=low
 
   * clear up /var/lib/initramfs-tools/ in the chroot after building initrds
   * remove ubuntu-touch/hooks/49-setup-demo-assets.chroot

From f95a12af846a0c76f1401ed7236ece68f7c464c7 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Tue, 28 May 2013 15:18:43 +0200
Subject: [PATCH 12/54] also move the sources.list.d dir out of the way on
 ubuntu-touch

---
 debian/changelog      | 6 ++++++
 live-build/auto/build | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index aee51826..b2cf42bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.138) UNRELEASED; urgency=low
+
+  * also move the sources.list.d dir out of the way on ubuntu-touch
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Tue, 28 May 2013 15:17:46 +0200
+
 livecd-rootfs (2.137) saucy; urgency=low
 
   * clear up /var/lib/initramfs-tools/ in the chroot after building initrds
diff --git a/live-build/auto/build b/live-build/auto/build
index e093e98b..f8817839 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -413,6 +413,7 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
 	lb chroot_devpts install "$@"
 
 	mv "${sourceslist}" "${sourceslist}.orig"
+	mv "${sourceslist}.d" "${sourceslist}.d.orig"
 	echo "deb http://ftpmaster.internal/ubuntu/ $codename main universe" >$sourceslist
 	Chroot chroot "apt-get -y update"
 
@@ -439,7 +440,8 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
 	Chroot chroot "apt-get -y purge crda wireless-regdb"
 	Chroot chroot "apt-get -y clean"
 
-	mv $sourceslist.orig $sourceslist
+	mv "${sourceslist}.orig" "${sourceslist}"
+	mv "${sourceslist}.d.orig" "${sourceslist}.d"
 	for file in $(find chroot/var/lib/apt/lists/ -name ftpmaster.internal*); do
 		rm $file
 	done

From ef88505296216074ef2d67dc6d6f10c7c8233769 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Tue, 28 May 2013 15:19:14 +0200
Subject: [PATCH 13/54] releasing version 2.138

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

diff --git a/debian/changelog b/debian/changelog
index b2cf42bf..eb72366b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-livecd-rootfs (2.138) UNRELEASED; urgency=low
+livecd-rootfs (2.138) saucy; urgency=low
 
   * also move the sources.list.d dir out of the way on ubuntu-touch
 

From c4064d69e010aff3713650cfde6fa53982d23c3f Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Wed, 29 May 2013 12:12:41 +0200
Subject: [PATCH 14/54] fix resolv.conf for ubuntu-touch initramfs creation

---
 debian/changelog      |  6 ++++++
 live-build/auto/build | 12 ++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index eb72366b..1a1132ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.139) UNRELEASED; urgency=low
+
+  * fix resolv.conf for ubuntu-touch initramfs creation
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Wed, 29 May 2013 12:10:53 +0200
+
 livecd-rootfs (2.138) saucy; urgency=low
 
   * also move the sources.list.d dir out of the way on ubuntu-touch
diff --git a/live-build/auto/build b/live-build/auto/build
index f8817839..31e0d181 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -412,6 +412,13 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
 	lb chroot_sysfs install "$@"
 	lb chroot_devpts install "$@"
 
+	if [ -e chroot/etc/resolv.conf ]; then
+		mv chroot/etc/resolv.conf chroot/etc/resolv.conf.orig
+	fi
+	if [ -e /etc/resolv.conf ]; then
+		cp /etc/resolv.conf chroot/etc/resolv.conf
+	fi
+
 	mv "${sourceslist}" "${sourceslist}.orig"
 	mv "${sourceslist}.d" "${sourceslist}.d.orig"
 	echo "deb http://ftpmaster.internal/ubuntu/ $codename main universe" >$sourceslist
@@ -445,6 +452,11 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
 	for file in $(find chroot/var/lib/apt/lists/ -name ftpmaster.internal*); do
 		rm $file
 	done
+	if [ -e chroot/etc/resolv.conf.orig ]; then
+		mv chroot/etc/resolv.conf.orig chroot/etc/resolv.conf
+	else
+		rm chroot/etc/resolv.conf
+	fi
 fi
 
 # LTSP chroot building (only in 32bit and for Edubuntu (DVD))

From e7dd52b4ef1dfd225f63f9328c562461696b77d0 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Wed, 29 May 2013 12:13:11 +0200
Subject: [PATCH 15/54] releasing version 2.139

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

diff --git a/debian/changelog b/debian/changelog
index 1a1132ba..0747ace8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-livecd-rootfs (2.139) UNRELEASED; urgency=low
+livecd-rootfs (2.139) saucy; urgency=low
 
   * fix resolv.conf for ubuntu-touch initramfs creation
 

From 7535aeaedf66bd551c3409ed3f2c93d93d776d6f Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Wed, 29 May 2013 14:23:01 +0200
Subject: [PATCH 16/54] hardcode dist in the temporary sources.list of the
 ubuntu-touch initrd creation for a test

---
 debian/changelog      | 7 +++++++
 live-build/auto/build | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0747ace8..d3e0be13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.140) UNRELEASED; urgency=low
+
+  *  hardcode dist in the temporary sources.list of the ubuntu-touch initrd
+     creation for a test
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Wed, 29 May 2013 14:20:34 +0200
+
 livecd-rootfs (2.139) saucy; urgency=low
 
   * fix resolv.conf for ubuntu-touch initramfs creation
diff --git a/live-build/auto/build b/live-build/auto/build
index 31e0d181..033c0bdb 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -421,7 +421,7 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
 
 	mv "${sourceslist}" "${sourceslist}.orig"
 	mv "${sourceslist}.d" "${sourceslist}.d.orig"
-	echo "deb http://ftpmaster.internal/ubuntu/ $codename main universe" >$sourceslist
+	echo "deb http://ftpmaster.internal/ubuntu/ saucy main universe" >$sourceslist
 	Chroot chroot "apt-get -y update"
 
 	for subarch in $touchsubarches; do

From 39ead9c9d489a202c55573438dbc077993f616b5 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Wed, 29 May 2013 14:23:33 +0200
Subject: [PATCH 17/54] releasing version 2.140

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

diff --git a/debian/changelog b/debian/changelog
index d3e0be13..d38882ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-livecd-rootfs (2.140) UNRELEASED; urgency=low
+livecd-rootfs (2.140) saucy; urgency=low
 
   *  hardcode dist in the temporary sources.list of the ubuntu-touch initrd
      creation for a test

From 2afcb7b21c82829ea1ae892f173696eae5c5606f Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Wed, 29 May 2013 16:28:49 +0200
Subject: [PATCH 18/54] make failing removal of non existing old initrds non
 fatal in ubuntu-touch

---
 debian/changelog      | 6 ++++++
 live-build/auto/build | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d38882ca..817992b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.141) UNRELEASED; urgency=low
+
+  * make removal of non existing old initrds non fatal in ubuntu-touch
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Wed, 29 May 2013 16:25:18 +0200
+
 livecd-rootfs (2.140) saucy; urgency=low
 
   *  hardcode dist in the temporary sources.list of the ubuntu-touch initrd
diff --git a/live-build/auto/build b/live-build/auto/build
index 033c0bdb..fdb2b908 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -435,8 +435,7 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
 
 		Chroot chroot "apt-get -y purge $kpkg"
 
-		cp "chroot/boot/bootimg-${subarch}.img" "$PREFIX-${subarch}-boot.img"
-		rm "chroot/boot/bootimg-${subarch}.img" "/chroot/boot/initrd.img-"* "/chroot/boot/vmlinuz-"*
+		cp "chroot/boot/bootimg-${subarch}.img" "$PREFIX-boot-${subarch}.img"
 	done
 
 	lb chroot_devpts remove "$@"
@@ -457,6 +456,7 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
 	else
 		rm chroot/etc/resolv.conf
 	fi
+	rm -rf chroot/boot/* || true
 fi
 
 # LTSP chroot building (only in 32bit and for Edubuntu (DVD))

From 030f6830d1c02b2b89f1ab7828d977fe237be085 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Wed, 29 May 2013 16:29:07 +0200
Subject: [PATCH 19/54] releasing version 2.141

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

diff --git a/debian/changelog b/debian/changelog
index 817992b1..a3454ce8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-livecd-rootfs (2.141) UNRELEASED; urgency=low
+livecd-rootfs (2.141) saucy; urgency=low
 
   * make removal of non existing old initrds non fatal in ubuntu-touch
 

From b932a9dbf2fa6b803e898e2e127814bc208e0fbc Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Wed, 29 May 2013 16:55:14 +0200
Subject: [PATCH 20/54] copy the initrd out of the chroot before we purge the
 kernel package on ubuntu-touch

---
 debian/changelog      | 7 +++++++
 live-build/auto/build | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a3454ce8..82f86434 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.142) UNRELEASED; urgency=low
+
+  * copy the initrd out of the chroot before we purge the kernel package on
+    ubuntu-touch
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Wed, 29 May 2013 16:53:56 +0200
+
 livecd-rootfs (2.141) saucy; urgency=low
 
   * make removal of non existing old initrds non fatal in ubuntu-touch
diff --git a/live-build/auto/build b/live-build/auto/build
index fdb2b908..a1ca0f8f 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -433,9 +433,9 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
 		Chroot chroot "env FLASH_KERNEL_SKIP=1 update-initramfs -k $kver -c -v"
 		Chroot chroot "abootimg --create /boot/bootimg-${subarch}.img -f $bootimgcfg -r /boot/initrd.img-${kver} -k /boot/vmlinuz-${kver}"
 
-		Chroot chroot "apt-get -y purge $kpkg"
-
 		cp "chroot/boot/bootimg-${subarch}.img" "$PREFIX-boot-${subarch}.img"
+
+		Chroot chroot "apt-get -y purge $kpkg"
 	done
 
 	lb chroot_devpts remove "$@"

From 62855904b2f58c35675f3c559124676a9195ede7 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Wed, 29 May 2013 16:55:33 +0200
Subject: [PATCH 21/54] releasing version 2.142

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

diff --git a/debian/changelog b/debian/changelog
index 82f86434..6dda28c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-livecd-rootfs (2.142) UNRELEASED; urgency=low
+livecd-rootfs (2.142) saucy; urgency=low
 
   * copy the initrd out of the chroot before we purge the kernel package on
     ubuntu-touch

From 2756b26952cb2c41d5cbccf766aa0778bfe5b80d Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Wed, 29 May 2013 21:50:21 +0200
Subject: [PATCH 22/54] drop ubuntu-tuch cleanup code, should not affect teh
 tarball. fix quoting of abootimg and update-initramfs calls

---
 debian/changelog      |  9 +++++++++
 live-build/auto/build | 22 +++-------------------
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6dda28c8..0f2e20b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+livecd-rootfs (2.143) UNRELEASED; urgency=low
+
+  * drop all the cleanup code, we already have the tarball and don't need to
+    clean the chroot.
+  * add better quoting for update-initramfs and abootimg calls for
+    ubuntu-touch
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Wed, 29 May 2013 21:47:03 +0200
+
 livecd-rootfs (2.142) saucy; urgency=low
 
   * copy the initrd out of the chroot before we purge the kernel package on
diff --git a/live-build/auto/build b/live-build/auto/build
index a1ca0f8f..9f43f6e2 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -430,10 +430,10 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
 		Chroot chroot "apt-get -y install $kpkg"
 
 		bootimgcfg="/usr/share/initramfs-tools-ubuntu-touch/bootimg.cfg-${subarch}"
-		Chroot chroot "env FLASH_KERNEL_SKIP=1 update-initramfs -k $kver -c -v"
-		Chroot chroot "abootimg --create /boot/bootimg-${subarch}.img -f $bootimgcfg -r /boot/initrd.img-${kver} -k /boot/vmlinuz-${kver}"
+		Chroot chroot "env FLASH_KERNEL_SKIP=1 update-initramfs -k ${kver} -c -v"
+		Chroot chroot "abootimg --create /boot/bootimg-${subarch}.img -f ${bootimgcfg} -r /boot/initrd.img-${kver} -k /boot/vmlinuz-${kver}"
 
-		cp "chroot/boot/bootimg-${subarch}.img" "$PREFIX-boot-${subarch}.img"
+		cp "chroot/boot/bootimg-${subarch}.img" "$PREFIX-${subarch}.bootimg"
 
 		Chroot chroot "apt-get -y purge $kpkg"
 	done
@@ -441,22 +441,6 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
 	lb chroot_devpts remove "$@"
 	lb chroot_sysfs remove "$@"
 	lb chroot_proc remove "$@"
-
-	rm -rf chroot/var/lib/initramfs-tools/*
-	Chroot chroot "apt-get -y purge crda wireless-regdb"
-	Chroot chroot "apt-get -y clean"
-
-	mv "${sourceslist}.orig" "${sourceslist}"
-	mv "${sourceslist}.d.orig" "${sourceslist}.d"
-	for file in $(find chroot/var/lib/apt/lists/ -name ftpmaster.internal*); do
-		rm $file
-	done
-	if [ -e chroot/etc/resolv.conf.orig ]; then
-		mv chroot/etc/resolv.conf.orig chroot/etc/resolv.conf
-	else
-		rm chroot/etc/resolv.conf
-	fi
-	rm -rf chroot/boot/* || true
 fi
 
 # LTSP chroot building (only in 32bit and for Edubuntu (DVD))

From 8dcb28d59373a1a9cdfd87d7ac49442f19dc6b29 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Wed, 29 May 2013 21:50:53 +0200
Subject: [PATCH 23/54] releasing version 2.143

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

diff --git a/debian/changelog b/debian/changelog
index 0f2e20b8..a3816f09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-livecd-rootfs (2.143) UNRELEASED; urgency=low
+livecd-rootfs (2.143) saucy; urgency=low
 
   * drop all the cleanup code, we already have the tarball and don't need to
     clean the chroot.

From 1b5c986fbb507a1869dcbe9d5d9e2f00083d4846 Mon Sep 17 00:00:00 2001
From: Adam Conrad <adconrad@0c3.net>
Date: Wed, 29 May 2013 16:42:47 -0600
Subject: [PATCH 24/54] Clean up subarch loop for touch subarches to skip
 unwanted deps.

---
 debian/changelog      | 6 ++++++
 live-build/auto/build | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a3816f09..c9e24134 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.144) saucy; urgency=low
+
+  * Clean up subarch loop for touch subarches to skip unwanted deps.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Wed, 29 May 2013 16:41:24 -0600
+
 livecd-rootfs (2.143) saucy; urgency=low
 
   * drop all the cleanup code, we already have the tarball and don't need to
diff --git a/live-build/auto/build b/live-build/auto/build
index 9f43f6e2..8e8dd38e 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -425,7 +425,7 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
 	Chroot chroot "apt-get -y update"
 
 	for subarch in $touchsubarches; do
-		kpkg="$(Chroot chroot apt-cache depends linux-image-$subarch|grep Depends|sed -e 's/  Depends: //')"
+		kpkg="$(Chroot chroot apt-cache depends linux-image-$subarch|awk '/Depends: linux-image/ {print $2}')"
 		kver=${kpkg#linux-image-}
 		Chroot chroot "apt-get -y install $kpkg"
 

From e7c4acc158506ba66a357cbb5eadace357b50be9 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Thu, 30 May 2013 12:15:42 +0200
Subject: [PATCH 25/54] adjust naming of the touch bootimg files so cdimage
 picks them up for publishing

---
 debian/changelog      | 6 ++++++
 live-build/auto/build | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c9e24134..2bc3c25f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.145) UNRELEASED; urgency=low
+
+  * adjust naming of the bootimg files so cdimage picks them up for publishing
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Thu, 30 May 2013 12:14:38 +0200
+
 livecd-rootfs (2.144) saucy; urgency=low
 
   * Clean up subarch loop for touch subarches to skip unwanted deps.
diff --git a/live-build/auto/build b/live-build/auto/build
index 8e8dd38e..969ed20a 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -433,7 +433,8 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
 		Chroot chroot "env FLASH_KERNEL_SKIP=1 update-initramfs -k ${kver} -c -v"
 		Chroot chroot "abootimg --create /boot/bootimg-${subarch}.img -f ${bootimgcfg} -r /boot/initrd.img-${kver} -k /boot/vmlinuz-${kver}"
 
-		cp "chroot/boot/bootimg-${subarch}.img" "$PREFIX-${subarch}.bootimg"
+		cp "chroot/boot/bootimg-${subarch}.img" "$PREFIX.bootimg-${subarch}"
+		ln -sf "$PREFIX.bootimg-${subarch}" "$PREFIX.bootimg"
 
 		Chroot chroot "apt-get -y purge $kpkg"
 	done

From 42cd75eac75921d157537f96ed56b2667159316b Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Thu, 30 May 2013 12:16:00 +0200
Subject: [PATCH 26/54] releasing version 2.145

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

diff --git a/debian/changelog b/debian/changelog
index 2bc3c25f..b4a3be2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-livecd-rootfs (2.145) UNRELEASED; urgency=low
+livecd-rootfs (2.145) saucy; urgency=low
 
   * adjust naming of the bootimg files so cdimage picks them up for publishing
 

From 04ac56d2b6837e7f56023313697f1ce31ba60589 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Thu, 30 May 2013 18:22:37 +0200
Subject: [PATCH 27/54] drop the generic .bootimg from ubuntu-touch, all boot
 images we need have to be subarch tagged

---
 debian/changelog      | 7 +++++++
 live-build/auto/build | 1 -
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b4a3be2e..199fd912 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.145ubuntu1) UNRELEASED; urgency=low
+
+  * drop the generic .bootimg from ubuntu-touch, all boot images we need have
+    to be subarch tagged
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Thu, 30 May 2013 18:21:06 +0200
+
 livecd-rootfs (2.145) saucy; urgency=low
 
   * adjust naming of the bootimg files so cdimage picks them up for publishing
diff --git a/live-build/auto/build b/live-build/auto/build
index 969ed20a..9a55659c 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -434,7 +434,6 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
 		Chroot chroot "abootimg --create /boot/bootimg-${subarch}.img -f ${bootimgcfg} -r /boot/initrd.img-${kver} -k /boot/vmlinuz-${kver}"
 
 		cp "chroot/boot/bootimg-${subarch}.img" "$PREFIX.bootimg-${subarch}"
-		ln -sf "$PREFIX.bootimg-${subarch}" "$PREFIX.bootimg"
 
 		Chroot chroot "apt-get -y purge $kpkg"
 	done

From 7519449f20c668381af8f017ae1cff3f5b701e10 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Thu, 30 May 2013 18:23:09 +0200
Subject: [PATCH 28/54] releasing version 2.146

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

diff --git a/debian/changelog b/debian/changelog
index 199fd912..53661d9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-livecd-rootfs (2.145ubuntu1) UNRELEASED; urgency=low
+livecd-rootfs (2.146) saucy; urgency=low
 
   * drop the generic .bootimg from ubuntu-touch, all boot images we need have
     to be subarch tagged

From be72ae03217487fc8724960a6948481e019d97bc Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Mon, 3 Jun 2013 09:58:33 +0200
Subject: [PATCH 29/54] sync ubuntu-touch customzation scripts with phablet
 build tree

---
 debian/changelog                              |  6 ++++
 .../hooks/02-add_user_to_groups.chroot        | 29 +++++++++++++++++--
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 53661d9f..e04b0e7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.147) UNRELEASED; urgency=low
+
+  * sync ubuntu-touch customzation scripts with phablet build tree 
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Mon, 03 Jun 2013 09:56:15 +0200
+
 livecd-rootfs (2.146) saucy; urgency=low
 
   * drop the generic .bootimg from ubuntu-touch, all boot images we need have
diff --git a/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot b/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot
index 97d5877a..4c055b3d 100755
--- a/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot
+++ b/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot
@@ -2,7 +2,7 @@
 
 USER=phablet
 
-DEFGROUPS="tty,admin,adm,dialout,cdrom,plugdev,audio,dip,video,android_net,android_net2,android_net3,android_graphics,android_input,sdcard_rw"
+DEFGROUPS="tty,admin,adm,dialout,cdrom,plugdev,audio,dip,video,gps,radio,bluetooth,android_net,android_net2,android_net3,android_graphics,android_input,sdcard_rw"
 
 /bin/egrep  -i "^admin" /etc/group
 if [ $? -eq 0 ]; then
@@ -41,10 +41,12 @@ else
 fi
 /bin/egrep  -i "^audio" /etc/group
 if [ $? -eq 0 ]; then
-   echo "User audio exists in /etc/group"
+   # Needed to change group id as audio is already created by ubuntu
+   echo "User audio exists in /etc/group, changing gid to be android compatible"
+   groupmod -g 1005 audio
 else
    echo "User audio does not exists in /etc/group must create"
-   groupadd audio
+   groupadd -g 1005 audio
 fi
 /bin/egrep  -i "^dip" /etc/group
 if [ $? -eq 0 ]; then
@@ -67,6 +69,27 @@ else
    echo "User adm does not exists in /etc/group must create"
    groupadd adm
 fi
+/bin/egrep  -i "^gps" /etc/group
+if [ $? -eq 0 ]; then
+   echo "User gps exists in /etc/group"
+else
+   echo "User gps does not exist in /etc/group -- must create"
+   groupadd -g 1021 gps
+fi
+/bin/egrep  -i "^radio" /etc/group
+if [ $? -eq 0 ]; then
+   echo "User radio exists in /etc/group"
+else
+   echo "User radio does not exist in /etc/group -- must create"
+   groupadd -g 1001 radio
+fi
+/bin/egrep  -i "^bluetooth" /etc/group
+if [ $? -eq 0 ]; then
+   echo "User bluetooth exists in /etc/group"
+else
+   echo "User bluetooth does not exist in /etc/group -- must create"
+   groupadd -g 1002 bluetooth
+fi
 /bin/egrep  -i "^android_net" /etc/group
 if [ $? -eq 0 ]; then
    echo "User android_net exists in /etc/group"

From 295a31627fd5f8c8b6a59d2bfa700778b78ebaa9 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Mon, 3 Jun 2013 09:59:21 +0200
Subject: [PATCH 30/54] releasing version 2.147

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

diff --git a/debian/changelog b/debian/changelog
index e04b0e7d..a0613f11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-livecd-rootfs (2.147) UNRELEASED; urgency=low
+livecd-rootfs (2.147) saucy; urgency=low
 
   * sync ubuntu-touch customzation scripts with phablet build tree 
 

From 699ed3f6a116028ae44accb91b3058f542556e3e Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Wed, 5 Jun 2013 13:12:26 +0100
Subject: [PATCH 31/54] 
 live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot: Delete redundant
 code to create global static groups, which are already created more correctly
 by base-passwd on every Ubuntu system.

---
 debian/changelog                              |  8 +++
 .../hooks/02-add_user_to_groups.chroot        | 49 -------------------
 2 files changed, 8 insertions(+), 49 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a0613f11..d552ccd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.148) UNRELEASED; urgency=low
+
+  * live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot: Delete
+    redundant code to create global static groups, which are already created
+    more correctly by base-passwd on every Ubuntu system.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 05 Jun 2013 13:11:34 +0100
+
 livecd-rootfs (2.147) saucy; urgency=low
 
   * sync ubuntu-touch customzation scripts with phablet build tree 
diff --git a/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot b/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot
index 4c055b3d..1b84bb04 100755
--- a/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot
+++ b/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot
@@ -11,34 +11,6 @@ else
    echo "User admin does not exists in /etc/group must create"
    groupadd admin
 fi
-/bin/egrep  -i "^tty" /etc/group
-if [ $? -eq 0 ]; then
-   echo "User tty exists in /etc/group"
-else
-   echo "User tty does not exists in /etc/group must create"
-   groupadd tty
-fi
-/bin/egrep  -i "^dialout" /etc/group
-if [ $? -eq 0 ]; then
-   echo "User dialout exists in /etc/group"
-else
-   echo "User dialout does not exists in /etc/group must create"
-   groupadd dialout
-fi
-/bin/egrep  -i "^cdrom" /etc/group
-if [ $? -eq 0 ]; then
-   echo "User cdrom exists in /etc/group"
-else
-   echo "User cdrom does not exists in /etc/group must create"
-   groupadd cdrom 
-fi
-/bin/egrep  -i "^plugdev" /etc/group
-if [ $? -eq 0 ]; then
-   echo "User plugdev exists in /etc/group"
-else
-   echo "User plugdev does not exists in /etc/group must create"
-   groupadd plugdev
-fi
 /bin/egrep  -i "^audio" /etc/group
 if [ $? -eq 0 ]; then
    # Needed to change group id as audio is already created by ubuntu
@@ -48,27 +20,6 @@ else
    echo "User audio does not exists in /etc/group must create"
    groupadd -g 1005 audio
 fi
-/bin/egrep  -i "^dip" /etc/group
-if [ $? -eq 0 ]; then
-   echo "User dip exists in /etc/group"
-else
-   echo "User dip does not exists in /etc/group must create"
-   groupadd dip
-fi
-/bin/egrep  -i "^video" /etc/group
-if [ $? -eq 0 ]; then
-   echo "User video exists in /etc/group"
-else
-   echo "User video does not exists in /etc/group must create"
-   groupadd video
-fi
-/bin/egrep  -i "^adm" /etc/group
-if [ $? -eq 0 ]; then
-   echo "User adm exists in /etc/group"
-else
-   echo "User adm does not exists in /etc/group must create"
-   groupadd adm
-fi
 /bin/egrep  -i "^gps" /etc/group
 if [ $? -eq 0 ]; then
    echo "User gps exists in /etc/group"

From d3f766d5daf9c87d5faff730253487bed4a1fc43 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Wed, 5 Jun 2013 13:13:48 +0100
Subject: [PATCH 32/54] 
 live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot: Fix detection of
 existing groups not to misfire if there is an existing group with the desired
 group name as a prefix.

---
 debian/changelog                              |  3 +++
 .../hooks/02-add_user_to_groups.chroot        | 22 +++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d552ccd1..3862d74f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ livecd-rootfs (2.148) UNRELEASED; urgency=low
   * live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot: Delete
     redundant code to create global static groups, which are already created
     more correctly by base-passwd on every Ubuntu system.
+  * live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot: Fix
+    detection of existing groups not to misfire if there is an existing
+    group with the desired group name as a prefix.
 
  -- Colin Watson <cjwatson@ubuntu.com>  Wed, 05 Jun 2013 13:11:34 +0100
 
diff --git a/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot b/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot
index 1b84bb04..2f4b20d3 100755
--- a/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot
+++ b/live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot
@@ -4,14 +4,14 @@ USER=phablet
 
 DEFGROUPS="tty,admin,adm,dialout,cdrom,plugdev,audio,dip,video,gps,radio,bluetooth,android_net,android_net2,android_net3,android_graphics,android_input,sdcard_rw"
 
-/bin/egrep  -i "^admin" /etc/group
+/bin/egrep  -i "^admin:" /etc/group
 if [ $? -eq 0 ]; then
    echo "User admin exists in /etc/group"
 else
    echo "User admin does not exists in /etc/group must create"
    groupadd admin
 fi
-/bin/egrep  -i "^audio" /etc/group
+/bin/egrep  -i "^audio:" /etc/group
 if [ $? -eq 0 ]; then
    # Needed to change group id as audio is already created by ubuntu
    echo "User audio exists in /etc/group, changing gid to be android compatible"
@@ -20,63 +20,63 @@ else
    echo "User audio does not exists in /etc/group must create"
    groupadd -g 1005 audio
 fi
-/bin/egrep  -i "^gps" /etc/group
+/bin/egrep  -i "^gps:" /etc/group
 if [ $? -eq 0 ]; then
    echo "User gps exists in /etc/group"
 else
    echo "User gps does not exist in /etc/group -- must create"
    groupadd -g 1021 gps
 fi
-/bin/egrep  -i "^radio" /etc/group
+/bin/egrep  -i "^radio:" /etc/group
 if [ $? -eq 0 ]; then
    echo "User radio exists in /etc/group"
 else
    echo "User radio does not exist in /etc/group -- must create"
    groupadd -g 1001 radio
 fi
-/bin/egrep  -i "^bluetooth" /etc/group
+/bin/egrep  -i "^bluetooth:" /etc/group
 if [ $? -eq 0 ]; then
    echo "User bluetooth exists in /etc/group"
 else
    echo "User bluetooth does not exist in /etc/group -- must create"
    groupadd -g 1002 bluetooth
 fi
-/bin/egrep  -i "^android_net" /etc/group
+/bin/egrep  -i "^android_net:" /etc/group
 if [ $? -eq 0 ]; then
    echo "User android_net exists in /etc/group"
 else
    echo "User android_net does not exist in /etc/group -- must create"
    groupadd -g 3003 android_net
 fi
-/bin/egrep -i "^android_net2" /etc/group
+/bin/egrep -i "^android_net2:" /etc/group
 if [ $? -eq 0 ]; then
 	echo "User android_net2 exists in /etc/group"
 else
 	echo "User android_net2 does not exist in /etc group -- must create"
 	groupadd -g 3004 android_net2
 fi
-/bin/egrep -i "^android_net3" /etc/group
+/bin/egrep -i "^android_net3:" /etc/group
 if [ $? -eq 0 ]; then
 	echo "User android_net3 exists in /etc/group"
 else
 	echo "User android_net3 does not exist in /etc group -- must create"
 	groupadd -g 3002 android_net3
 fi
-/bin/egrep -i "^android_graphics" /etc/group
+/bin/egrep -i "^android_graphics:" /etc/group
 if [ $? -eq 0 ]; then
 	echo "User android_graphics exists in /etc/group"
 else
 	echo "User android_graphics does not exist in /etc group -- must create"
 	groupadd -g 1003 android_graphics
 fi
-/bin/egrep -i "^android_input" /etc/group
+/bin/egrep -i "^android_input:" /etc/group
 if [ $? -eq 0 ]; then
 	echo "User android_input exists in /etc/group"
 else
 	echo "User android_input does not exist in /etc group -- must create"
 	groupadd -g 1004 android_input
 fi
-/bin/egrep -i "^sdcard_rw" /etc/group
+/bin/egrep -i "^sdcard_rw:" /etc/group
 if [ $? -eq 0 ]; then
 	echo "User sdcard_rw exists in /etc/group"
 else

From 63c44a6ab86600935a2957e76552ffa3781ad59b Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Mon, 10 Jun 2013 12:35:39 +0200
Subject: [PATCH 33/54] drop daily-build-next PPA from touch images

---
 debian/changelog                                   |  7 ++++++-
 .../ubuntu-unity-daily-build-next.key.chroot       | 14 --------------
 .../ubuntu-unity-daily-build-next.list.chroot      |  2 --
 3 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 live-build/ubuntu-touch/archives/ubuntu-unity-daily-build-next.key.chroot
 delete mode 100644 live-build/ubuntu-touch/archives/ubuntu-unity-daily-build-next.list.chroot

diff --git a/debian/changelog b/debian/changelog
index 3862d74f..c68fe8ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 livecd-rootfs (2.148) UNRELEASED; urgency=low
 
+  [ Colin Watson ]
   * live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot: Delete
     redundant code to create global static groups, which are already created
     more correctly by base-passwd on every Ubuntu system.
@@ -7,7 +8,11 @@ livecd-rootfs (2.148) UNRELEASED; urgency=low
     detection of existing groups not to misfire if there is an existing
     group with the desired group name as a prefix.
 
- -- Colin Watson <cjwatson@ubuntu.com>  Wed, 05 Jun 2013 13:11:34 +0100
+  [ Oliver Grawert ]
+  * drop daily-build-next PPA, according to didrocks everything from there
+    should be in the saucy archive now, yay.
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Mon, 10 Jun 2013 12:33:32 +0200
 
 livecd-rootfs (2.147) saucy; urgency=low
 
diff --git a/live-build/ubuntu-touch/archives/ubuntu-unity-daily-build-next.key.chroot b/live-build/ubuntu-touch/archives/ubuntu-unity-daily-build-next.key.chroot
deleted file mode 100644
index 26a606b4..00000000
--- a/live-build/ubuntu-touch/archives/ubuntu-unity-daily-build-next.key.chroot
+++ /dev/null
@@ -1,14 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: SKS 1.1.4
-Comment: Hostname: keyserver.ubuntu.com
-
-mI0EUKJp4AEEANqa4yLubhYUWP6NFignwYDXfSQDxD1K5m06SyuTuqI37zRI+GaFvaiNCwzK
-7Qfx4TikrpNIIIc3c1+rYSsSQQadWqJRvrbs7MixcDQGRb+SQ+bglIdD+1hw9xSvMXGO/dOa
-Zv6ZVlLxJiYWAKZuFXtugKQF2yyh0eug6/7wuRYxABEBAAG0MkxhdW5jaHBhZCBQUEEgZm9y
-IFVidW50dSBVbml0eSBQUyBpbnRlZ3JhdGlvbiB0ZWFtiLgEEwECACIFAlCiaeACGwMGCwkI
-BwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEEVRQo5S1i9FdDMEAKL25MjyO+W7+MJRiEzaV/gd
-a41lQsqLFXDWdYFaF1FqrLNa6/E5Ph+oVV6tK8O/HSeXGVgDZeEL6iBX3SvwEgLyGr33z8IZ
-22JNS5UIXmwSKO5PIx8Qs6LjOaQtAlZRDwj/5wQo9IqNclSA/hrFNH7XuHeglqITgccPCPEZ
-MByN
-=VBVL
------END PGP PUBLIC KEY BLOCK-----
diff --git a/live-build/ubuntu-touch/archives/ubuntu-unity-daily-build-next.list.chroot b/live-build/ubuntu-touch/archives/ubuntu-unity-daily-build-next.list.chroot
deleted file mode 100644
index 28cd25f1..00000000
--- a/live-build/ubuntu-touch/archives/ubuntu-unity-daily-build-next.list.chroot
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/ubuntu-unity/daily-build-next/ubuntu @DISTRIBUTION@ main
-# deb-src http://ppa.launchpad.net/ubuntu-unity/daily-build-next/ubuntu @DISTRIBUTION@ main

From e6c22c224add18f8bd1d413888ab2c5a69b98fa7 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Mon, 10 Jun 2013 12:36:17 +0200
Subject: [PATCH 34/54] releasing version 2.148

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

diff --git a/debian/changelog b/debian/changelog
index c68fe8ff..6d1912a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-livecd-rootfs (2.148) UNRELEASED; urgency=low
+livecd-rootfs (2.148) saucy; urgency=low
 
   [ Colin Watson ]
   * live-build/ubuntu-touch/hooks/02-add_user_to_groups.chroot: Delete

From 6175652e6b48dd8c6c88e705da6a3cedf0698214 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Fri, 14 Jun 2013 16:12:56 +0200
Subject: [PATCH 35/54] set QT_SELECT=qt5 in touch image environment

---
 debian/changelog                                  | 6 ++++++
 live-build/ubuntu-touch/hooks/48-setup-env.chroot | 1 +
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6d1912a7..561e4f09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.149) UNRELEASED; urgency=low
+
+  * set QT_SELECT=qt5 in touch image environment
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Fri, 14 Jun 2013 16:11:33 +0200
+
 livecd-rootfs (2.148) saucy; urgency=low
 
   [ Colin Watson ]
diff --git a/live-build/ubuntu-touch/hooks/48-setup-env.chroot b/live-build/ubuntu-touch/hooks/48-setup-env.chroot
index cc9036ca..53b40866 100755
--- a/live-build/ubuntu-touch/hooks/48-setup-env.chroot
+++ b/live-build/ubuntu-touch/hooks/48-setup-env.chroot
@@ -16,6 +16,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 ANDROID_DATA=/data
 QT_QPA_PLATFORM=ubuntu
 QML2_IMPORT_PATH=/usr/lib/arm-linux-gnueabihf/qt5/imports
+QT_SELECT=qt5
 SHLVL=1
 MKSH=/system/bin/sh
 ANDROID_ROOT=/system

From 812ef405e3962e23ad08a118c141c460a5269ba9 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Fri, 14 Jun 2013 16:13:28 +0200
Subject: [PATCH 36/54] releasing version 2.149

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

diff --git a/debian/changelog b/debian/changelog
index 561e4f09..dd4b350c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-livecd-rootfs (2.149) UNRELEASED; urgency=low
+livecd-rootfs (2.149) saucy; urgency=low
 
   * set QT_SELECT=qt5 in touch image environment
 

From 9a79d68d7d52321ab34357700449280935376b48 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Wed, 26 Jun 2013 12:23:04 +0200
Subject: [PATCH 37/54] export $NOW in BuildLiveCD and use that var inside
 Ubuntu Touch builds to create /var/log/installer/media-info

---
 BuildLiveCD           | 1 +
 debian/changelog      | 7 +++++++
 live-build/auto/build | 6 ++++++
 3 files changed, 14 insertions(+)

diff --git a/BuildLiveCD b/BuildLiveCD
index fe4aed11..2a5c1016 100755
--- a/BuildLiveCD
+++ b/BuildLiveCD
@@ -129,6 +129,7 @@ for STE in $SUITES; do
 	NOW=${NOW}.$n
     fi
     NOW=${NOW}
+    export NOW
     LOG=${PUBDIR}${NOW}/livecd-${NOW}-${ARCH}.out
 
     rm -f ${PUBDIR}latest
diff --git a/debian/changelog b/debian/changelog
index dd4b350c..4a8a3e17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.150) UNRELEASED; urgency=low
+
+  * export $NOW in BuildLiveCD so we have it available in live-build
+  * create a build stamp in /var/log/installer/media-info on Ubuntu Touch images
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Wed, 26 Jun 2013 11:32:31 +0200
+
 livecd-rootfs (2.149) saucy; urgency=low
 
   * set QT_SELECT=qt5 in touch image environment
diff --git a/live-build/auto/build b/live-build/auto/build
index 9a55659c..d678394f 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -235,6 +235,12 @@ deb file:/var/lib/preinstalled-pool/ $LB_DISTRIBUTION $LB_PARENT_ARCHIVE_AREAS
 			> chroot/etc/apt/sources.list
 		rm chroot/etc/apt/sources.list.preinstall chroot/etc/apt/sources.list.orig
 	fi
+	if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
+		INFO_DESC="$(lsb_release -d -s)"
+
+		mkdir -p chroot/var/log/installer
+		echo "$INFO_DESC - $ARCH ($NOW)" >chroot/var/log/installer/media-info
+	fi
 
 	echo "===== Checking size of /usr/share/doc ====="
 	echo BEGIN docdirs

From a01077d01e0ea2f84fcd3f7364767ffd85ff66cd Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Wed, 26 Jun 2013 12:23:29 +0200
Subject: [PATCH 38/54] releasing version 2.150

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

diff --git a/debian/changelog b/debian/changelog
index 4a8a3e17..fb395131 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-livecd-rootfs (2.150) UNRELEASED; urgency=low
+livecd-rootfs (2.150) saucy; urgency=low
 
   * export $NOW in BuildLiveCD so we have it available in live-build
   * create a build stamp in /var/log/installer/media-info on Ubuntu Touch images

From cf8a492d007a5661bec3db7280839adecd885308 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Fri, 28 Jun 2013 15:14:04 +0200
Subject: [PATCH 39/54] use the packaged generic initrd for touch images

---
 debian/changelog      | 10 ++++++++++
 live-build/auto/build | 10 ++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fb395131..cfcbd046 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+livecd-rootfs (2.151) UNRELEASED; urgency=low
+
+  * use ubuntu-touch-generic-initrd for touch images instead of rolling an
+    arch specific initrd at build time for each arch (this should save quite
+    some build time)
+  * directly create the output file with abootimg, no need to cp it separately
+  * do not remove kernel packages from a chroot we throw away anyway
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Fri, 28 Jun 2013 15:06:59 +0200
+
 livecd-rootfs (2.150) saucy; urgency=low
 
   * export $NOW in BuildLiveCD so we have it available in live-build
diff --git a/live-build/auto/build b/live-build/auto/build
index d678394f..25efc52a 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -429,6 +429,7 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
 	mv "${sourceslist}.d" "${sourceslist}.d.orig"
 	echo "deb http://ftpmaster.internal/ubuntu/ saucy main universe" >$sourceslist
 	Chroot chroot "apt-get -y update"
+	Chroot chroot "apt-get -y install ubuntu-touch-generic-initrd"
 
 	for subarch in $touchsubarches; do
 		kpkg="$(Chroot chroot apt-cache depends linux-image-$subarch|awk '/Depends: linux-image/ {print $2}')"
@@ -436,13 +437,10 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
 		Chroot chroot "apt-get -y install $kpkg"
 
 		bootimgcfg="/usr/share/initramfs-tools-ubuntu-touch/bootimg.cfg-${subarch}"
-		Chroot chroot "env FLASH_KERNEL_SKIP=1 update-initramfs -k ${kver} -c -v"
-		Chroot chroot "abootimg --create /boot/bootimg-${subarch}.img -f ${bootimgcfg} -r /boot/initrd.img-${kver} -k /boot/vmlinuz-${kver}"
+		initrdimg="/usr/lib/ubuntu-touch-generic-initrd/initrd.img-touch"
 
-		cp "chroot/boot/bootimg-${subarch}.img" "$PREFIX.bootimg-${subarch}"
-
-		Chroot chroot "apt-get -y purge $kpkg"
-	done
+		Chroot chroot "abootimg --create "$PREFIX.bootimg-${subarch}" -f ${bootimgcfg} -r ${initrdimg} -k /boot/vmlinuz-${kver}"
+	done`
 
 	lb chroot_devpts remove "$@"
 	lb chroot_sysfs remove "$@"

From 0a07ba64e3842a8fceabd2d29d3dc46723f95db9 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Fri, 28 Jun 2013 15:15:51 +0200
Subject: [PATCH 40/54] releasing version 2.151

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

diff --git a/debian/changelog b/debian/changelog
index cfcbd046..5fec56b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-livecd-rootfs (2.151) UNRELEASED; urgency=low
+livecd-rootfs (2.151) saucy; urgency=low
 
   * use ubuntu-touch-generic-initrd for touch images instead of rolling an
     arch specific initrd at build time for each arch (this should save quite

From 0eaec780a03abe6072af24bdbfc957d66894dca2 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Fri, 28 Jun 2013 17:13:41 +0100
Subject: [PATCH 41/54] live-build/auto/build: Fix syntax error.

---
 debian/changelog      | 6 ++++++
 live-build/auto/build | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5fec56b3..cd46cfbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.152) UNRELEASED; urgency=low
+
+  * live-build/auto/build: Fix syntax error.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 28 Jun 2013 17:13:29 +0100
+
 livecd-rootfs (2.151) saucy; urgency=low
 
   * use ubuntu-touch-generic-initrd for touch images instead of rolling an
diff --git a/live-build/auto/build b/live-build/auto/build
index 25efc52a..ef879215 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -440,7 +440,7 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
 		initrdimg="/usr/lib/ubuntu-touch-generic-initrd/initrd.img-touch"
 
 		Chroot chroot "abootimg --create "$PREFIX.bootimg-${subarch}" -f ${bootimgcfg} -r ${initrdimg} -k /boot/vmlinuz-${kver}"
-	done`
+	done
 
 	lb chroot_devpts remove "$@"
 	lb chroot_sysfs remove "$@"

From 97a577ff86e4d71ae55123f2efcc8d80e11c6883 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Fri, 28 Jun 2013 17:14:52 +0100
Subject: [PATCH 42/54] releasing version 2.152

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

diff --git a/debian/changelog b/debian/changelog
index cd46cfbd..0a95f5b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-livecd-rootfs (2.152) UNRELEASED; urgency=low
+livecd-rootfs (2.152) saucy; urgency=low
 
   * live-build/auto/build: Fix syntax error.
 
- -- Colin Watson <cjwatson@ubuntu.com>  Fri, 28 Jun 2013 17:13:29 +0100
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 28 Jun 2013 17:13:54 +0100
 
 livecd-rootfs (2.151) saucy; urgency=low
 

From 8c9f0350b04135f8e621507698de9f1d8ad85ab6 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Sat, 29 Jun 2013 17:02:46 +0200
Subject: [PATCH 43/54] make sure bootimgs are created in /boot of the chroot
 and only copied from outside the chroot afterwards

---
 debian/changelog      | 8 ++++++++
 live-build/auto/build | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0a95f5b2..73189acb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.153) UNRELEASED; urgency=low
+
+  * we do better not try to create something outside of a chroot while we are
+    in it :P (make sure bootimg's are created in /boot of the chroot and only
+    copied afterwards).
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Sat, 29 Jun 2013 16:59:28 +0200
+
 livecd-rootfs (2.152) saucy; urgency=low
 
   * live-build/auto/build: Fix syntax error.
diff --git a/live-build/auto/build b/live-build/auto/build
index ef879215..9cf3caf3 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -439,7 +439,8 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
 		bootimgcfg="/usr/share/initramfs-tools-ubuntu-touch/bootimg.cfg-${subarch}"
 		initrdimg="/usr/lib/ubuntu-touch-generic-initrd/initrd.img-touch"
 
-		Chroot chroot "abootimg --create "$PREFIX.bootimg-${subarch}" -f ${bootimgcfg} -r ${initrdimg} -k /boot/vmlinuz-${kver}"
+		Chroot chroot "abootimg --create /boot/bootimg-${subarch}.img -f ${bootimgcfg} -r ${initrdimg} -k /boot/vmlinuz-${kver}"
+		cp "chroot/boot/bootimg-${subarch}.img" "$PREFIX.bootimg-${subarch}"
 	done
 
 	lb chroot_devpts remove "$@"

From 990aecf6dd44d5dc717f44e9d373bc6077e00cf9 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Sat, 29 Jun 2013 17:03:07 +0200
Subject: [PATCH 44/54] releasing version 2.153

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

diff --git a/debian/changelog b/debian/changelog
index 73189acb..69848f5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-livecd-rootfs (2.153) UNRELEASED; urgency=low
+livecd-rootfs (2.153) saucy; urgency=low
 
   * we do better not try to create something outside of a chroot while we are
     in it :P (make sure bootimg's are created in /boot of the chroot and only

From 6ae17f7a269356e5276f6fadd5069b407e3b15b5 Mon Sep 17 00:00:00 2001
From: Sergio Schvezov <sergio.schvezov@canonical.com>
Date: Thu, 4 Jul 2013 13:17:55 -0300
Subject: [PATCH 45/54] Adding ppa:ubuntu-unity/next for Touch.

---
 .../archives/ubuntu-unity-next.key.chroot           | 13 +++++++++++++
 .../archives/ubuntu-unity-next.list.chroot          |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 live-build/ubuntu-touch/archives/ubuntu-unity-next.key.chroot
 create mode 100644 live-build/ubuntu-touch/archives/ubuntu-unity-next.list.chroot

diff --git a/live-build/ubuntu-touch/archives/ubuntu-unity-next.key.chroot b/live-build/ubuntu-touch/archives/ubuntu-unity-next.key.chroot
new file mode 100644
index 00000000..0ce716cb
--- /dev/null
+++ b/live-build/ubuntu-touch/archives/ubuntu-unity-next.key.chroot
@@ -0,0 +1,13 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+mI0EUKJp4AEEANqa4yLubhYUWP6NFignwYDXfSQDxD1K5m06SyuTuqI37zRI+GaF
+vaiNCwzK7Qfx4TikrpNIIIc3c1+rYSsSQQadWqJRvrbs7MixcDQGRb+SQ+bglIdD
++1hw9xSvMXGO/dOaZv6ZVlLxJiYWAKZuFXtugKQF2yyh0eug6/7wuRYxABEBAAG0
+MkxhdW5jaHBhZCBQUEEgZm9yIFVidW50dSBVbml0eSBQUyBpbnRlZ3JhdGlvbiB0
+ZWFtiLgEEwECACIFAlCiaeACGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJ
+EEVRQo5S1i9FdDMEAKL25MjyO+W7+MJRiEzaV/gda41lQsqLFXDWdYFaF1FqrLNa
+6/E5Ph+oVV6tK8O/HSeXGVgDZeEL6iBX3SvwEgLyGr33z8IZ22JNS5UIXmwSKO5P
+Ix8Qs6LjOaQtAlZRDwj/5wQo9IqNclSA/hrFNH7XuHeglqITgccPCPEZMByN
+=VBVL
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/live-build/ubuntu-touch/archives/ubuntu-unity-next.list.chroot b/live-build/ubuntu-touch/archives/ubuntu-unity-next.list.chroot
new file mode 100644
index 00000000..4917feb7
--- /dev/null
+++ b/live-build/ubuntu-touch/archives/ubuntu-unity-next.list.chroot
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/ubuntu-unity/next/ubuntu @DISTRIBUTION@ main
+# deb-src http://ppa.launchpad.net/ubuntu-unity/next/ubuntu @DISTRIBUTION@ main

From b1e1beea3670a38f446ecb96beedfef9ed107079 Mon Sep 17 00:00:00 2001
From: Sergio Schvezov <sergio.schvezov@canonical.com>
Date: Thu, 4 Jul 2013 13:26:09 -0300
Subject: [PATCH 46/54] Adding changelog entry

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

diff --git a/debian/changelog b/debian/changelog
index 69848f5e..8190b95d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.154) UNRELEASED; urgency=low
+
+  * Adding ppa:ubuntu-unity/next for Touch to obtain unity8 and Mir. 
+
+ -- Sergio Schvezov <sergio.schvezov@canonical.com>  Thu, 04 Jul 2013 13:23:29 -0300
+
 livecd-rootfs (2.153) saucy; urgency=low
 
   * we do better not try to create something outside of a chroot while we are

From 97a518d6768e4f863e282087f3ba25036d28a084 Mon Sep 17 00:00:00 2001
From: Sergio Schvezov <sergio.schvezov@canonical.com>
Date: Thu, 4 Jul 2013 13:31:13 -0300
Subject: [PATCH 47/54] Switching to using the maliit plugin provided by
 maliit-framework.

---
 debian/changelog                                  | 1 +
 live-build/ubuntu-touch/hooks/48-setup-env.chroot | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8190b95d..1e6a748d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 livecd-rootfs (2.154) UNRELEASED; urgency=low
 
   * Adding ppa:ubuntu-unity/next for Touch to obtain unity8 and Mir. 
+  * Switching to using the maliit plugin provided by maliit-framework. 
 
  -- Sergio Schvezov <sergio.schvezov@canonical.com>  Thu, 04 Jul 2013 13:23:29 -0300
 
diff --git a/live-build/ubuntu-touch/hooks/48-setup-env.chroot b/live-build/ubuntu-touch/hooks/48-setup-env.chroot
index 53b40866..5a007031 100755
--- a/live-build/ubuntu-touch/hooks/48-setup-env.chroot
+++ b/live-build/ubuntu-touch/hooks/48-setup-env.chroot
@@ -23,7 +23,7 @@ ANDROID_ROOT=/system
 EXTERNAL_STORAGE=/mnt/sdcard
 LANG=en_US.UTF-8
 LANGUAGE=en_US:en
-QT_IM_MODULE=maliit
+QT_IM_MODULE=maliitphablet
 HUD_NO_STORE_USAGE_DATA=1
 INDICATOR_ALLOW_NO_WATCHERS=1" > /etc/environment
 

From 9b5ae6ff60339617fed5bf1245d6fbd34091e979 Mon Sep 17 00:00:00 2001
From: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
Date: Thu, 4 Jul 2013 13:44:23 -0300
Subject: [PATCH 48/54] releasing version 2.154

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

diff --git a/debian/changelog b/debian/changelog
index 1e6a748d..9321cf7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-livecd-rootfs (2.154) UNRELEASED; urgency=low
+livecd-rootfs (2.154) saucy; urgency=low
 
-  * Adding ppa:ubuntu-unity/next for Touch to obtain unity8 and Mir. 
-  * Switching to using the maliit plugin provided by maliit-framework. 
+  [ Sergio Schvezov ]
+  * Adding ppa:ubuntu-unity/next for Touch to obtain unity8 and Mir.
+  * Switching to using the maliit plugin provided by maliit-framework.
 
- -- Sergio Schvezov <sergio.schvezov@canonical.com>  Thu, 04 Jul 2013 13:23:29 -0300
+ -- Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>  Thu, 04 Jul 2013 13:44:08 -0300
 
 livecd-rootfs (2.153) saucy; urgency=low
 

From 557de063832c858277c56cd301cdb769d34a929b Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Fri, 5 Jul 2013 12:31:30 +0200
Subject: [PATCH 49/54] try to hand the exported $NOW over from
 live-build/auto/config as $BUILDSTAMP

---
 debian/changelog       | 7 +++++++
 live-build/auto/build  | 2 +-
 live-build/auto/config | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9321cf7a..e47db2ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.155) UNRELEASED; urgency=low
+
+  * try to hand the exported $NOW over from live-build/auto/config as
+    $BUILDSTAMP so live-build/auto/build can use it to write a stamp file
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Fri, 05 Jul 2013 12:29:50 +0200
+
 livecd-rootfs (2.154) saucy; urgency=low
 
   [ Sergio Schvezov ]
diff --git a/live-build/auto/build b/live-build/auto/build
index 9cf3caf3..1a35be61 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -239,7 +239,7 @@ deb file:/var/lib/preinstalled-pool/ $LB_DISTRIBUTION $LB_PARENT_ARCHIVE_AREAS
 		INFO_DESC="$(lsb_release -d -s)"
 
 		mkdir -p chroot/var/log/installer
-		echo "$INFO_DESC - $ARCH ($NOW)" >chroot/var/log/installer/media-info
+		echo "$INFO_DESC - $ARCH ($BUILDSTAMP)" >chroot/var/log/installer/media-info
 	fi
 
 	echo "===== Checking size of /usr/share/doc ====="
diff --git a/live-build/auto/config b/live-build/auto/config
index f8807fa0..0d676af7 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -89,6 +89,8 @@ PREINSTALL_POOL_SEEDS=
 CHROOT_HOOKS=
 BINARY_HOOKS=
 
+BUILDSTAMP="${NOW}"
+
 add_chroot_hook ()
 {
 	CHROOT_HOOKS="${CHROOT_HOOKS:+$CHROOT_HOOKS }$1"

From 1707e9118d8d389c9df6bde3393d34bd54662bf8 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Fri, 5 Jul 2013 12:32:05 +0200
Subject: [PATCH 50/54] releasing version 2.155

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

diff --git a/debian/changelog b/debian/changelog
index e47db2ad..242dc324 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-livecd-rootfs (2.155) UNRELEASED; urgency=low
+livecd-rootfs (2.155) saucy; urgency=low
 
   * try to hand the exported $NOW over from live-build/auto/config as
     $BUILDSTAMP so live-build/auto/build can use it to write a stamp file

From 6ff0b8e618090ab86cd14cfa6c097aa689fe44e9 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Thu, 11 Jul 2013 16:41:25 +0200
Subject: [PATCH 51/54] fix buildstamp creation for ubuntu-touch

---
 BuildLiveCD            | 4 +---
 debian/changelog       | 7 +++++++
 live-build/auto/config | 3 +--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/BuildLiveCD b/BuildLiveCD
index 2a5c1016..925d8f43 100755
--- a/BuildLiveCD
+++ b/BuildLiveCD
@@ -128,8 +128,6 @@ for STE in $SUITES; do
 	typeset -i n=1; while [ -d ${PUBDIR}${NOW}.$n ]; do n=n+1; done
 	NOW=${NOW}.$n
     fi
-    NOW=${NOW}
-    export NOW
     LOG=${PUBDIR}${NOW}/livecd-${NOW}-${ARCH}.out
 
     rm -f ${PUBDIR}latest
@@ -140,7 +138,7 @@ for STE in $SUITES; do
     if $LIVE_BUILD; then
 	$LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && rm -rf auto && mkdir -p auto && for f in config build clean; do ln -s /usr/share/livecd-rootfs/live-build/auto/\$f auto/; done" >> ${LOG} 2>&1 || true
 	$LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && lb clean --purge" >> ${LOG} 2>&1 || true
-	if ! $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && SUITE=${STE} PROJECT=${FS} SUBPROJECT=${SUBPROJECT} ARCH=${ARCH} SUBARCH=${SUBARCH} IMAGEFORMAT=${IMAGEFORMAT} PROPOSED=${PROPOSED:+1} lb config" >> ${LOG} 2>&1; then
+	if ! $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && NOW=${NOW} SUITE=${STE} PROJECT=${FS} SUBPROJECT=${SUBPROJECT} ARCH=${ARCH} SUBARCH=${SUBARCH} IMAGEFORMAT=${IMAGEFORMAT} PROPOSED=${PROPOSED:+1} lb config" >> ${LOG} 2>&1; then
 	    exit 1
 	fi
 	COMMAND="PROJECT=${FS} SUBPROJECT=${SUBPROJECT} ARCH=${ARCH} SUBARCH=${SUBARCH} lb build"
diff --git a/debian/changelog b/debian/changelog
index 242dc324..33017366 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.156) UNRELEASED; urgency=low
+
+  * fix build stamp handling for ubuntu-touch (requires an RT to have IS
+    update BuildLiveCD on the builders)
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Thu, 11 Jul 2013 16:34:34 +0200
+
 livecd-rootfs (2.155) saucy; urgency=low
 
   * try to hand the exported $NOW over from live-build/auto/config as
diff --git a/live-build/auto/config b/live-build/auto/config
index 0d676af7..ed285942 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -89,8 +89,6 @@ PREINSTALL_POOL_SEEDS=
 CHROOT_HOOKS=
 BINARY_HOOKS=
 
-BUILDSTAMP="${NOW}"
-
 add_chroot_hook ()
 {
 	CHROOT_HOOKS="${CHROOT_HOOKS:+$CHROOT_HOOKS }$1"
@@ -399,6 +397,7 @@ lb config noauto \
 
 echo "LB_CHROOT_HOOKS=\"$CHROOT_HOOKS\"" >> config/chroot
 echo "LB_BINARY_HOOKS=\"$BINARY_HOOKS\"" >> config/binary
+echo "BUILDSTAMP=\"$NOW\"" >> config/binary
 
 case $PROJECT in
 	ubuntu-server)

From 6f6252b60c6b33a4653155c7b2d8eef22d13f859 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Thu, 11 Jul 2013 16:42:00 +0200
Subject: [PATCH 52/54] releasing version 2.156

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

diff --git a/debian/changelog b/debian/changelog
index 33017366..50b79a17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-livecd-rootfs (2.156) UNRELEASED; urgency=low
+livecd-rootfs (2.156) saucy; urgency=low
 
   * fix build stamp handling for ubuntu-touch (requires an RT to have IS
     update BuildLiveCD on the builders)

From 93fb97a202da23124114366db4ac0817d3e3d22e Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Fri, 12 Jul 2013 11:05:35 +0200
Subject: [PATCH 53/54] add the xserver omap-revert packages to panda builds

---
 debian/changelog       | 7 +++++++
 live-build/auto/config | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 50b79a17..5edfe512 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.157) UNRELEASED; urgency=low
+
+  * add xserver-xorg-input-evdev-omap-revert and
+    xserver-xorg-video-omap-revert to panda builds
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Fri, 12 Jul 2013 11:03:34 +0200
+
 livecd-rootfs (2.156) saucy; urgency=low
 
   * fix build stamp handling for ubuntu-touch (requires an RT to have IS
diff --git a/live-build/auto/config b/live-build/auto/config
index ed285942..d7c6bbab 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -316,7 +316,7 @@ case $ARCH in
 						add_package install u-boot-linaro-omap4-panda u-boot-tools
 						;;
 					*)
-						add_package install u-boot-linaro-omap4-panda u-boot-tools pvr-omap4
+						add_package install u-boot-linaro-omap4-panda u-boot-tools pvr-omap4 xserver-xorg-video-omap-revert xserver-xorg-input-evdev-omap-revert
 						;;
 				esac
 				BINARY_REMOVE_LINUX=false

From b7565b8678c52ce987c93b8995c66ba5ea7b19e6 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Fri, 12 Jul 2013 11:06:09 +0200
Subject: [PATCH 54/54] releasing version 2.157

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

diff --git a/debian/changelog b/debian/changelog
index 5edfe512..d21627e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-livecd-rootfs (2.157) UNRELEASED; urgency=low
+livecd-rootfs (2.157) saucy; urgency=low
 
   * add xserver-xorg-input-evdev-omap-revert and
     xserver-xorg-video-omap-revert to panda builds