diff options
| author | Michael Vogt <mvo@debian.org> | 2013-12-05 08:24:00 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-12-05 08:24:00 +0100 |
| commit | 44633bd7cac1ce68d4e475285a0f45b7a8952a7f (patch) | |
| tree | 3e3af83bb955b9f49f38239d490b5173bb0b9ac4 /vendor/ubuntu | |
| parent | b10b0c4aac5d0648125d4203eea6900032efb7ba (diff) | |
| parent | 7014e1482942d00b66eb30061b0cf5d2a7b3ebf3 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
apt-pkg/deb/dpkgpm.cc
cmdline/apt-key.in
debian/control
doc/apt-key.8.xml
doc/makefile
doc/po/apt-doc.pot
doc/po/de.po
doc/po/es.po
doc/po/fr.po
doc/po/it.po
doc/po/ja.po
doc/po/pl.po
doc/po/pt.po
doc/po/pt_BR.po
Diffstat (limited to 'vendor/ubuntu')
| -rw-r--r-- | vendor/ubuntu/apt-vendor.ent | 7 | ||||
| -rw-r--r-- | vendor/ubuntu/makefile | 11 | ||||
| -rw-r--r-- | vendor/ubuntu/sources.list.in | 10 |
3 files changed, 28 insertions, 0 deletions
diff --git a/vendor/ubuntu/apt-vendor.ent b/vendor/ubuntu/apt-vendor.ent new file mode 100644 index 000000000..caa532699 --- /dev/null +++ b/vendor/ubuntu/apt-vendor.ent @@ -0,0 +1,7 @@ +<!-- details about the keys used by the distribution --> +<!ENTITY keyring-distro "Ubuntu"> +<!ENTITY keyring-package "<package>ubuntu-keyring</package>"> +<!ENTITY keyring-filename "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"> +<!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"> +<!ENTITY keyring-master-filename "/usr/share/keyrings/ubuntu-master-keyring.gpg"> +<!ENTITY keyring-uri "http://archive.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg"> diff --git a/vendor/ubuntu/makefile b/vendor/ubuntu/makefile new file mode 100644 index 000000000..ea67e6e63 --- /dev/null +++ b/vendor/ubuntu/makefile @@ -0,0 +1,11 @@ +# -*- make -*- +BASE=../.. +SUBDIR=vendor/ubuntu + +# Bring in the default rules +include ../../buildlib/defaults.mak + +doc: sources.list + +sources.list: sources.list.in ../../doc/apt-verbatim.ent + sed -e 's#&ubuntu-codename;#$(shell ../getinfo ubuntu-codename)#g' $< > $@ diff --git a/vendor/ubuntu/sources.list.in b/vendor/ubuntu/sources.list.in new file mode 100644 index 000000000..b9aa8c3d0 --- /dev/null +++ b/vendor/ubuntu/sources.list.in @@ -0,0 +1,10 @@ + # 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 + +deb http://security.ubuntu.com/ubuntu &ubuntu-codename;-security main restricted +deb-src http://security.ubuntu.com/ubuntu &ubuntu-codename;-security main restricted + +deb http://us.archive.ubuntu.com/ubuntu &ubuntu-codename;-updates main restricted +deb-src http://us.archive.ubuntu.com/ubuntu &ubuntu-codename;-updates main restricted |