summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2016-01-14 16:11:28 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2016-01-14 17:33:58 +0100
commit9feb98eb0aeed775f78cb4afbf6bc0e3a90e9fed (patch)
tree92aad026512604549367f821545900c741b5ecc4 /vendor
parentd1da489f0107b59b9eb104bc6c7617265e338770 (diff)
change debian related entities to a more explicit name
Git-Dch: Ignore
Diffstat (limited to 'vendor')
-rwxr-xr-xvendor/getinfo5
-rw-r--r--vendor/raspbian/apt-vendor.ent4
-rw-r--r--vendor/raspbian/sources.list.in4
3 files changed, 5 insertions, 8 deletions
diff --git a/vendor/getinfo b/vendor/getinfo
index d45c0fca2..415ede98c 100755
--- a/vendor/getinfo
+++ b/vendor/getinfo
@@ -21,10 +21,7 @@ getfield() {
}
case "$1" in
-debian-stable-codename|debian-oldstable-codename|debian-testing-codename)
- getrawfield "${1#*-}" "$VERBATIM"
- ;;
-ubuntu-codename)
+debian-stable-codename|debian-oldstable-codename|debian-testing-codename|ubuntu-codename)
getrawfield "$1" "$VERBATIM"
;;
keyring-package|keyring-filename|keyring-master-filename|keyring-removed-filename|keyring-uri|current-codename)
diff --git a/vendor/raspbian/apt-vendor.ent b/vendor/raspbian/apt-vendor.ent
index dc69f3c03..96d9fb71b 100644
--- a/vendor/raspbian/apt-vendor.ent
+++ b/vendor/raspbian/apt-vendor.ent
@@ -6,8 +6,8 @@
<!ENTITY keyring-master-filename "">
<!ENTITY keyring-uri "">
-<!ENTITY sourceslist-list-format "deb http://mirrordirector.raspbian.org/raspbian &stable-codename; main contrib non-free">
+<!ENTITY sourceslist-list-format "deb http://mirrordirector.raspbian.org/raspbian &debian-stable-codename; main contrib non-free">
<!ENTITY sourceslist-sources-format "Types: deb
URIs: http://mirrordirector.raspbian.org/raspbian
-Suites: &stable-codename;
+Suites: &debian-stable-codename;
Components: main contrib non-free">
diff --git a/vendor/raspbian/sources.list.in b/vendor/raspbian/sources.list.in
index 29ddcc4d6..ea4ee6040 100644
--- a/vendor/raspbian/sources.list.in
+++ b/vendor/raspbian/sources.list.in
@@ -1,6 +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://mirrordirector.raspbian.org/raspbian &stable-codename; main contrib non-free
+&sourceslist-list-format;
# Uncomment if you want the apt-get source function to work
-#deb-src http://mirrordirector.raspbian.org/raspbian &stable-codename; main contrib non-free
+#deb-src http://mirrordirector.raspbian.org/raspbian &debian-stable-codename; main contrib non-free