* Handle missing Contents file better.

* Prepare 2.2.12 release.

debian/changelog

@@ -1,6 +1,5 @@
 debian-cd (2.2.12) unstable; urgency=low
 
-  * UNRELEASED. 
   * Get it right this time with the MULTIBOOT test ... Closes: #127234
   * Correct spelling mistake in README.devel. Closes: #127726
   * Make the log output more consistent and offer the possibility
@@ -10,6 +9,7 @@ debian-cd (2.2.12) unstable; urgency=low
   * Undef some automatic variable substitution (like i386)
     of cpp causing problems while generating tasks files. Closes: #129044
     Thanks again to Petter Reinholdsten.
+  * Don't fail if Contents-$ARCH files are missing. Closes: #129166
 
  -- Raphael Hertzog <hertzog@debian.org>  Sat, 29 Dec 2001 19:57:23 +0100
 

tools/add-bin-doc

@@ -43,36 +43,37 @@ for i in $BDIR/*.packages; do
 	   cp -f $MIRROR/dists/$CODENAME/main/Release-Notes $dir/
 	fi
 
-	cp -f $MIRROR/dists/$CODENAME/Contents-$ARCH.gz \
-	   $dir/dists/$CODENAME/; \
-
-
-        # 08-oct-00 if != woody copy Contents-$ARCH
-        # Contents-$ARCH missing on non-US woody  -- jwest
-        if [ $CODENAME != "woody" ]; then
-	  if [ -n "$NONUS" ]; then
-	     cp -f $NONUS/dists/$CODENAME/non-US/Contents-$ARCH.gz \
-	        $dir/dists/$CODENAME/non-US/
-	  fi
+	if [ -e $MIRROR/dists/$CODENAME/Contents-$ARCH.gz ]; then
+	   cp -f $MIRROR/dists/$CODENAME/Contents-$ARCH.gz $dir/dists/$CODENAME/
+	else
+	   echo "WARNING: there's no Contents-$ARCH.gz file for $CODENAME !"
 	fi
 
-
+        if [ -n "$NONUS" ]
+	then
+	    if [ -e $NONUS/dists/$CODENAME/non-US/Contents-$ARCH.gz ]; then
+		 cp -f $NONUS/dists/$CODENAME/non-US/Contents-$ARCH.gz \
+		    $dir/dists/$CODENAME/non-US/
+	    else
+		echo "WARNING: there's no Content-$ARCH.gz file for $CODENAME/non-US !"
+	    fi
+	fi
 
 	if [ -e $BASEDIR/data/$CODENAME/README.$ARCH ]; then 
 	  cp -f $BASEDIR/data/$CODENAME/README.$ARCH $dir/
 	fi
 
-    if [ -e $BASEDIR/data/$CODENAME/README.1ST.$ARCH ]; then 
-        rm -f $dir/README.1ST
-        echo "This disc is labelled :" > $dir/README.1ST
-        cat $dir/.disk/info >>$dir/README.1ST
-        echo -e "\n\n" >>$dir/README.1ST
-        cat $BASEDIR/data/$CODENAME/README.1ST.$ARCH > $dir/README.1ST
-        todos $dir/README.1ST; 
-    fi
+	if [ -e $BASEDIR/data/$CODENAME/README.1ST.$ARCH ]; then 
+	    rm -f $dir/README.1ST
+	    echo "This disc is labelled :" > $dir/README.1ST
+	    cat $dir/.disk/info >>$dir/README.1ST
+	    echo -e "\n\n" >>$dir/README.1ST
+	    cat $BASEDIR/data/$CODENAME/README.1ST.$ARCH > $dir/README.1ST
+	    todos $dir/README.1ST; 
+	fi
 
-    if [ -e $BASEDIR/data/$CODENAME/README.multicd ]; then 
-        cp -f $BASEDIR/data/$CODENAME/README.multicd $dir/
-    fi
+	if [ -e $BASEDIR/data/$CODENAME/README.multicd ]; then 
+	    cp -f $BASEDIR/data/$CODENAME/README.multicd $dir/
+	fi
 
 done