Fix minor logic hole in source matching

Makefile

@@ -220,6 +220,17 @@ $(ADIR)/status:
 		export ARCH=$$ARCH; \
 		$(apt) update; \
 	done
+
+	# If we're doing a build using d-i from sid, we'll need sid sources too
+	if [ "$(INC_SOURCE)"x = "yes"x ] && \
+		[ "$(DI_CODENAME)"x != ""x ] && \
+		[ "$(DI_CODENAME}"x != "$(CODENAME)"x ] ; then \
+		mkdir -p $(ADIR)/$(DI_CODENAME)-source/apt/preferences.d ; \
+		:> $(ADIR)/$(DI_CODENAME)-source/status ; \
+		export CODENAME=$(DI_CODENAME); \
+		export ARCH=source; \
+		$(apt) update; \
+	fi
     #
     # Checking the consistency of the standard system
     # If this does fail, then launch make correctstatus

tools/merge_package_lists

@@ -65,7 +65,6 @@ if [ $source = "yes" ] ; then
     /^Package:/ {
         srcname=$2
         srcs_done++
-        num_sources = 0
         }
 
     /^Binary:/ {
@@ -117,6 +116,7 @@ if [ $source = "yes" ] ; then
         in_files = 0
         in_binary = 0
         if (parsed) {
+            num_sources = 0
             split($0,fields,":")
             arch=fields[1]
             component=fields[2]