Source: sbuild
Version: 0.65.2-1
Severity: wishlist
Tags: patch

Hi,

at several points in the documentation, ftp.debian.org or
ftp.uk.debian.org is mentioned as a mirror in the examples. Now that
httpredir.debian.org exists, it should be the default mirror. Even
debootstrap since version 1.0.69 made it the default so sbuild should
follow suite.

Attached patch fixes the problem.

Thanks!

cheers, josch
>From 1fd7420cd16b76125a68b765101d82904b2a1080 Mon Sep 17 00:00:00 2001
From: Johannes 'josch' Schauer <jo...@mister-muffin.de>
Date: Sat, 11 Jul 2015 09:48:26 +0200
Subject: [PATCH] use httpredir.debian.org instead of ftp.debian.org or
 ftp.uk.debian.org in documentation

---
 man/sbuild-createchroot.8.in | 10 +++++-----
 man/sbuild-setup.7.in        |  6 +++---
 man/sbuild.1.in              |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/man/sbuild-createchroot.8.in b/man/sbuild-createchroot.8.in
index e04628f..f344f46 100644
--- a/man/sbuild-createchroot.8.in
+++ b/man/sbuild-createchroot.8.in
@@ -187,16 +187,16 @@ If no extension is specified, sbuild\-createchroot will rename \fIfile\fP to
 \fIfile.tar.gz\fP and generate \fIfile.tar.gz\fP as a compressed tarball using gzip.
 .SH EXAMPLES
 To create a plain type sid (unstable) chroot in \fI/srv/chroot/unstable\fP using
-the \fIftp.uk.debian.org\fP Debian mirror:
+the \fIhttpredir.debian.org\fP Debian http mirror redirector service:
 .PP
 \f[CR]% \f[CB]sudo sbuild\-createchroot sid /srv/chroot/unstable \fP\fP\\
 .br
-\f[CB]    http://ftp.uk.debian.org/debian\fP\[CR]
+\f[CB]    http://httpredir.debian.org/debian\fP\[CR]
 .PP
 To create a bootstrapped file type sid (unstable) chroot ready for use with
 sbuild and saved in \fI/var/cache/sbuild/sbuild.tar.gz\fP using the
-\fIftp.uk.debian.org\fP Debian mirror and using a temporary directory as the
-target:
+\fIhttpredir.debian.org\fP Debian http mirror redirector service and using a
+temporary directory as the target:
 .PP
 \f[CR]% \f[CB]sudo sbuild\-createchroot \fP\fP\\
 .br
@@ -204,7 +204,7 @@ target:
 .br
     sid `mktemp \-d` \fP\fP\\
 .br
-\f[CB]    http://ftp.uk.debian.org/debian\fP\[CR]
+\f[CB]    http://httpredir.debian.org/debian\fP\[CR]
 .SH HISTORY
 sbuild\-createchroot was previously known as \fBbuildd.chroot\fP.
 buildd.chroot performed exactly the same tasks, but additionally created a
diff --git a/man/sbuild-setup.7.in b/man/sbuild-setup.7.in
index 1f28286..d40f9ea 100644
--- a/man/sbuild-setup.7.in
+++ b/man/sbuild-setup.7.in
@@ -46,7 +46,7 @@ mount an LV here if required:
 Add to /etc/fstab and mount (see next section for full fstab example).
 Finally, run debootstrap to create the chroot:
 .PP
-\f[CR]# \f[CB]debootstrap \-\-variant=buildd lenny /srv/chroot/lenny http://ftp.uk.debian.org/debian/\fP\fP
+\f[CR]# \f[CB]debootstrap \-\-variant=buildd lenny /srv/chroot/lenny http://httpredir.debian.org/debian/\fP\fP
 .br
 .SS 2. Set up additional mounts
 An example \fI/etc/fstab\fP:
@@ -113,9 +113,9 @@ distribution:
 .br
 \f[CR]\fP
 .br
-\f[CR]deb http://ftp.uk.debian.org/debian/ lenny main\fP
+\f[CR]deb http://httpredir.debian.org/debian/ lenny main\fP
 .br
-\f[CR]deb\-src http://ftp.uk.debian.org/debian/ lenny main\fP
+\f[CR]deb\-src http://httpredir.debian.org/debian/ lenny main\fP
 .br
 .SS 4. Configure dchroot or schroot
 This is entirely optional, but will make the chroot environment easier to
diff --git a/man/sbuild.1.in b/man/sbuild.1.in
index fe51483..7b6ec09 100644
--- a/man/sbuild.1.in
+++ b/man/sbuild.1.in
@@ -446,7 +446,7 @@ The repository specification is a line suitable for an apt
 .BR sources.list (5)
 file. For instance, you might use
 .nh
-.B \-\-extra\-repository="deb http://ftp.debian.org/debian experimental main"
+.B \-\-extra\-repository="deb http://httpredir.debian.org/debian experimental main"
 .hy
 to allow packages in the experimental distribution to fulfill
 build-dependencies. Note that the build chroot must already trust the
-- 
2.1.4

Reply via email to