Import patches-unapplied version 2.198 to ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: 6ab1ece7b0

New changelog entries:
  * Double-quotes prevented the previous change from working, so drop those.
    Additionally remove an hardcoded occurence of "saucy", instead using
    LB_DISTRIBUTION to avoid having to change that in the future.

debian/changelog

@@ -1,3 +1,11 @@
+livecd-rootfs (2.198) trusty; urgency=low
+
+  * Double-quotes prevented the previous change from working, so drop those.
+    Additionally remove an hardcoded occurence of "saucy", instead using
+    LB_DISTRIBUTION to avoid having to change that in the future.
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Sun, 20 Oct 2013 23:17:57 -0400
+
 livecd-rootfs (2.197) trusty; urgency=low
 
   * Workaround to make ubuntu-touch build with older android package.

debian/control

@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Build-Depends: debhelper (>= 7)
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-Standards-Version: 3.6.1.0
+Standards-Version: 3.9.4
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk
 
 Package: livecd-rootfs

live-build/auto/build

@@ -433,21 +433,20 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
 
 	mv "${sourceslist}" "${sourceslist}.orig"
 	mv "${sourceslist}.d" "${sourceslist}.d.orig"
-	echo "deb $LB_PARENT_MIRROR_CHROOT saucy main universe multiverse restricted" >$sourceslist
+	echo "deb $LB_PARENT_MIRROR_CHROOT ${LB_DISTRIBUTION} main universe multiverse restricted" >$sourceslist
 	Chroot chroot "apt-get -y update"
 	Chroot chroot "apt-get -y install android"
 
-	REL="$LB_DISTRIBUTION"
 	for subarch in $touchsubarches; do
-		cp "chroot/usr/share/android/product/*-preinstalled-system-armel+${subarch}.img"\
+		cp chroot/usr/share/android/product/*-preinstalled-system-armel+${subarch}.img\
 			 "${PREFIX}.system-armel+${subarch}.img"
-		cp "chroot/usr/share/android/product/*-preinstalled-recovery-armel+${subarch}.img"\
+		cp chroot/usr/share/android/product/*-preinstalled-recovery-armel+${subarch}.img\
 			 "${PREFIX}.recovery-armel+${subarch}.img"
-		cp "chroot/usr/share/android/product/*-preinstalled-boot-armhf+${subarch}.img"\
+		cp chroot/usr/share/android/product/*-preinstalled-boot-armhf+${subarch}.img\
 			 "${PREFIX}.boot-armhf+${subarch}.img"
 		# drop this following line once cdimage can handle -boot-*.img
 		cp "${PREFIX}.boot-armhf+${subarch}.img" "${PREFIX}.bootimg-${subarch}"
-		cp "chroot/usr/share/android/product/*-preinstalled-touch-armel+${subarch}.zip"\
+		cp chroot/usr/share/android/product/*-preinstalled-touch-armel+${subarch}.zip\
 			 "${PREFIX}.armel+${subarch}.zip"
 	done