When generating both iso and jigdo files, make sure that the iso files

are at least as new as the jigdo files, as this helps people
mirroring. Closes: #587774

debian/changelog

@@ -26,6 +26,9 @@ debian-cd (3.1.4) UNRELEASED; urgency=low
   * Add top-level control of which checksums are desired for output images
     see the CHECKSUMS setting in CONF.sh
   * Fix some bashisms in tools/apt-selection.
+  * When generating both iso and jigdo files, make sure that the iso files
+    are at least as new as the jigdo files, as this helps people mirroring.
+    Closes: #587774
 
  -- Steve McIntyre <93sam@debian.org>  Tue, 27 Feb 2010 12:24:29 +0100
 

tools/make_image

@@ -128,5 +128,9 @@ do
             "`echo "$JIGDOTEMPLATEURL" | sed -e 's|%ARCH%|$ARCH|g'`$OUTFILE.template" \
             "$DISKINFO" \
             $JIGDOFALLBACKURLS
+        if [ "$ISO_WANTED" = 1 ] ; then
+            # Make sure that the ISO is as new/newer than the jigdo file; #587774
+            touch $OUT/$OUTFILE.iso
+        fi
     fi
 done

update-cd

@@ -202,6 +202,8 @@ make_cd () {
 			$OUT debian-update-$VER-$THISARCH-$TYPEUP-$THISNUM.template \
 			"Debian GNU/Linux $VERSPACE - $OFFICIAL $THISARCH $FIRSTVER->$VER update $TYPEUP #$THISNUM"
 		echo $SNAPSHOT >> $OUT/$THISARCH/jigdo-$TYPE/debian-update-$VER-$THISARCH-$TYPEUP-$THISNUM.jigdo
+        # Make sure that the ISO is as new/newer than the jigdo file; #587774
+        touch $OUT/$THISARCH/iso-$TYPE/debian-update-$VER-$THISARCH-$TYPEUP-$THISNUM.iso
 	else
 		${MKISOFS} -J -r -V "Debian $VER update $TYPEUP" -o \
 		$OUT/iso-$TYPE/$CODENAME-update-$THISARCH-$TYPEUP-$THISNUM.iso \