* Instead of including all alternative dependencies in list2cds, only

include the first one. This reduces the size of the netinst and improves
  what's included on CD1. Only loss is console-{data,common,tools} so these
  are now added in generate_di+k_list.

debian/changelog

@@ -62,6 +62,10 @@ debian-cd (3.0.4) UNRELEASED; urgency=low
       Icelandic, Irish, Serbian, Welsh and Xhosa
   * lenny tasks: update for current task lists; set svn:keywords so the date
     header gets updated.
+  * Instead of including all alternative dependencies in list2cds, only
+    include the first one. This reduces the size of the netinst and improves
+    what's included on CD1. Only loss is console-{data,common,tools} so these
+    are now added in generate_di+k_list.
 
  -- Frans Pop <fjp@debian.org>  Mon, 17 Dec 2007 21:54:11 +0100
 

tools/generate_di+k_list

@@ -46,6 +46,9 @@ jfbterm
 unifont
 hotplug
 usbutils
+console-data
+console-common
+console-tools
 console-cyrillic
 console-terminus
 pcmcia-cs

tools/list2cds

@@ -565,6 +565,12 @@ sub add_missing {
 		if (ref) {
 			my $or_ok = 0;
 			# Loop over each package in the OR
+			# We always add the first package in the OR to allow
+			# APT to figure out which is the better one to install
+			# for any combination of packages that have similar
+			# alternative dependencies, but in different order.
+			# Having the first alternative available should be good
+			# enough for all cases we care about.
 			foreach my $pkg (@{$_}) {
 				next if not accepted ($pkg);
 				# If the package is already included
@@ -579,12 +585,12 @@ sub add_missing {
 					last;
 				# Otherwise try to add it
 				} else {
-					#Instead of doing a bad choice I'm
-					#including all packages that do
-					#fit to the needs
+					# Stop after the first package that is
+					# added successfully
 					push (@{$list}, $pkg);
 					if (add_missing ($list, $packages{$pkg}{"Depends"}, $pkg)) {
 						$or_ok = 1;
+						last;
 					} else {
 						pop @{$list};
 					}