Import patches-unapplied version 1.152 to ubuntu/maverick

Imported using git-ubuntu import.

Changelog parent: 7c2b097ba1

New changelog entries:
  * livecd.sh:
    - Restore the keyring earlier in the chroot (before the dist-upgrade).
      This fixes the missng key for the extras.ubuntu.com that is added
      during the livecd build dist-ugprade (LP: #650525)

debian/changelog

@@ -1,3 +1,12 @@
+livecd-rootfs (1.152) maverick; urgency=low
+
+  * livecd.sh:
+    - Restore the keyring earlier in the chroot (before the dist-upgrade).
+      This fixes the missng key for the extras.ubuntu.com that is added
+      during the livecd build dist-ugprade (LP: #650525)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 30 Sep 2010 14:32:57 +0200
+
 livecd-rootfs (1.151) maverick; urgency=low
 
   * enforce installation of only suitable header packages for the respective

livecd.sh

@@ -507,7 +507,12 @@ Pin-Priority: 900
     cp ${ROOT}etc/apt/trusted.gpg ${ROOT}etc/apt/trusted.gpg.$$
     cat /etc/apt/trusted.gpg >> ${ROOT}etc/apt/trusted.gpg
 
+    # update and immediately restore the trusted keyring
     chroot $ROOT apt-get update
+    # we restore the keyring here because on dist-upgrade the
+    # ubuntu-extras-keyring package installs additional keys
+    mv ${ROOT}etc/apt/trusted.gpg.$$ ${ROOT}etc/apt/trusted.gpg
+
     checkpoint "Upgrading"
     chroot $ROOT apt-get -y $FORCE_YES --purge dist-upgrade </dev/null
     checkpoint "Installing main packages"
@@ -645,7 +650,6 @@ Pin: release o=LP-PPA-$origin
 Pin-Priority: 550
 @@EOF
     fi
-    mv ${ROOT}etc/apt/trusted.gpg.$$ ${ROOT}etc/apt/trusted.gpg
 
     # get rid of the .debs - we don't need them.
     chroot ${ROOT} apt-get clean