Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-03-13 08:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Daniel Holbach 2015-08-31 09:51:34 +02:00
commit a860b7cbaf
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -10,6 +10,10 @@ ubuntu-dev-tools (0.155) UNRELEASED; urgency=medium
[ Adam Conrad ] [ Adam Conrad ]
* Allow requestsync/syncpackage to work with either codename or alias. * 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 -- 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 ubuntu-dev-tools (0.154) experimental; urgency=medium

2
mk-sbuild
View File

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

2
pull-debian-debdiff
View File

@ -52,7 +52,7 @@ def main():
parser.add_option('-d', '--debian-mirror', metavar='DEBIAN_MIRROR', parser.add_option('-d', '--debian-mirror', metavar='DEBIAN_MIRROR',
dest='debian_mirror', dest='debian_mirror',
help='Preferred 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', parser.add_option('-s', '--debsec-mirror', metavar='DEBSEC_MIRROR',
dest='debsec_mirror', dest='debsec_mirror',
help='Preferred Debian Security mirror ' help='Preferred Debian Security mirror '

2
ubuntutools/config.py
View File

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