* Removed -a from mkisofs call.

CONF.sh

@@ -77,9 +77,9 @@ export APTTMP=/ftp/tmp/apt
 # export COPYLINK=1
 
 # Options
-# export MKISOFS=/usr/bin/mkhybrid
-# export MKISOFS_OPTS="-a -r -T"	#For normal users
-# export MKISOFS_OPTS="-a -r -F . -T"	#For symlink farmers
+# export MKISOFS=/usr/bin/mkisofs
+# export MKISOFS_OPTS="-r -T"		#For normal users
+# export MKISOFS_OPTS="-r -F . -T"	#For symlink farmers
 
 # uncomment this to if you want to see more of what the Makefile is doing
 #export VERBOSE_MAKE=1

Makefile

@@ -47,13 +47,13 @@ ifndef SRCVOLID
 SRCVOLID="Debian $(DEBVERSION) Src-$$num"
 endif
 ifndef MKISOFS
-MKISOFS=/usr/bin/mkhybrid
+MKISOFS=/usr/bin/mkisofs
 endif
 ifndef MKISOFS_OPTS
 #For normal users
-MKISOFS_OPTS=-a -r -T      
+MKISOFS_OPTS=-r -T
 #For symlink farmers
-#MKISOFS_OPTS=-a -r -F . -T  
+#MKISOFS_OPTS=-r -F . -T
 endif
 ifndef HOOK
 HOOK=$(BASEDIR)/tools/$(CODENAME).hook

debian/CONF.sh

@@ -72,9 +72,9 @@ export APTTMP=/home/ftp/tmp/apt
 # export COPYLINK=1
 
 # Options
-# export MKISOFS=/usr/bin/mkhybrid
-# export MKISOFS_OPTS="-a -r -T"	#For normal users
-# export MKISOFS_OPTS="-a -r -F . -T"	#For symlink farmers
+# export MKISOFS=/usr/bin/mkisofs
+# export MKISOFS_OPTS="-r -T"		#For normal users
+# export MKISOFS_OPTS="-r -F . -T"	#For symlink farmers
 
 # uncomment this to if you want to see more of what the Makefile is doing
 #export VERBOSE_MAKE=1

debian/changelog

@@ -1,3 +1,11 @@
+debian-cd (2.2.5) unstable; urgency=low
+
+  * UNRELEASED
+  * Remove (obsolete) -a from mkhybrid call. Changed mkhybrid to mkisofs
+    since mkhybrid has been superseded by mkisofs. Closes: #97439
+
+ -- Raphael Hertzog <hertzog@debian.org>  Sat, 19 May 2001 15:15:29 +0200
+
 debian-cd (2.2.4) unstable; urgency=medium
 
   * All (i386) CD's now have a different kernel from boot-disks.