Import patches-unapplied version 1.130 to ubuntu/maverick

Imported using git-ubuntu import.

Changelog parent: b8be32bf74

New changelog entries:
  * 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.
  * BuildLiveCD: drop the subarch from the directory name, which has never
    made sense; but we don't want this to go live without coordination with
    cdimage.

BuildLiveCD

@@ -116,7 +116,7 @@ for STE in $SUITES; do
     fi
 
     for arg in "$@"; do
-	PUBDIR=~/public_html/LiveCD/${STE}/${arg}${SUBARCH:+-$SUBARCH}/
+	PUBDIR=~/public_html/LiveCD/${STE}/${arg}/
 	mkdir -p ${PUBDIR}
 
 	NOW=$(date +%Y%m%d)

debian/changelog

@@ -1,3 +1,13 @@
+livecd-rootfs (1.130) maverick; 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.
+  * BuildLiveCD: drop the subarch from the directory name, which has never
+    made sense; but we don't want this to go live without coordination with
+    cdimage.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 29 Jun 2010 17:46:46 -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: