Merge lp:~unit193/ubuntu-dev-tools/update-deb-mirror into lp:~ubuntu-dev/ubuntu-dev-tools/trunk

Proposed by Unit 193 on 2017-04-29
Status: Merged
Merged at revision: 1458
Proposed branch: lp:~unit193/ubuntu-dev-tools/update-deb-mirror
Merge into: lp:~ubuntu-dev/ubuntu-dev-tools/trunk
Diff against target: 56 lines (+8/-3)
4 files modified
debian/changelog (+5/-0)
mk-sbuild (+1/-1)
pull-debian-debdiff (+1/-1)
ubuntutools/config.py (+1/-1)
To merge this branch: bzr merge lp:~unit193/ubuntu-dev-tools/update-deb-mirror
Reviewer Review Type Date Requested Status
Mattia Rizzolo 2017-04-29 Approve on 2017-04-30
Review via email: mp+323431@code.launchpad.net

Description of the change

Debian's httpredir service has been shutdown and redirected to deb.debian.org. This updates the Debian mirrors.

Announcement: https://lists.debian.org/debian-mirrors/2017/02/msg00000.html

To post a comment you must log in.
Mattia Rizzolo (mapreri) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2017-03-31 12:03:15 +0000
3+++ debian/changelog 2017-04-29 18:50:54 +0000
4@@ -1,8 +1,13 @@
5 ubuntu-dev-tools (0.159) UNRELEASED; urgency=medium
6
7+ [ Iain Lane ]
8 * Remove the `harvest' command, and all other integration with the Harvest
9 service, since it has been shut down.
10
11+ [ Unit 193 ]
12+ * mk-sbuild, pull-debian-{debdiff,source}: Switch from httpredir.debian.org
13+ to deb.debian.org as the default mirror for Debian.
14+
15 -- Iain Lane <laney@ubuntu.com> Fri, 31 Mar 2017 12:53:32 +0100
16
17 ubuntu-dev-tools (0.158) experimental; urgency=medium
18
19=== modified file 'mk-sbuild'
20--- mk-sbuild 2016-05-09 06:00:40 +0000
21+++ mk-sbuild 2017-04-29 18:50:54 +0000
22@@ -503,7 +503,7 @@
23 ;;
24 debian)
25 if [ -z "$DEBOOTSTRAP_MIRROR" ]; then
26- DEBOOTSTRAP_MIRROR="http://httpredir.debian.org/debian"
27+ DEBOOTSTRAP_MIRROR="http://deb.debian.org/debian"
28 fi
29 if [ -z "$COMPONENTS" ]; then
30 COMPONENTS="main non-free contrib"
31
32=== modified file 'pull-debian-debdiff'
33--- pull-debian-debdiff 2015-08-22 15:51:04 +0000
34+++ pull-debian-debdiff 2017-04-29 18:50:54 +0000
35@@ -52,7 +52,7 @@
36 parser.add_option('-d', '--debian-mirror', metavar='DEBIAN_MIRROR',
37 dest='debian_mirror',
38 help='Preferred Debian mirror '
39- '(default: http://httpredir.debian.org/debian)')
40+ '(default: http://deb.debian.org/debian)')
41 parser.add_option('-s', '--debsec-mirror', metavar='DEBSEC_MIRROR',
42 dest='debsec_mirror',
43 help='Preferred Debian Security mirror '
44
45=== modified file 'ubuntutools/config.py'
46--- ubuntutools/config.py 2015-08-22 15:51:04 +0000
47+++ ubuntutools/config.py 2017-04-29 18:50:54 +0000
48@@ -34,7 +34,7 @@
49 # These are reqired to be used by at least two scripts.
50 defaults = {
51 'BUILDER': 'pbuilder',
52- 'DEBIAN_MIRROR': 'http://httpredir.debian.org/debian',
53+ 'DEBIAN_MIRROR': 'http://deb.debian.org/debian',
54 'DEBSEC_MIRROR': 'http://security.debian.org',
55 'LPINSTANCE': 'production',
56 'MIRROR_FALLBACK': True,

Subscribers

People subscribed via source and target branches

to status/vote changes: