From 1fa64892e4d54cd52fac731e646cc3d13382fb5a Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sun, 20 Mar 2022 11:15:33 +0100 Subject: Remove non-US leftovers in code and documentation This has long been obsoleted, and there have been previous patches cleaning them up, but some left overs remained. --- apt-pkg/cdrom.cc | 2 -- apt-pkg/indexcopy.cc | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'apt-pkg') diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 70192a044..84ddae40c 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -223,8 +223,6 @@ int pkgCdrom::Score(string Path) Res += 20; if (Path.find("/non-free-firmware/") != string::npos) Res += 20; - if (Path.find("/non-US/") != string::npos) - Res += 20; if (Path.find("/source/") != string::npos) Res += 10; if (Path.find("/debian/") != string::npos) diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index e635b9042..139b10316 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -335,7 +335,7 @@ bool IndexCopy::ReconstructChop(unsigned long &Chop,string Dir,string File) |------------------- Path It was deciced to use only a single word for dist (rather than say - unstable/non-us) to increase the chance that each CD gets a single + unstable/some-component) to increase the chance that each CD gets a single line in sources.list. */ void IndexCopy::ConvertToSourceList(string CD,string &Path) -- cgit v1.2.3-70-g09d2 From bb67ff79e03eec05429fa4d7562813d18080e829 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Sun, 20 Mar 2022 11:42:36 +0100 Subject: Use deb.debian.org instead of ftp.debian.org URLs While the ftp.debian.org URLs are still functional in Debian, they can confuse people as the protocol is mismatched. Using the deb.debian.org frontend should also generally give generally good performance regardless of the client location. --- apt-pkg/versionmatch.h | 2 +- doc/examples/ftp-archive.conf | 8 ++++---- doc/guide.dbk | 2 +- dselect/setup | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'apt-pkg') diff --git a/apt-pkg/versionmatch.h b/apt-pkg/versionmatch.h index abaec08d6..283df6128 100644 --- a/apt-pkg/versionmatch.h +++ b/apt-pkg/versionmatch.h @@ -13,7 +13,7 @@ Release: a=testing Release: n=squeeze Release: * - Origin: ftp.debian.org + Origin: deb.debian.org Release may be a complex type that can specify matches for any of: Version (v= with prefix) diff --git a/doc/examples/ftp-archive.conf b/doc/examples/ftp-archive.conf index 31ffb24c6..0908388ba 100644 --- a/doc/examples/ftp-archive.conf +++ b/doc/examples/ftp-archive.conf @@ -3,9 +3,9 @@ Dir { - ArchiveDir "/srv/ftp.debian.org/ftp/"; - OverrideDir "/srv/ftp.debian.org/scripts/override/"; - CacheDir "/srv/ftp.debian.org/scripts/cache/"; + ArchiveDir "/srv/deb.debian.org/ftp/"; + OverrideDir "/srv/deb.debian.org/scripts/override/"; + CacheDir "/srv/deb.debian.org/scripts/cache/"; }; Default @@ -19,7 +19,7 @@ Default TreeDefault { - Contents::Header "/srv/ftp.debian.org/scripts/masterfiles/Contents.top"; + Contents::Header "/srv/deb.debian.org/scripts/masterfiles/Contents.top"; BinCacheDB "packages-$(ARCH).db"; // These are all defaults and are provided for completeness diff --git a/doc/guide.dbk b/doc/guide.dbk index f65771def..c5e6df257 100644 --- a/doc/guide.dbk +++ b/doc/guide.dbk @@ -224,7 +224,7 @@ use packages on your CD-ROM before downloading from the Internet. For example: file:/mnt/debian, ftp://ftp.example.org/debian, - http://ftp.de.debian.org/debian, + http://deb.debian.org/debian, URL [http://llug.sep.bnl.gov/debian]: diff --git a/dselect/setup b/dselect/setup index c8cb93378..522362e68 100755 --- a/dselect/setup +++ b/dselect/setup @@ -232,7 +232,7 @@ sub get_sources { print " For example:\n"; print " file:/mnt/debian,\n"; print " ftp://ftp.example.org/debian,\n"; - print " http://ftp.de.debian.org/debian,\n"; + print " http://deb.debian.org/debian,\n"; # print " and the special mirror scheme,\n"; # print " mirror:http://www.debian.org/archivemirrors \n"; print "\n"; -- cgit v1.2.3-70-g09d2