Merge branch 'debian/sid' into ubuntu/master

Conflicts:
	configure.ac
	debian/changelog
	doc/apt-verbatim.ent
	doc/po/apt-doc.pot
	po/ar.po
	po/ast.po
	po/bg.po
	po/bs.po
	po/ca.po
	po/cs.po
	po/cy.po
	po/da.po
	po/de.po
	po/dz.po
	po/el.po
	po/es.po
	po/eu.po
	po/fi.po
	po/fr.po
	po/gl.po
	po/hu.po
	po/it.po
	po/ja.po
	po/km.po
	po/ko.po
	po/ku.po
	po/lt.po
	po/mr.po
	po/nb.po
	po/ne.po
	po/nl.po
	po/nn.po
	po/pl.po
	po/pt.po
	po/pt_BR.po
	po/ro.po
	po/ru.po
	po/sk.po
	po/sl.po
	po/sv.po
	po/th.po
	po/tl.po
	po/tr.po
	po/uk.po
	po/vi.po
	po/zh_CN.po
	po/zh_TW.po

8 files changed, 52 insertions, 4 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..fed6c3818
--- /dev/null
+++ b/vendor/steamos/sources.list.in
@@ -0,0 +1,5 @@
+# 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
diff --git a/vendor/ubuntu/sources.list.in b/vendor/ubuntu/sources.list.in
index b9aa8c3d0..00db2f8cd 100644
--- a/vendor/ubuntu/sources.list.in
+++ b/vendor/ubuntu/sources.list.in
@@ -1,5 +1,5 @@
- # See sources.list(5) manpage for more information
- # Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool.
+# See sources.list(5) manpage for more information
+# Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool.
 deb http://us.archive.ubuntu.com/ubuntu &ubuntu-codename; main restricted
 deb-src http://us.archive.ubuntu.com/ubuntu &ubuntu-codename; main restricted