Import patches-unapplied version 2.118 to ubuntu/raring-proposed

Imported using git-ubuntu import.

Changelog parent: 1f82c6ba35

New changelog entries:
  * normalize the naming scheme for ubuntu-touch-android.sh output

debian/changelog

@@ -1,3 +1,9 @@
+livecd-rootfs (2.118) raring; urgency=low
+
+  * normalize the naming scheme for ubuntu-touch-android.sh output
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Thu, 28 Mar 2013 19:34:18 +0100
+
 livecd-rootfs (2.117) raring; urgency=low
 
   * make ubuntu-touch-android.sh also create $subarch-system.img

ubuntu-touch-android.sh

@@ -29,8 +29,8 @@ repo sync
 brunch $codename
 
 cd -
-cp $builddir/out/target/product/$codename/*-$codename.zip .
+cp $builddir/out/target/product/$codename/*-$codename.zip ./livecd.ubuntu-touch-$codename.zip
 for image in system recovery boot; do
-	cp $builddir/out/target/product/$codename/$image.img ./$codename-$image.img
+	cp $builddir/out/target/product/$codename/$image.img ./livecd.ubuntu-touch-$codename.$image.img
 done
 rm -rf $buildir