Revert r1475 since it caused regressions. Will get back to it once time permits

debian/changelog

@@ -15,9 +15,6 @@ debian-cd (3.0.4) UNRELEASED; urgency=low
   * Exclude multipath-udeb and libaio1-udeb since they're not being use
     yet.
   * Fix autorun.inf generation when win32-loader is present.
-  * Exclude packages and add all task present ones before resolve
-    dependencies, avoiding OR dependencies to take their place and removed
-    packages dependencies to be included. Closes: #410418.
   * Applied patch from Nicolas François <nicolas.francois@centraliens.net>
     to allow README.html translation using po4a.
   * Remove the 'Last Modified' date from data/lenny/README.html.in since
@@ -40,7 +37,7 @@ debian-cd (3.0.4) UNRELEASED; urgency=low
   [ Joey Hess ]
   * Include dmraid deb. Closes: #443991
 
- -- Otavio Salvador <otavio@debian.org>  Fri, 28 Sep 2007 15:40:56 -0300
+ -- Joey Hess <joeyh@debian.org>  Thu, 27 Sep 2007 13:44:56 -0400
 
 debian-cd (3.0.3) unstable; urgency=low
 

tools/list2cds

@@ -104,16 +104,6 @@ if (not $nonfree) {
 	}
 }
 
-open (EXCLUDE_LIST, "< $exclude") || die "Can't open $exclude : $!\n";
-while (defined($_=<EXCLUDE_LIST>)) {
-	chomp;
-	next if m/^\s*$/;
-	next if $excluded{$_};
-	$excluded{$_} = 'list';
-	$count_excl++;
-}
-close EXCLUDE_LIST;
-
 msg(1, "Statistics:
 Number of packages: @{ [scalar(keys %packages)] }
 Number of excluded: $count_excl of @{ [scalar(keys %excluded)] }
@@ -189,20 +179,10 @@ while (defined($_=<LIST>)) {
 	    next;
 	}
 	next if $excluded{$_};
-	if ($included{$_} == -1) {
+	if ($included{$_}) {
 	    msg(3, "$_ has already been included.\n");
 	    next;
 	}
-
-	$included{$_} = -1;
-}
-close LIST;
-
-foreach (keys %included) {
-	next if ($included{$_} != -1);
-
-	$included{$_} = 0;
-
 	# This is because udebs tend to have bad dependencies but work
 	# nevertheless ... this may be removed once the udebs have a
 	# better depencency system
@@ -212,6 +192,7 @@ foreach (keys %included) {
 	    add_package ($_, ! $norecommends, ! $nosuggests);
 	}
 }
+close LIST;
 
 msg(0, "  Now up to $cd_size bytes\n");
 # All requested packages have been included