merged lp:~mtmiller/ubuntu-dev-tools/debian-httpredir

debian/changelog

@@ -10,6 +10,10 @@ ubuntu-dev-tools (0.155) UNRELEASED; urgency=medium
   [ Adam Conrad ]
   * Allow requestsync/syncpackage to work with either codename or alias.
 
+  [ Mike Miller ]
+  * mk-sbuild, pull-debian-{debdiff,source}: Use httpredir.debian.org as the
+    default mirror for Debian.
+
  -- Dimitri John Ledkov <dimitri.j.ledkov@linux.intel.com>  Mon, 19 Jan 2015 14:15:32 +0000
 
 ubuntu-dev-tools (0.154) experimental; urgency=medium

mk-sbuild

@@ -491,7 +491,7 @@ ubuntu)
     ;;
 debian)
     if [ -z "$DEBOOTSTRAP_MIRROR" ]; then
-        DEBOOTSTRAP_MIRROR="http://ftp.debian.org/debian"
+        DEBOOTSTRAP_MIRROR="http://httpredir.debian.org/debian"
     fi
     if [ -z "$COMPONENTS" ]; then
         COMPONENTS="main non-free contrib"

pull-debian-debdiff

@@ -52,7 +52,7 @@ def main():
     parser.add_option('-d', '--debian-mirror', metavar='DEBIAN_MIRROR',
                       dest='debian_mirror',
                       help='Preferred Debian mirror '
-                           '(default: http://ftp.debian.org/debian)')
+                           '(default: http://httpredir.debian.org/debian)')
     parser.add_option('-s', '--debsec-mirror', metavar='DEBSEC_MIRROR',
                       dest='debsec_mirror',
                       help='Preferred Debian Security mirror '

ubuntutools/config.py

@@ -34,7 +34,7 @@ class UDTConfig(object):
     # These are reqired to be used by at least two scripts.
     defaults = {
         'BUILDER': 'pbuilder',
-        'DEBIAN_MIRROR': 'http://ftp.debian.org/debian',
+        'DEBIAN_MIRROR': 'http://httpredir.debian.org/debian',
         'DEBSEC_MIRROR': 'http://security.debian.org',
         'LPINSTANCE': 'production',
         'MIRROR_FALLBACK': True,