warn about non-free/contrib in tasks

makedesc.pl

@@ -25,6 +25,7 @@ my $dir=shift or die "no directory specified\n";
 my $file=shift or die "no file specified\n";
 
 my %package;
+my %notmain;
 my $dolint=1;
 {
 	local $/="\n\n";
@@ -35,6 +36,9 @@ my $dolint=1;
 	while (<AVAIL>) {
 		my ($package)=/Package:\s*(.*?)\n/;
 		$package{$package}=1;
+		if (/Section:\s*(contrib|non-free)/) {
+			$notmain{$package}=$1;
+		}
 	}
 	close AVAIL;
 }
@@ -74,6 +78,9 @@ sub processfile {
 			if (! $package{$_}) {
 				print STDERR "$file: $_ is not a valid package.\n";
 			}
+			if ($notmain{$_}) {
+				print STDERR "$file: $_ is in $notmain{$_}.\n";
+			}
 		}
 	}
 

tasks/unix-server

@@ -28,7 +28,7 @@ Packages:
  mtr
  man-db
  manpages
- emacs20 # nvi is in base
+ emacs20 # nvi is in base   Hmm, would emacs21 be better?
  nethack # may be stretching the point
  bsdgames # fits description perfectly
  # could add a few other console games, esp. multiuser ones