diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2015-06-21 23:12:24 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2015-08-10 17:25:26 +0200 |
| commit | 81460e32961bb0b9922bf8a1a27d87705d8c3e51 (patch) | |
| tree | d366b8219da9a84de67d725c0f113ea5d4a470ce /vendor/debian | |
| parent | 463c8d801595ce5ac94d7c032264820be7434232 (diff) | |
bring back deb822 sources.list entries as .sources
Having two different formats in the same file is very dirty and causes
external tools to fail hard trying to parse them. It is probably not a
good idea for them to parse them in the first place, but they do and we
shouldn't break them if there is a better way.
So we solve this issue for now by giving our deb822 format a new
filename extension ".sources" which unsupporting applications are likely
to ignore an can begin gradually moving forward rather than waiting for
the unknown applications to catch up.
Currently and for the forseeable future apt is going to support both
with the same feature set as documented in the manpage, with the
longtime plan of adopting the 'new' format as default, but that is a
long way to go and might get going more from having an easier time
setting options than from us pushing it explicitely.
Diffstat (limited to 'vendor/debian')
| -rw-r--r-- | vendor/debian/apt-vendor.ent | 12 | ||||
| -rw-r--r-- | vendor/debian/sources.list.in | 3 |
2 files changed, 13 insertions, 2 deletions
diff --git a/vendor/debian/apt-vendor.ent b/vendor/debian/apt-vendor.ent index 6cda5995c..8b26da385 100644 --- a/vendor/debian/apt-vendor.ent +++ b/vendor/debian/apt-vendor.ent @@ -5,3 +5,15 @@ <!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"> <!ENTITY keyring-master-filename ""> <!ENTITY keyring-uri ""> + +<!ENTITY sourceslist-list-format "deb http://httpredir.debian.org/debian &stable-codename; main contrib non-free +deb http://security.debian.org &stable-codename;/updates main contrib non-free"> +<!ENTITY sourceslist-sources-format "Types: deb +URIs: http://httpredir.debian.org/debian +Suites: &stable-codename; +Components: main contrib non-free + +Types: deb +URIs: http://security.debian.org +Suites: &stable-codename;/updates +Components: main contrib non-free"> diff --git a/vendor/debian/sources.list.in b/vendor/debian/sources.list.in index 2e430296a..c36fb16a7 100644 --- a/vendor/debian/sources.list.in +++ b/vendor/debian/sources.list.in @@ -1,7 +1,6 @@ # 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 &debian-stable-codename; main contrib non-free -deb http://security.debian.org &debian-stable-codename;/updates main contrib non-free +&sourceslist-list-format; # 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 |