update from current trunk

etch/update-cd

@@ -24,7 +24,7 @@ MIRROR_AMD64=/org/cdbuilder.debian.org/src/ftp/debian-amd64/debian
 NONFREE=0
 
 # What release version is this?
-VER=4.0r3
+VER=4.0r5
 
 # Is this an official CD?
 OFFICIAL=Official
@@ -32,7 +32,7 @@ OFFICIAL=Official
 
 # Path to use with mkisofs/mkhybrid
 #MKISOFS=${MKISOFS:-"mkhybrid"}
-MKISOFS=$PWD/../mkisofs/usr/bin/mkisofs
+MKISOFS=$PWD/../genisoimage/usr/bin/genisoimage
 
 # Use JTE extensions to mkisofs to make jigdo files?
 JTE=1
@@ -70,7 +70,7 @@ esac
 # Location of the diff file to use to determine the changes. If you leave
 # this blank, we'll try to determine the changes from the ChangeLog files,
 # which is probably less accurate. 
-DIFF=/home/deb-cd/r0-r3.diff
+DIFF=/home/deb-cd/r0-r5.diff
 
 if [ "$TYPE" = "cd" ] ; then
     CDSIZE=610 # megabytes, leaving space for metadata
@@ -97,8 +97,6 @@ export FIRSTVER VERSPACE CAPCODE
 
 if [ "$ARCHLIST"x = ""x ] ; then
     ARCHLIST="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc source" # amd64 # all dealt with specially
-else
-    ARCHLIST=$@
 fi
 
 export TDIR NONFREE NONUS VER MIRROR CODENAME OUT BASEDIR
@@ -149,7 +147,7 @@ copy_file () {
     ROOTDIR=$1
 	shift
 	FILE=$1
-    DIR=`echo $FILE | sed 's?/[-_\.A-Za-z0-9\+]*$??'`
+    DIR=`dirname $FILE`
     if [ ! -d $ROOTDIR/$DIR ] ; then
         mkdir -p $ROOTDIR/$DIR
     fi