dselect: Remove traces of non-US support from methods

This has been obsoleted long ago.

10 files changed, 14 insertions, 38 deletions

diff --git a/debian/changelog b/debian/changelog
index 1addd4564..36282818a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ dpkg (1.19.0) UNRELEASED; urgency=medium
   * Add new dpkg-buildflags --query command, which is like --status but in
     deb822 format.
   * Remove long obsolete dselect floppy method.
+  * Remove traces of non-US support from dselect methods.
   * Perl modules:
     - Switch from Dpkg::Util to List::Util, now that the module in the
       new required Perl contains the needed functions.
diff --git a/dselect/methods/disk/install b/dselect/methods/disk/install
index 081c12db8..a08de4166 100755
--- a/dselect/methods/disk/install
+++ b/dselect/methods/disk/install
@@ -124,7 +124,7 @@ package by using '\''dpkg --install --auto-deconfigure'\'' by hand.
 	' -- "$p_mountpoint$p_main_binary" "$predep"
 done
 
-for f in main ctb nf nus lcl
+for f in main ctb nf lcl
 do
 	eval 'this_binary=$p_'$f'_binary'
 	if [ -z "$this_binary" ]; then continue; fi
diff --git a/dselect/methods/disk/setup b/dselect/methods/disk/setup
index b6ea82ac8..7039ed161 100755
--- a/dselect/methods/disk/setup
+++ b/dselect/methods/disk/setup
@@ -149,7 +149,7 @@ If you make a mistake, use the interrupt key ($intrkey) to abort.
 "
 
 # State variables, “best first”
-#  {main,ctb,nf,nus,lcl}_{packages,binary}
+#  {main,ctb,nf,lcl}_{packages,binary}
 #   Empty before we've found them or if they're not available,
 #   set to the relevant bit under mountpoint otherwise.
 #  hierbase
@@ -559,7 +559,6 @@ Where is the _$1_ 'Packages' file (if none is available, say 'none')
 find_area main main main "$p_main_binary" "$p_main_packages"
 find_area contrib ctb contrib "$p_ctb_binary" "$p_ctb_packages"
 find_area non-free nf non-free "$p_nf_binary" "$p_nf_packages"
-find_area non-US nus non-US "$p_nus_binary" "$p_nus_packages"
 find_area local lcl local "$p_lcl_binary" "$p_lcl_packages"
 
 echo -n '
@@ -582,8 +581,6 @@ outputparam p_ctb_packages "$ctb_packages"
 outputparam p_ctb_binary "$ctb_binary"
 outputparam p_nf_packages "$nf_packages"
 outputparam p_nf_binary "$nf_binary"
-outputparam p_nus_packages "$nus_packages"
-outputparam p_nus_binary "$nus_binary"
 outputparam p_lcl_packages "$lcl_packages"
 outputparam p_lcl_binary "$lcl_binary"
 
diff --git a/dselect/methods/disk/update b/dselect/methods/disk/update
index 4023122e0..ff7ad3404 100755
--- a/dselect/methods/disk/update
+++ b/dselect/methods/disk/update
@@ -23,8 +23,7 @@ cd "$vardir/methods/disk"
 . ./shvar.$option
 
 if [ -z "$p_main_packages" ] && [ -z "$p_ctb_packages" ] && \
-   [ -z "$p_nf_packages" ] && [ -z "$p_nus_packages " ] && \
-   [ -z "$p_lcl_packages" ]
+   [ -z "$p_nf_packages" ] && [ -z "$p_lcl_packages" ]
 then
 	echo '
 No Packages files available, cannot update available packages list.
@@ -35,7 +34,7 @@ fi
 
 xit=1
 trap '
-	rm -f packages-main packages-ctb packages-nf packages-nus packages-lcl
+	rm -f packages-main packages-ctb packages-nf packages-lcl
 	if [ -n "$umount" ]
 	then
 		umount "$umount" >/dev/null 2>&1
@@ -57,7 +56,7 @@ fi
 
 updatetype=update
 
-for f in main ctb nf nus lcl
+for f in main ctb nf lcl
 do
 	eval 'this_packages=$p_'$f'_packages'
 	case "$this_packages" in
diff --git a/dselect/methods/ftp/setup.pl b/dselect/methods/ftp/setup.pl
index 67a86fef6..562a61f65 100755
--- a/dselect/methods/ftp/setup.pl
+++ b/dselect/methods/ftp/setup.pl
@@ -91,10 +91,6 @@ Eg:      ftp site: ftp.debian.org
     distributions: dists/stable/main dists/stable/contrib
      download dir: debian
 
-If you want to install package from non-US consider adding a second ftp site
-with "debian-non-US" as debian directory and "dists/stable/non-US" as
-distribution.
-
 You may have to use an authenticated FTP proxy in order to reach the
 FTP site:
 
diff --git a/dselect/methods/multicd/README.multicd b/dselect/methods/multicd/README.multicd
index 8ba4a029b..adbf8186d 100644
--- a/dselect/methods/multicd/README.multicd
+++ b/dselect/methods/multicd/README.multicd
@@ -23,7 +23,6 @@ Acquiring package data
   . main
   . contrib
   . non-free
-  . non-US
   . local
 
  The selected method will try to read the 'Packages.cd' file from each
@@ -79,7 +78,6 @@ Sample Layout
                        binary-i386/net/foo.deb
                   contrib/binary-i386/Packages.cd.gz
                   non-free/binary-i386/Packages.cd.gz
-                  non-US/binary-i386/Packages.cd.gz
 
  CD2 .disk/info = "Debian GNU/Linux contrib-i386"
      dists/stable/main/binary-i386/Packages.cd.gz
@@ -87,7 +85,6 @@ Sample Layout
                           binary-i386/Packages.cd.gz
                           binary-i386/net/foo.deb
                   non-free/binary-i386/Packages.cd.gz
-                  non-US/binary-i386/Packages.cd.gz
 
  CD3 .disk/info = "Debian GNU/Linux non-free-i386"
      dists/stable/main/binary-i386/Packages.cd.gz
@@ -95,7 +92,6 @@ Sample Layout
                   non-free/binary-all/
                            binary-i386/Packages.cd.gz
                            binary-i386/net/foo.deb
-                  non-US/binary-all/
 
  To re-generate the Packages file you have to chdir into
  'dists/stable/$part' and issue 'dpkg-scanpackages' as follows.  It's
diff --git a/dselect/methods/multicd/desc.multi_mount b/dselect/methods/multicd/desc.multi_mount
index b3e7a64a1..884bef62c 100644
--- a/dselect/methods/multicd/desc.multi_mount
+++ b/dselect/methods/multicd/desc.multi_mount
@@ -1,9 +1,8 @@
 Installation from a pre-mounted directory with changing content.
 
 The directory contains the Packages.gz file from each distribution
-area being installed (usually main, contrib, non-free, local and
-eventually non-US) as well as an excerpt of the corresponding
-binary/*/*.deb files.
+area being installed (usually main, contrib, non-free and local)
+as well as an excerpt of the corresponding binary/*/*.deb files.
 
 The easiest way for them to get this is to make a (partial) copy of
 the distribution site's directory hierarchy, if possible.
diff --git a/dselect/methods/multicd/desc.multi_nfs b/dselect/methods/multicd/desc.multi_nfs
index ead5665a1..e63a8ab06 100644
--- a/dselect/methods/multicd/desc.multi_nfs
+++ b/dselect/methods/multicd/desc.multi_nfs
@@ -2,8 +2,8 @@ Installation across the network, from an NFS server which is not
 currently mounted.
 
 The server should contain the Packages.gz file from each distribution
