* Fix for multi-arch CDs including source - the extranonfree update

broke the source output

debian/changelog

@@ -1,4 +1,4 @@
-debian-cd (3.0.3) UNRELEASED; urgency=high
+debian-cd (3.0.3) UNRELEASED; urgency=low
 
   [ Steve McIntyre ]
   * In start_new_disc, cope with $DEBVERSION containing spaces.
@@ -33,6 +33,10 @@ debian-cd (3.0.3) UNRELEASED; urgency=high
   * Remove pcmcia-cs-udeb from udeb_include; we don't need this udeb with
     modern kernels. (We didn't need it for etch either actually.)
 
+  [ Steve McIntyre ]
+  * Fix for multi-arch CDs including source - the extranonfree update
+    broke the source output
+
  -- Joey Hess <joeyh@debian.org>  Sun, 27 May 2007 01:18:08 -0400
 
 debian-cd (3.0.2) unstable; urgency=high

tools/merge_package_lists

@@ -98,6 +98,7 @@ if [ $source = "yes" ] ; then
 					  included[source] = pkg
 					  incarch[source] = arch
 					  indexnr[source] = FNR
+                      sourcecomp[source] = component
 					} else {
 					  if (FNR < indexnr[source]) {
 					    printf("# Updating source %s: was due to %d:%s:%s, now moved earlier because of %d:%s:%s\n",
@@ -116,7 +117,7 @@ if [ $source = "yes" ] ; then
 				}
 	END {
 	    for (source in included) {
-		printf("%d:aaaaaaaaaaaaaaaaaa:%s\n", indexnr[source], source)
+		printf("%d:aaaaaaaaaaaaaaaaaa:%s:%s\n", indexnr[source], sourcecomp[source], source)
 	    }
 	}' $ADIR/$CODENAME-source/apt-state/lists/*Sources $BDIR/DONE $list | sort -nk 1 -t : >> $BDIR/list.mid
 else