lose extra - on -joliet-long

debian/changelog

@@ -29,7 +29,7 @@ debian-cd (3.1.17-jessie) UNRELEASED; urgency=medium
     + Make tools/update_popcon exit with errors when it fails
     + Make tools/update_popcon deal with https on popcon.d.o
     + Declare 'my' instances of '$_' as 'local' in tools/make_disc_trees.pl
-    + Ensure that in all places where we use -J we also use --joliet-long
+    + Ensure that in all places where we use -J we also use -joliet-long
 
  -- Steve McIntyre <93sam@debian.org>  Mon, 20 Apr 2015 12:36:57 +0100
 

tools/set_mkisofs_opts

@@ -16,19 +16,19 @@ OPTS=
 
 case "$ARCH" in
   i386) 
-    OPTS="-J --joliet-long"
+    OPTS="-J -joliet-long"
     ;;
   amd64) 
-    OPTS="-J --joliet-long"
+    OPTS="-J -joliet-long"
     ;;
   alpha)
-    OPTS="-J --joliet-long"
+    OPTS="-J -joliet-long"
     ;;
   arm*)
-    OPTS="-J --joliet-long"
+    OPTS="-J -joliet-long"
     ;;
   s390*)
-    OPTS="-J --joliet-long"
+    OPTS="-J -joliet-long"
     ;;
   *)
     #No options by default - don't know about other arches

update-cd

@@ -161,7 +161,7 @@ make_cd () {
 
     if [ $JTE = 1 ] ; then
 	set +e
-        ${MKISOFS} -J --joliet-long -r -V "Debian $VER update $TYPEUP" -o \
+        ${MKISOFS} -J -joliet-long -r -V "Debian $VER update $TYPEUP" -o \
             ${ISODIR}/${BASENAME}.iso \
             -jigdo-jigdo ${JIGDODIR}/${BASENAME}.jigdo \
             -jigdo-template ${JIGDODIR}/${BASENAME}.template \
@@ -203,7 +203,7 @@ make_cd () {
         mv ${JIGDODIR}/${BASENAME}.jigdo.gz ${JIGDODIR}/${BASENAME}.jigdo
     else
 	set +e
-        ${MKISOFS} -J --joliet-long -r -V "Debian $VER update $TYPEUP" -o \
+        ${MKISOFS} -J -joliet-long -r -V "Debian $VER update $TYPEUP" -o \
             $OUT/iso-$TYPE/${BASENAME}.iso \
             $UPD/CD$CDNUM 2>&1 | grep "extents written"
 	if [ $? -ne 0 ] ; then