diff options
| author | Michael Vogt <mvo@debian.org> | 2014-05-07 17:55:10 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-05-07 17:55:10 +0200 |
| commit | 38d2959ffb8c6f5f291b2910014a67b1b352ab4c (patch) | |
| tree | c5977b8f34aaf973ed3956952ec3ff43ac59f143 /vendor/debian/sources.list.in | |
| parent | fce69e7a0f38299c57ef96ae1c1dd9a5379bfd5a (diff) | |
| parent | 3fa4e98f62e469f4292d2811b4e15f4afb678fbd (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
apt-pkg/cachefilter.h
apt-pkg/contrib/fileutl.cc
apt-pkg/contrib/netrc.h
apt-pkg/deb/debsrcrecords.cc
apt-pkg/init.h
apt-pkg/pkgcache.cc
debian/apt.install.in
debian/changelog
Diffstat (limited to 'vendor/debian/sources.list.in')
| -rw-r--r-- | vendor/debian/sources.list.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vendor/debian/sources.list.in b/vendor/debian/sources.list.in index 745e32cbe..2e430296a 100644 --- a/vendor/debian/sources.list.in +++ b/vendor/debian/sources.list.in @@ -1,8 +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://ftp.us.debian.org/debian &stable-codename; main contrib non-free -deb http://security.debian.org &stable-codename;/updates main contrib non-free +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 # Uncomment if you want the apt-get source function to work -#deb-src http://ftp.us.debian.org/debian &stable-codename; main contrib non-free -#deb-src http://security.debian.org &stable-codename;/updates main contrib non-free +#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 |