summaryrefslogtreecommitdiff
path: root/vendor/debian
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2016-01-14 14:45:37 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2016-01-14 17:33:58 +0100
commit7fa4f5e12261d39666283051956d9e1f78eb609b (patch)
treeb9ae7b93fe2e0d3d0ed4d1688eec6b1e52db72ef /vendor/debian
parent9feb98eb0aeed775f78cb4afbf6bc0e3a90e9fed (diff)
evaluate sourceslist-list-format entity in vendors sources.list
Parsing XML entity files in shell isn't exactly nice and causing the substitution with a while-read loop isn't either, but it seems to be good enough for the moment without changing too much. Thanks: Niels Thykier for reporting on IRC
Diffstat (limited to 'vendor/debian')
-rw-r--r--vendor/debian/apt-vendor.ent8
-rw-r--r--vendor/debian/sources.list.in2
2 files changed, 5 insertions, 5 deletions
diff --git a/vendor/debian/apt-vendor.ent b/vendor/debian/apt-vendor.ent
index 8b26da385..93e4e0460 100644
--- a/vendor/debian/apt-vendor.ent
+++ b/vendor/debian/apt-vendor.ent
@@ -6,14 +6,14 @@
<!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-list-format "deb http://httpredir.debian.org/debian &debian-stable-codename; main contrib non-free
+deb http://security.debian.org &debian-stable-codename;/updates main contrib non-free">
<!ENTITY sourceslist-sources-format "Types: deb
URIs: http://httpredir.debian.org/debian
-Suites: &stable-codename;
+Suites: &debian-stable-codename;
Components: main contrib non-free
Types: deb
URIs: http://security.debian.org
-Suites: &stable-codename;/updates
+Suites: &debian-stable-codename;/updates
Components: main contrib non-free">
diff --git a/vendor/debian/sources.list.in b/vendor/debian/sources.list.in
index c36fb16a7..0fae88e5e 100644
--- a/vendor/debian/sources.list.in
+++ b/vendor/debian/sources.list.in
@@ -3,5 +3,5 @@
&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
+#deb-src http://httpredir.debian.org/debian &debian-stable-codename; main contrib non-free
#deb-src http://security.debian.org &debian-stable-codename;/updates main contrib non-free