diff options
| author | Michael Vogt <mvo@debian.org> | 2013-12-28 00:31:01 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-12-28 00:31:01 +0100 |
| commit | 35ac30ee373c5ed84d7c2c5a701ac2d54963504d (patch) | |
| tree | 59da7e2385b396052c4f53ac187d520c00d2790c /vendor | |
| parent | e5c2b7e8a5455e1dc6993ef9e151b3845fb53c60 (diff) | |
| parent | c035b6552ba4bd1c6fba5fd8f8d829c2efbefe3c (diff) | |
Merge branch 'debian/sid' into bugfix/bts731738-fancy-progess
Conflicts:
apt-pkg/install-progress.cc
Diffstat (limited to 'vendor')
| -rwxr-xr-x | vendor/getinfo | 4 | ||||
| -rw-r--r-- | vendor/raspbian/apt-vendor.ent | 7 | ||||
| -rw-r--r-- | vendor/raspbian/makefile | 11 | ||||
| -rw-r--r-- | vendor/raspbian/sources.list.in | 6 | ||||
| -rw-r--r-- | vendor/steamos/apt-vendor.ent | 8 | ||||
| -rw-r--r-- | vendor/steamos/makefile | 11 | ||||
| -rw-r--r-- | vendor/steamos/sources.list.in | 7 |
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 |