From 1d982b2f566c5aa839974f12422b471422b106d0 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Tue, 29 Jun 2010 17:39:04 -0700 Subject: [PATCH] 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 | 7 +++++++ livecd.sh | 8 -------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 38e1c175..d3510b96 100644 --- a/debian/changelog +++ b/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 Tue, 29 Jun 2010 17:38:04 -0700 + livecd-rootfs (1.129) maverick; urgency=low * fix typo diff --git a/livecd.sh b/livecd.sh index faaed5e1..9e8030e0 100755 --- a/livecd.sh +++ b/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: