5 files changed, 4 insertions, 29 deletions
diff --git a/CONF.sh b/CONF.sh
index e12c97f..01751f5 100644
--- a/CONF.sh
+++ b/CONF.sh
@@ -3,7 +3,6 @@
 #
 
 # Unset all optional variables first to start from a clean state
-unset NONUS             || true
 unset NONFREE           || true
 unset CONTRIB           || true
 unset EXTRANONFREE      || true
@@ -150,9 +149,6 @@ export FULLARCH=$ARCH${SUBARCH:++$SUBARCH}
 # Paths to the mirrors
 export MIRROR=${MIRROR:-$CDIMAGE_ROOT/ftp}
 
-# Comment the following line if you don't have/want non-US
-#export NONUS=/ftp/debian-non-US
-
 # Path of the temporary directory
 export TDIR=$CDIMAGE_ROOT/scratch/$PROJECT/$DIST/$IMAGE_TYPE/tmp
 
diff --git a/Makefile b/Makefile
index c597185..3805b4c 100644
--- a/Makefile
+++ b/Makefile
@@ -145,7 +145,6 @@ scanpackages=$(BASEDIR)/tools/scanpackages
 scansources=$(BASEDIR)/tools/scansources
 add_files=$(BASEDIR)/tools/add_files
 set_mkisofs_opts=$(BASEDIR)/tools/set_mkisofs_opts
-strip_nonus_bin=$(BASEDIR)/tools/strip-nonUS-bin
 add_secured=$(BASEDIR)/tools/add_secured
 md5sum=/usr/bin/md5sum
 sha1sum=/usr/bin/sha1sum
@@ -327,13 +326,11 @@ $(ADIR):
 clean: ok bin-clean src-clean
 bin-clean:
 	$(Q)rm -rf $(BDIR)/CD[1234567890]*
-	$(Q)rm -rf $(BDIR)/*_NONUS
 	$(Q)rm -f $(BDIR)/*.filelist*
 	$(Q)rm -f  $(BDIR)/packages-stamp $(BDIR)/bootable-stamp \
 	         $(BDIR)/upgrade-stamp $(BDIR)/secured-stamp $(BDIR)/md5-check
 src-clean:
 	$(Q)rm -rf $(SDIR)/CD[1234567890]*
-	$(Q)rm -rf $(SDIR)/*_NONUS
 	$(Q)rm -rf $(SDIR)/sources-stamp $(SDIR)/secured-stamp $(SDIR)/md5-check
 
 # Completely cleans the current arch tree
@@ -525,7 +522,7 @@ $(BDIR)/CD1/.disk/info:
 	for i in $(BDIR)/*.packages; do \
 		num=$${i%%.packages}; num=$${num##$(BDIR)/}; \
 		dir=$(BDIR)/CD$$num; \
-		echo -n $(BINDISKINFO) | sed 's/_NONUS//g' > $$dir/.disk/info; \
+		echo -n $(BINDISKINFO) > $$dir/.disk/info; \
 		echo -n $(BINVOLID) > $(BDIR)/$${num}.volid; \
 		$(set_mkisofs_opts) bin $$num > $(BDIR)/$${num}.mkisofs_opts; \
 	done
@@ -538,7 +535,7 @@ $(SDIR)/CD1/.disk/info:
 	for i in $(SDIR)/*.sources; do \
 		num=$${i%%.sources}; num=$${num##$(SDIR)/}; \
 		dir=$(SDIR)/CD$$num; \
-		echo -n $(SRCDISKINFO) | sed 's/_NONUS//g' > $$dir/.disk/info; \
+		echo -n $(SRCDISKINFO) > $$dir/.disk/info; \
 		echo -n $(SRCVOLID) > $(SDIR)/$${num}.volid; \
 		$(set_mkisofs_opts) src $$num > $(SDIR)/$${num}.mkisofs_opts; \
 	done
@@ -606,7 +603,7 @@ $(SDIR)/sources-stamp:
 		dir=$(SDIR)/CD$$n; \
 		echo -n "$$n ... "; \
 		echo -n "main ... "; \
-		grep -vE "(non-US/|/local/)" $$i > $$i.main || true ; \
+		grep -vE "/local/" $$i > $$i.main || true ; \
 		if [ -s $$i.main ] ; then \
 			cat $$i.main | xargs $(add_files) $$dir $(MIRROR); \
 		fi ; \
@@ -623,13 +620,6 @@ $(SDIR)/sources-stamp:
 				fi; \
 		    fi; \
 		fi; \
-		if [ -n "$(NONUS)" ]; then \
-			echo -n "non-US ... "; \
-			grep "non-US/" $$i > $$i.nonus || true ; \
-			if [ -s $$i.nonus ] ; then \
-				cat $$i.nonus | xargs $(add_files) $$dir $(NONUS); \
-			fi; \
-		fi; \
 		$(scansources) $$dir; \
 		echo "done."; \
 	done
diff --git a/README b/README
index 79d0282..5735487 100644
--- a/README
+++ b/README
@@ -114,8 +114,7 @@ The process of building a CD is composed of the following steps:
 
     $ export NONFREE=1; make list TASK=tasks/your-task-here COMPLETE=1
 
-  or for something like an official image for the USA (without non-US &
-  non-free) :
+  or for something like an official image for the USA (without non-free) :
 
     $ make list COMPLETE=1 SIZELIMIT1=576716800
 
@@ -123,8 +122,6 @@ The process of building a CD is composed of the following steps:
   
   You can change the behaviour of this command with the following
   variables:
-  - if NONUS is set, then packages from non-US will be allowed (the value
-    of NONUS must be the path to the non-US mirror if you have one)
   - if NONFREE is set, then packages from non-free will be allowed
     (NONFREE must be exported to all sub-shells)
   - if EXTRANONFREE is set, then non-free packages will be included
diff --git a/tools/add_packages b/tools/add_packages
index 38410f5..80443db 100755
--- a/tools/add_packages
+++ b/tools/add_packages
@@ -11,7 +11,6 @@ if (! -d $dir) {
 my $mirror  = $ENV{'MIRROR'}  || die "Set the MIRROR var ...\n";
 my $localdebs = $ENV{'LOCALDEBS'} || $mirror;
 my $security = $ENV{'SECURITY'} || $mirror;
-my $nonus   = $ENV{'NONUS'}   || '';
 my $basedir = $ENV{'BASEDIR'} || die "Set the BASEDIR var ...\n";
 
 open (LIST, "$basedir/tools/apt-selection cache show @ARGV |") 
diff --git a/tools/list2src b/tools/list2src
index f01b9cc..8923ff8 100755
--- a/tools/list2src
+++ b/tools/list2src
@@ -17,7 +17,6 @@ my $limit = $ENV{'SRCSIZELIMIT1'} || $deflimit;
 
 my $nonfree = $ENV{'NONFREE'} || 0;
 my $extranonfree = $ENV{'EXTRANONFREE'} || 0;
-my $nonus = $ENV{'NONUS'} || 0;
 my $contrib = $ENV{'CONTRIB'} || 0;
 my $complete = $ENV{'COMPLETE'} || 0;
 my $local = $ENV{'LOCAL'} || 0;
@@ -52,7 +51,6 @@ my %bin2src;
 my %sources;
 my %included;
 my %excluded;
-my @nonuslist=();
 my %includesrc;
 
 my @sections = ( "main" );
@@ -114,11 +112,6 @@ while (defined($_ = <SOURCES>)) {
 	} else {
 		$excluded{$p} = 0;
 	}
-	# Generate the list of non-US source packages
-	if (($sources{$p}{"Directory"} =~ /non-US/)) 
-	{
-	    push @nonuslist, $p;
-	}
 	# Match between source & binary packages
 	foreach $bin (split (/,\s+/, $sources{$p}{"Binary"})) {
 		$bin2src{$bin} = $p;