Ubuntu Developer Tools

Merge lp:~mtmiller/ubuntu-dev-tools/debian-httpredir into lp:~ubuntu-dev/ubuntu-dev-tools/trunk

  1. debian-httpredir
  2. Merge into trunk
Proposed by Mike Miller
Status: Merged
Merged at revision: 1433
Proposed branch: lp:~mtmiller/ubuntu-dev-tools/debian-httpredir
Merge into: lp:~ubuntu-dev/ubuntu-dev-tools/trunk
Diff against target: 53 lines (+7/-3)
4 files modified
debian/changelog (+4/-0)
mk-sbuild (+1/-1)
pull-debian-debdiff (+1/-1)
ubuntutools/config.py (+1/-1)
To merge this branch: bzr merge lp:~mtmiller/ubuntu-dev-tools/debian-httpredir
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+268834@code.launchpad.net

Description of the change

Feature proposal to use the httpredir.d.o service as the default mirror to the Debian archive.

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Thanks. Merged.

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 2015-06-14 19:51:38 +0000
3+++ debian/changelog 2015-08-22 16:05:49 +0000
4@@ -10,6 +10,10 @@
5 [ Adam Conrad ]
6 * Allow requestsync/syncpackage to work with either codename or alias.
7
8+ [ Mike Miller ]
9+ * mk-sbuild, pull-debian-{debdiff,source}: Use httpredir.debian.org as the
10+ default mirror for Debian.
11+
12 -- Dimitri John Ledkov <dimitri.j.ledkov@linux.intel.com> Mon, 19 Jan 2015 14:15:32 +0000
13
14 ubuntu-dev-tools (0.154) experimental; urgency=medium
15
16=== modified file 'mk-sbuild'
17--- mk-sbuild 2014-12-23 16:14:21 +0000
18+++ mk-sbuild 2015-08-22 16:05:49 +0000
19@@ -491,7 +491,7 @@
20 ;;
21 debian)
22 if [ -z "$DEBOOTSTRAP_MIRROR" ]; then
23- DEBOOTSTRAP_MIRROR="http://ftp.debian.org/debian"
24+ DEBOOTSTRAP_MIRROR="http://httpredir.debian.org/debian"
25 fi
26 if [ -z "$COMPONENTS" ]; then
27 COMPONENTS="main non-free contrib"
28
29=== modified file 'pull-debian-debdiff'
30--- pull-debian-debdiff 2013-03-18 23:18:02 +0000
31+++ pull-debian-debdiff 2015-08-22 16:05:49 +0000
32@@ -52,7 +52,7 @@
33 parser.add_option('-d', '--debian-mirror', metavar='DEBIAN_MIRROR',
34 dest='debian_mirror',
35 help='Preferred Debian mirror '
36- '(default: http://ftp.debian.org/debian)')
37+ '(default: http://httpredir.debian.org/debian)')
38 parser.add_option('-s', '--debsec-mirror', metavar='DEBSEC_MIRROR',
39 dest='debsec_mirror',
40 help='Preferred Debian Security mirror '
41
42=== modified file 'ubuntutools/config.py'
43--- ubuntutools/config.py 2014-12-18 21:53:00 +0000
44+++ ubuntutools/config.py 2015-08-22 16:05:49 +0000
45@@ -34,7 +34,7 @@
46 # These are reqired to be used by at least two scripts.
47 defaults = {
48 'BUILDER': 'pbuilder',
49- 'DEBIAN_MIRROR': 'http://ftp.debian.org/debian',
50+ 'DEBIAN_MIRROR': 'http://httpredir.debian.org/debian',
51 'DEBSEC_MIRROR': 'http://security.debian.org',
52 'LPINSTANCE': 'production',
53 'MIRROR_FALLBACK': True,

Subscribers

People subscribed via source and target branches

to status/vote changes: