From b45e780519b5dab25ff543e842ac8691062eda0c Mon Sep 17 00:00:00 2001
From: Steve McIntyre <93sam@debian.org>
Date: Sat, 1 Nov 2008 23:08:01 +0000
Subject: [PATCH] Rename list2cds to sort_deps - more accurate name now that
 other code does the per-disc splitting later

---
 Makefile       | 8 ++++----
 tools/list2cds | 9 ++++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 0002e7aa..077644a2 100755
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ endif
 
 ## Internal variables  
 apt=$(BASEDIR)/tools/apt-selection
-list2cds=$(BASEDIR)/tools/list2cds
+sort_deps=$(BASEDIR)/tools/sort_deps
 md5sum=md5sum
 jigdo_cleanup=$(BASEDIR)/tools/jigdo_cleanup
 grab_md5=$(BASEDIR)/tools/grab_md5
@@ -255,7 +255,7 @@ packagelists: ok apt-update genlist
 # Build the raw list (cpp output) with doubles and spaces
 $(BDIR)/rawlist:
 # Dirty workaround for saving space, we add some hints to break ties.
-# This is just a temporal solution, list2cds should be a little bit less
+# This is just a temporal solution, sort_deps should be a little bit less
 # silly so that this is not needed. For more info have a look at
 # http://lists.debian.org/debian-cd/2004/debian-cd-200404/msg00093.html
 	$(Q)if [ "$(SOURCEONLY)"x != "yes"x ] ; then \
@@ -322,9 +322,9 @@ $(BDIR)/list: $(BDIR)/rawlist
 ## IMAGE BUILDING ##
 
 image-trees: ok genlist
-    # Use list2cds to do the dependency sorting
+    # Use sort_deps to do the dependency sorting
 	$(Q)for ARCH in $(ARCHES_NOSRC); do \
-		ARCH=$$ARCH $(list2cds) $(BDIR)/list; \
+		ARCH=$$ARCH $(sort_deps) $(BDIR)/list; \
 	done
 	$(Q)if [ "$(SOURCEONLY)"x = "yes"x ] ; then \
 		$(grab_source_list) $(BDIR) $(ADIR) $(BDIR)/list $(BDIR)/packages; \
diff --git a/tools/list2cds b/tools/list2cds
index 37e6d849..c90fddb6 100755
--- a/tools/list2cds
+++ b/tools/list2cds
@@ -8,6 +8,9 @@
 #
 # and it sorts those packages such that dependencies are met in order
 #
+# Used to be called list2cds, renamed as it now just sorts
+# dependencies. Later code in make_disc_trees.pl actually splits on a
+# per-disc basis now.
 
 use strict;
 
@@ -30,8 +33,8 @@ my @output;
 
 $| = 1; # Autoflush for debugging
 
-open(LOG, ">$dir/log.list2cds.$arch")
-       || die "Can't write in $dir/log.list2cds.$arch !\n";
+open(LOG, ">$dir/log.sort_deps.$arch")
+       || die "Can't write in $dir/log.sort_deps.$arch !\n";
 
 sub msg {
 	my $level = shift;
@@ -45,7 +48,7 @@ my %included;
 my %excluded;
 my %packages;
 
-msg(0, "Running list2cds to sort packages for $arch:\n");
+msg(0, "Running sort_deps to sort packages for $arch:\n");
 msg(1, "======================================================================
 Here are the settings you've chosen for making the list:
 Architecture: $arch