Revert to version 1.127: we do want the subarch in the filename so these

files can coexist in the same directory, as they do for all other archs.

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (1.130) UNRELEASED; urgency=low
+
+  * Revert to version 1.127: we do want the subarch in the filename so these
+    files can coexist in the same directory, as they do for all other archs.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 29 Jun 2010 17:38:04 -0700
+
 livecd-rootfs (1.129) maverick; urgency=low
 
   * fix typo

livecd.sh

@@ -202,14 +202,6 @@ for FS in "$@"; do
     DEV=""
     COMP="main restricted"
 
-    # we dont want to mangle the project name on armel
-    # but keep it to not confuse debian-cd/cdimage
-    case $TARGETARCH in
-        armel)
-            FSS=$FS
-            ;;
-    esac
-
     select_mirror
 
     # Just in case there's some leftover junk here: