Merge branch 'debian/sid' into debian/experimental

[apt.git] / dselect / setup

diff --git a/dselect/setup b/dselect/setup
index fd0daa927fb8ec13dae63ef4acbece6cd8719112..8689d2388b0d2738cf683786e4a040f5395f70ef 100755 (executable)
--- a/dselect/setup
+++ b/dselect/setup
@@ -30,7 +30,7 @@ my $boldoff=`setterm -bold off`;
 
 my @known_types           = ('deb');
 my @known_access         = ('http', 'ftp', 'file');
-my @typical_distributions = ('stable', 'unstable', 'frozen', 'non-US');
+my @typical_distributions = ('stable', 'unstable', 'testing', 'non-US');
 my @typical_components    = ('main', 'contrib', 'non-free');
 
 my %known_access           = map {($_,$_)} @known_access;
@@ -118,7 +118,7 @@ sub get_source {
   }
 
   $type         = 'deb';
-  $urn          = "http://llug.sep.bnl.gov/debian" unless $urn;
+  $urn          = "http://http.us.debian.org/debian" unless $urn;
   $distribution = "stable" unless $distribution;
   $components   = "main contrib non-free" unless $components;
 
@@ -269,7 +269,7 @@ sub main {
     print "-" x 72, "\n";
     &print_config('Config' => \@Oldconfig);
     print "-" x 72, "\n";
-    print "$boldon Do you wish to change it?[y/N]$boldoff ";
+    print "$boldon Do you wish to overwrite it? [y/N]$boldoff ";
     my $answer = <STDIN>;
     chomp ($answer);
     $answer =~ s/\s+/ /og;