From 6bac9fdd662d1df0f3ff7f98d01bd9bf4da91058 Mon Sep 17 00:00:00 2001
From: Steve McIntyre <steve@einval.com>
Date: Sat, 10 Feb 2018 12:09:56 +0000
Subject: [PATCH] lose extra - on -joliet-long

---
 debian/changelog       |  2 +-
 tools/set_mkisofs_opts | 10 +++++-----
 update-cd              |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c83b5661..f89294e7 100644
--- a/debian/changelog
+++ b/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
 
diff --git a/tools/set_mkisofs_opts b/tools/set_mkisofs_opts
index 710904b6..d4af6ced 100755
--- a/tools/set_mkisofs_opts
+++ b/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
diff --git a/update-cd b/update-cd
index 7eb02d15..99dabd2f 100755
--- a/update-cd
+++ b/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