From bdb3e3984b044a0170caf74d02ecd543a81c9b65 Mon Sep 17 00:00:00 2001
From: Frans Pop <fjp@debian.org>
Date: Sat, 1 Nov 2008 23:06:59 +0000
Subject: [PATCH] Remove no longer used references to rawlist.exclude and
 list.exclude files

These files have not been used since the introduction of make_disk_trees.pl.
Remove remaining references, which results in a nice clean up of the Makefile.
---
 Makefile         | 27 +--------------------------
 debian/changelog |  3 ++-
 tools/list2cds   |  2 --
 3 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/Makefile b/Makefile
index 5680d816..0002e7aa 100755
--- a/Makefile
+++ b/Makefile
@@ -248,9 +248,7 @@ apt-update: status
 # Deleting the list only
 deletelist: ok
 	$(Q)-rm $(BDIR)/rawlist
-	$(Q)-rm $(BDIR)/rawlist-exclude
 	$(Q)-rm $(BDIR)/list
-	$(Q)-rm $(BDIR)/list.exclude
 
 packagelists: ok apt-update genlist
 
@@ -311,25 +309,9 @@ $(BDIR)/rawlist:
 	fi
 #	ls -al $(BDIR)/rawlist
 
-# Build the raw list (cpp output) with doubles and spaces for excluded packages
-$(BDIR)/rawlist-exclude:
-	$(Q)if [ -n "$(EXCLUDE)" ]; then \
-		for ARCH in $(ARCHES); do \
-			ARCHDEFS="$$ARCHDEFS -D ARCH_$(subst -,_,$$ARCH)"; \
-			ARCHUNDEFS="$$ARCHUNDEFS -U $$ARCH"; \
-		done; \
-	 	perl -npe 's/\@ARCH\@/$(ARCH)/g' $(EXCLUDE) | \
-			cpp -nostdinc -nostdinc++ -P -undef $$ARCHDEFS \
-			$$ARCHUNDEFS -U i386 -U linux -U unix \
-			-DFORCENONUSONCD1=0 \
-			-I $(BASEDIR)/tasks -I $(BDIR) - - >> $(BDIR)/rawlist-exclude; \
-	else \
-		echo > $(BDIR)/rawlist-exclude; \
-	fi
-
 # Generate the complete listing of packages from the task
 # Build a nice list without doubles and without spaces
-genlist: ok $(BDIR)/list $(BDIR)/list.exclude
+genlist: ok $(BDIR)/list
 $(BDIR)/list: $(BDIR)/rawlist
 	@echo "Generating the complete list of packages to be included in $(BDIR)/list..."
 	$(Q)perl -ne 'chomp; next if /^\s*$$/; \
@@ -337,13 +319,6 @@ $(BDIR)/list: $(BDIR)/rawlist
 		  $(BDIR)/rawlist \
 		  > $(BDIR)/list
 
-$(BDIR)/list.exclude: $(BDIR)/rawlist-exclude
-	@echo "Generating the complete list of packages to be removed ..."
-	$(Q)perl -ne 'chomp; next if /^\s*$$/; \
-	          print "$$_\n" if not $$seen{$$_}; $$seen{$$_}++;' \
-		  $(BDIR)/rawlist-exclude \
-		  > $(BDIR)/list.exclude
-
 ## IMAGE BUILDING ##
 
 image-trees: ok genlist
diff --git a/debian/changelog b/debian/changelog
index 44b53501..88ab9d6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ debian-cd (3.0.6) UNRELEASED; urgency=low
     This should not affect users as netinst installs should normally use a
     mirror and thus the package will be installed from there if needed.
     brltty will still get included on full CDs and DVDs through forcd1.
+  * Remove no longer used references to rawlist.exclude and list.exclude files.
 
- -- Frans Pop <fjp@debian.org>  Wed, 29 Oct 2008 14:58:02 +0100
+ -- Frans Pop <fjp@debian.org>  Sun, 02 Nov 2008 00:03:00 +0100
 
 debian-cd (3.0.5) unstable; urgency=low
 
diff --git a/tools/list2cds b/tools/list2cds
index 8b330d61..37e6d849 100755
--- a/tools/list2cds
+++ b/tools/list2cds
@@ -17,7 +17,6 @@ my $nonfree = $ENV{'NONFREE'} || 0;
 my $extranonfree = $ENV{'EXTRANONFREE'} || 0;
 my $local = $ENV{'LOCAL'} || 0;
 my $complete = $ENV{'COMPLETE'} || 0;
-my $exclude = "$list.exclude";
 my $norecommends = $ENV{'NORECOMMENDS'} || 0;
 my $nosuggests = $ENV{'NOSUGGESTS'} || 1;
 
@@ -51,7 +50,6 @@ msg(1, "======================================================================
 Here are the settings you've chosen for making the list:
 Architecture: $arch
 List of prefered packages: $list
-Exclude file: $exclude
 Output file: $dir/packages.$arch
 ");
 msg(1, "Complete selected packages with all the rest: ");