Import patches-unapplied version 0.82 to ubuntu/karmic

Imported using git-ubuntu import.

Changelog parent: 812f9e7818

New changelog entries:
  [ Loic Minier ]
  * Default suite is the current one as returned by $(lsb_release -cs); depend
    on lsb-release (LP: #301963).
  * Use dpkg --print-architecture as --print-installation-architecture is
    deprecated.
  * Don't explicitely install linux-headers-imx51 on armel; all other arches
    get around this requirement by explicitely seeding the headers in
    desktop-common which we do as well.
  [ Colin Watson ]
  * Remove -nolzma option from mksquashfs, since (a) it's been the default
    since squashfs 1:3.3-1ubuntu1, and (b) it's no longer available in 4.0.

BuildLiveCD

@@ -24,7 +24,7 @@ if [ -n "$SSH_ORIGINAL_COMMAND" ]; then
     [ ${1##*/} != 'BuildLiveCD' ] && echo bad command >&2 && exit 2
     shift
 fi
-ARCH=$(dpkg --print-installation-architecture)
+ARCH=$(dpkg --print-architecture)
 SUBARCH=""
 SUBARCHARG=""
 DEFAULTSUITE="karmic"

debian/changelog

@@ -1,3 +1,20 @@
+livecd-rootfs (0.82) karmic; urgency=low
+
+  [ Loic Minier ]
+  * Default suite is the current one as returned by $(lsb_release -cs); depend
+    on lsb-release (LP: #301963).
+  * Use dpkg --print-architecture as --print-installation-architecture is
+    deprecated.
+  * Don't explicitely install linux-headers-imx51 on armel; all other arches
+    get around this requirement by explicitely seeding the headers in
+    desktop-common which we do as well.
+
+  [ Colin Watson ]
+  * Remove -nolzma option from mksquashfs, since (a) it's been the default
+    since squashfs 1:3.3-1ubuntu1, and (b) it's no longer available in 4.0.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 29 May 2009 09:19:59 +0200
+
 livecd-rootfs (0.81) karmic; urgency=low
 
   * ia64 uses -ia64 kernels across the board now.

debian/control

@@ -8,7 +8,7 @@ Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk
 
 Package: livecd-rootfs
 Architecture: all
-Depends: debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, fdupes
+Depends: debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, fdupes, lsb-release
 Suggests: partimage
 Description: construction script for the livecd rootfs
  livecd-rootfs provides the script used to create the root filesystem

livecd.sh

@@ -68,7 +68,7 @@ export DEBIAN_FRONTEND=noninteractive
 export LANG=C
 export CASPER_GENERATE_UUID=1
 SRCMIRROR=http://archive.ubuntu.com/ubuntu
-ARCH=$(dpkg --print-installation-architecture)
+ARCH=$(dpkg --print-architecture)
 OPTMIRROR=
 
 select_mirror () {
@@ -111,7 +111,7 @@ select_mirror () {
     fi
 }
 
-STE=gutsy
+STE=$(lsb_release -cs)
 EXCLUDE=""
 LIST=""
 SUBARCH=""
@@ -323,7 +323,7 @@ link_in_boot = $link_in_boot
 	hppa)		LIST="$LIST linux-hppa32 linux-hppa64";;
 	powerpc)	LIST="$LIST linux-powerpc linux-powerpc64-smp";;
 	sparc*)		LIST="$LIST linux-sparc64";;
-	armel)		LIST="$LIST linux-imx51 linux-headers-imx51";;
+	armel)		LIST="$LIST linux-imx51";;
 	*)		echo "Unknown architecture: no kernel."; exit 1;;
     esac
 
@@ -554,7 +554,7 @@ ${COMMENT}deb-src ${SECSRCMIRROR} ${STE}-security multiverse
       : > livecd.${FSS}.sort
     fi
 
-    mksquashfs ${ROOT} livecd.${FSS}.squashfs -nolzma -sort livecd.${FSS}.sort
+    mksquashfs ${ROOT} livecd.${FSS}.squashfs -sort livecd.${FSS}.sort
     chmod 644 livecd.${FSS}.squashfs
   }