diff options
| author | Michael Vogt <mvo@debian.org> | 2014-06-12 08:36:58 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-06-12 08:36:58 +0200 |
| commit | cfc7f735774ba30dbee1897248f8dfedf0229a4c (patch) | |
| tree | b4e0ac29a6b398045a803e890f5cdabcca189d6a /vendor/debian/sources.list.in | |
| parent | a0187f0f82a184b850b05b62e5a59b6a2055a506 (diff) | |
| parent | 7701680af12a2c1a65121533c6ebcd635c013c25 (diff) | |
Merge tag '1.0.1ubuntu2' into ubuntu/trusty
Conflicts:
configure.ac
debian/changelog
debian/control
test/integration/framework
Diffstat (limited to 'vendor/debian/sources.list.in')
| -rw-r--r-- | vendor/debian/sources.list.in | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/vendor/debian/sources.list.in b/vendor/debian/sources.list.in index 00db2f8cd..2e430296a 100644 --- a/vendor/debian/sources.list.in +++ b/vendor/debian/sources.list.in @@ -1,10 +1,8 @@ # See sources.list(5) manpage for more information # Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool. -deb http://us.archive.ubuntu.com/ubuntu &ubuntu-codename; main restricted -deb-src http://us.archive.ubuntu.com/ubuntu &ubuntu-codename; main restricted +deb http://ftp.us.debian.org/debian &debian-stable-codename; main contrib non-free +deb http://security.debian.org &debian-stable-codename;/updates main contrib non-free -deb http://security.ubuntu.com/ubuntu &ubuntu-codename;-security main restricted -deb-src http://security.ubuntu.com/ubuntu &ubuntu-codename;-security main restricted - -deb http://us.archive.ubuntu.com/ubuntu &ubuntu-codename;-updates main restricted -deb-src http://us.archive.ubuntu.com/ubuntu &ubuntu-codename;-updates main restricted +# Uncomment if you want the apt-get source function to work +#deb-src http://ftp.us.debian.org/debian &debian-stable-codename; main contrib non-free +#deb-src http://security.debian.org &debian-stable-codename;/updates main contrib non-free |