revert unncessary code change, will be picked up post-etch

debian/changelog

@@ -28,9 +28,6 @@ tasksel (2.59) UNRELEASED; urgency=low
   * Remove gimp-print from print server task, since it's only a gimp printing
     plugin. It remains in the desktop task, which includes the gimp.
     Closes: #400251
-  * Allow includes in tasks to refer to other tasks.
-  * Use this to make the desktop task's list of printer drivers be taken
-    from the print-server tasks's list.
   * Remove no longer available packages from various language tasks.
   * Remove ptrconf from desktop task. The actual package is sparc-utils, and
     xorg depends on it on sparc.

doincludes.pl

@@ -24,8 +24,6 @@ my %depends;
 	close AVAIL;
 }
 
-use Cwd;
-my $topdir=getcwd;
 use File::Find;
 find(\&processfile, $dir);
 
@@ -46,27 +44,23 @@ sub processfile {
 		
 		push @lines, $_ unless $skipping == 1;
 
-		if (/^#\s*include\s+([-a-z0-9]+)\s*$/) {
+		if (/^#\s*include\s+(\w+)/) {
 			my $pkg=$1;
 			if ($skipping) {
 				die "$file: nested includes near $_\n";
 			}
-			if (-e $pkg) {
-				push @lines, "# Automatically added by doincludes.pl; do not edit.\n";
-				push @lines, map { chomp; "  $_\n" }
-				             `$topdir/listpackages.pl $pkg`;
-			}
-			elsif (! exists $depends{$pkg}) {
-				warn "$file: #include $dir/$pkg skipped; no such package. Leaving what was there alone.\n";
+			if (! exists $depends{$pkg}) {
+				warn "$file: #include $1 skipped; no such package. Leaving what was there alone.\n";
+				$skipping=-1;
 			}
 			else {
-				push @lines, "# Automatically added by doincludes.pl; do not edit.\n";
+				push @lines, "#Automatically added by doincludes.pl; do not edit.\n";
 				# Split deps and remove alternates and versioned
 				# deps. Include the metapackage on the list.
 				push @lines, map { s/[|(].*//; "  $_\n" }
 				             split(/,\s+/, $depends{$pkg}), $pkg;
+				$skipping=1;
 			}
-			$skipping=1;
 		}
 	}
 	close IN;

listpackages.pl

@@ -1,10 +1,10 @@
 #!/usr/bin/perl
 #
-# listpackages directory|file
+# listpackages directory [field]
 #
 # This program spits out a list of all the packages listed in the tasks.
 #
-# If you go to ftp-master, this command is then useful:
+# If you go to auric, this command is then useful:
 #
 # for package in $(listpackages); do
 #   madison -s testing -a "i386 all" $package >/dev/null || echo "No $package!"
@@ -14,26 +14,18 @@
 #
 # listpackages tasks key
 
-my $what=shift or die "no directory or file specified\n";
+my $dir=shift or die "no directory specified\n";
 my @toshow=qw{packages-list key};
 @toshow=@ARGV if @ARGV;
 
-if (-d $what) {
-	use File::Find;
-	find(\&processfile, $what);
-}
-else {
-	processfile($what);
-}
+use File::Find;
+find(\&processfile, $dir);
 
 sub processfile {
-	my $file=shift;
-	if (! defined $file) {
-		$file=$_; # File::Find craziness.
-		$file eq 'po' && -d $file && ($File::Find::prune = 1);
-		return if $File::Find::dir=~/\.svn/;
-		return unless $file =~ /^[-+_.a-z0-9]+$/ and -f $file;
-	}
+	my $file=$_; # File::Find craziness.
+	$file eq 'po' && -d $file && ($File::Find::prune = 1);
+	return if $File::Find::dir=~/\.svn/;
+	return unless $file =~ /^[-+_.a-z0-9]+$/ and -f $file;
 	open (IN, $file) or die "$file: $!";
 	my %fields;
 	my $field="";

tasks/desktop

@@ -51,8 +51,6 @@ Packages-list:
   anacron
 # The following packages are the same as the packages in the print-server
 # task and provide printing via CUPS.
-#include print-server
-# Automatically added by doincludes.pl; do not edit.
   foomatic-gui
   foomatic-db-engine
   foomatic-db-hpijs
@@ -64,4 +62,3 @@ Packages-list:
   cupsys
   cupsys-client
   cupsys-bsd
-#endinclude