summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-01-04 11:15:28 +0100
committerMichael Vogt <mvo@debian.org>2014-01-04 11:15:28 +0100
commitc93d14fc05b50a8ee8bb7804579c2912f34c676b (patch)
tree1f45c51bd8d3ab33de2610f1663b3ec8e5f49c02 /vendor
parente2fa0aa64d2249129543f82a213043d96469be1c (diff)
parent23bd09778261c945b460b46d855b1a6ef998cfd8 (diff)
Merge branch 'debian/sid' into feature/source-deb822
Diffstat (limited to 'vendor')
-rwxr-xr-xvendor/getinfo4
-rw-r--r--vendor/raspbian/apt-vendor.ent7
-rw-r--r--vendor/raspbian/makefile11
-rw-r--r--vendor/raspbian/sources.list.in6
-rw-r--r--vendor/steamos/apt-vendor.ent8
-rw-r--r--vendor/steamos/makefile11
-rw-r--r--vendor/steamos/sources.list.in7
7 files changed, 52 insertions, 2 deletions
diff --git a/vendor/getinfo b/vendor/getinfo
index ac816e10e..861fd3d17 100755
--- a/vendor/getinfo
+++ b/vendor/getinfo
@@ -24,9 +24,9 @@ debian-stable-codename)
getrawfield 'stable-codename' "${BASEDIR}/../doc/apt-verbatim.ent"
;;
ubuntu-codename)
- getrawfield 'stable-codename' "${BASEDIR}/../doc/apt-verbatim.ent"
+ getrawfield 'ubuntu-codename' "${BASEDIR}/../doc/apt-verbatim.ent"
;;
-keyring-package|keyring-filename|keyring-master-filename|keyring-removed-filename|keyring-uri)
+keyring-package|keyring-filename|keyring-master-filename|keyring-removed-filename|keyring-uri|current-distro-codename)
getfield "$1"
;;
*)
diff --git a/vendor/raspbian/apt-vendor.ent b/vendor/raspbian/apt-vendor.ent
new file mode 100644
index 000000000..e359d2001
--- /dev/null
+++ b/vendor/raspbian/apt-vendor.ent
@@ -0,0 +1,7 @@
+<!-- details about the keys used by the distribution -->
+<!ENTITY keyring-distro "Raspbian">
+<!ENTITY keyring-package "<package>raspbian-archive-keyring</package>">
+<!ENTITY keyring-filename "<filename>/usr/share/keyrings/raspbian-archive-keyring.gpg</filename>">
+<!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/raspbian-archive-removed-keys.gpg</filename>">
+<!ENTITY keyring-master-filename "">
+<!ENTITY keyring-uri "">
diff --git a/vendor/raspbian/makefile b/vendor/raspbian/makefile
new file mode 100644
index 000000000..ced566c30
--- /dev/null
+++ b/vendor/raspbian/makefile
@@ -0,0 +1,11 @@
+# -*- make -*-
+BASE=../..
+SUBDIR=vendor/raspbian
+
+# Bring in the default rules
+include ../../buildlib/defaults.mak
+
+doc binary manpages: sources.list
+
+sources.list: sources.list.in ../../doc/apt-verbatim.ent
+ sed -e 's#&stable-codename;#$(shell ../getinfo debian-stable-codename)#g' $< > $@
diff --git a/vendor/raspbian/sources.list.in b/vendor/raspbian/sources.list.in
new file mode 100644
index 000000000..29ddcc4d6
--- /dev/null
+++ b/vendor/raspbian/sources.list.in
@@ -0,0 +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
+
+# Uncomment if you want the apt-get source function to work
+#deb-src http://mirrordirector.raspbian.org/raspbian &stable-codename; main contrib non-free
diff --git a/vendor/steamos/apt-vendor.ent b/vendor/steamos/apt-vendor.ent
new file mode 100644
index 000000000..69bb254ef
--- /dev/null
+++ b/vendor/steamos/apt-vendor.ent
@@ -0,0 +1,8 @@
+<!-- details about the keys used by the distribution -->
+<!ENTITY keyring-distro "SteamOS">
+<!ENTITY keyring-package "<package>valve-archive-keyring</package>">
+<!ENTITY keyring-filename "<filename>/usr/share/keyrings/valve-archive-keyring.gpg</filename>">
+<!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/valve-archive-removed-keys.gpg</filename>">
+<!ENTITY current-distro-codename "alchemist">
+<!ENTITY keyring-master-filename "">
+<!ENTITY keyring-uri "">
diff --git a/vendor/steamos/makefile b/vendor/steamos/makefile
new file mode 100644
index 000000000..c27494587
--- /dev/null
+++ b/vendor/steamos/makefile
@@ -0,0 +1,11 @@
+# -*- make -*-
+BASE=../..
+SUBDIR=vendor/steamos
+
+# Bring in the default rules
+include ../../buildlib/defaults.mak
+
+doc binary manpages: sources.list
+
+sources.list: sources.list.in ../../doc/apt-verbatim.ent
+ sed -e 's#&stable-codename;#$(shell ../getinfo debian-stable-codename)#g' $< | sed -e 's#&steamos-codename;#$(shell ../getinfo current-distro-codename)#g' > $@
diff --git a/vendor/steamos/sources.list.in b/vendor/steamos/sources.list.in
new file mode 100644
index 000000000..f3790c550
--- /dev/null
+++ b/vendor/steamos/sources.list.in
@@ -0,0 +1,7 @@
+# See sources.list(5) manpage for more information
+# Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool.
+
+deb http://repo.steampowered.com/steamos &steamos-codename; main contrib non-free
+deb-src http://repo.steampowered.com/steamos &steamos-codename; main contrib non-free
+
+deb http://cdn.debian.net/debian &stable-codename; main