-area being installed (usually main, contrib, non-free, local and
-eventually non-US) as well as the corresponding binary/*/*.deb files.
+area being installed (usually main, contrib, non-free and local)
+ as well as the corresponding binary/*/*.deb files.
 
 The easiest way for them to get this is to make a (partial) copy of
 the distribution site's directory hierarchy, if possible.
diff --git a/dselect/methods/multicd/setup b/dselect/methods/multicd/setup
index 1f20a9e90..3470da3fd 100755
--- a/dselect/methods/multicd/setup
+++ b/dselect/methods/multicd/setup
@@ -177,7 +177,7 @@ If you make a mistake, use the interrupt key ($intrkey) to abort.
 "
 
 # State variables, “best first”
-#  {main,ctb,nf,nonus,nonusctb,nonusnf,lcl}_{packages,binary}
+#  {main,ctb,nf,lcl}_{packages,binary}
 #   Empty before we've found them or if they're not available,
 #   set to the relevant bit under mountpoint otherwise.
 #  hierbase
@@ -637,9 +637,6 @@ Where is the _$1_ 'Packages.cd' file (if none is available, say 'none')
 find_area main main "$distribution" "$p_main_binary" "$p_main_packages"
 find_area contrib ctb "$distribution" "$p_ctb_binary" "$p_ctb_packages"
 find_area non-free nf "$distribution" "$p_nf_binary" "$p_nf_packages"
-find_area non-US/main nonus "$distribution" "$p_nonus_binary" "$p_nonus_packages"
-find_area non-US/contrib nonusctb "$distribution" "$p_nonusctb_binary" "$p_nonusctb_packages"
-find_area non-US/non-free nonusnf "$distribution" "$p_nonusnf_binary" "$p_nonusnf_packages"
 find_area local lcl local "$p_lcl_binary" "$p_lcl_packages"
 
 echo -n '
@@ -665,15 +662,6 @@ outputparam p_ctb_disk "$ctb_disk"
 outputparam p_nf_packages "$nf_packages"
 outputparam p_nf_binary "$nf_binary"
 outputparam p_nf_disk "$nf_disk"
-outputparam p_nonus_binary "$nonus_binary"
-outputparam p_nonus_packages "$nonus_packages"
-outputparam p_nonus_disk "$nonus_disk"
-outputparam p_nonusctb_binary "$nonusctb_binary"
-outputparam p_nonusctb_packages "$nonusctb_packages"
-outputparam p_nonusctb_disk "$nonusctb_disk"
-outputparam p_nonusnf_binary "$nonusnf_binary"
-outputparam p_nonusnf_packages "$nonusnf_packages"
-outputparam p_nonusnf_disk "$nonusnf_disk"
 outputparam p_lcl_packages "$lcl_packages"
 outputparam p_lcl_binary "$lcl_binary"
 outputparam p_multi "$multi"
diff --git a/dselect/methods/multicd/update b/dselect/methods/multicd/update
index f06740621..0701ef051 100755
--- a/dselect/methods/multicd/update
+++ b/dselect/methods/multicd/update
@@ -31,7 +31,7 @@ debug() { true; }
 ismulti() { debug $1 $2; test -e "$1/.disk/info" || test -e "$1$2/.disk/info"; }
 
 packages=0
-for f in main ctb nf nonus nonusctb nonusnf lcl
+for f in main ctb nf lcl
 do
     eval 'this_packages=$p_'$f'_packages'
 
@@ -52,7 +52,7 @@ fi
 
 xit=1
 trap '
-	rm -f packages-{main,ctb,nf,nonus,nonusctb,nonusnf,lcl}
+	rm -f packages-{main,ctb,nf,lcl}
 	if [ -n "$umount" ]
 	then
 		umount "$umount" >/dev/null 2>&1
@@ -83,7 +83,7 @@ if [ -z "$p_multi" ]; then
 	exit 1
 fi
 
-for f in main ctb nf nonus nonusctb nonusnf lcl
+for f in main ctb nf lcl
 do
 	eval 'this_packages=$p_'$f'_packages'
 	case "$this_packages" in