diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-04-01 12:28:56 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-04-01 12:28:56 +0200 |
| commit | be20eef52da4b7f361333ea70a8d705a98ae779e (patch) | |
| tree | 4177a110ce6b1335fc4b85d5e53b298a65661f39 /vendor/tanglu | |
| parent | a555cf8be53d8b5557f004ecbde8482a169b79f3 (diff) | |
| parent | 21b3eac8f9ab8e12b43fa8998a5aa5465f29adc5 (diff) | |
Merge remote-tracking branch 'upstream/debian/sid' into feature/apt-manpage
Conflicts:
cmdline/apt.cc
Diffstat (limited to 'vendor/tanglu')
| -rw-r--r-- | vendor/tanglu/apt-vendor.ent | 8 | ||||
| -rw-r--r-- | vendor/tanglu/sources.list.in | 7 |
2 files changed, 15 insertions, 0 deletions
diff --git a/vendor/tanglu/apt-vendor.ent b/vendor/tanglu/apt-vendor.ent new file mode 100644 index 000000000..d2442209c --- /dev/null +++ b/vendor/tanglu/apt-vendor.ent @@ -0,0 +1,8 @@ +<!-- details about the keys used by the distribution --> +<!ENTITY keyring-distro "Tanglu"> +<!ENTITY keyring-package "<package>tanglu-archive-keyring</package>"> +<!ENTITY keyring-filename "<filename>/usr/share/keyrings/tanglu-archive-keyring.gpg</filename>"> +<!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/tanglu-archive-removed-keys.gpg</filename>"> +<!ENTITY keyring-master-filename ""> +<!ENTITY keyring-uri ""> +<!ENTITY current-codename "bartholomea"> diff --git a/vendor/tanglu/sources.list.in b/vendor/tanglu/sources.list.in new file mode 100644 index 000000000..ce95e70c2 --- /dev/null +++ b/vendor/tanglu/sources.list.in @@ -0,0 +1,7 @@ +# See sources.list(5) manpage for more information + +deb http://archive.tanglu.org/tanglu ¤t-codename; main contrib non-free +#deb-src http://archive.tanglu.org/tanglu ¤t-codename; main contrib non-free + +#deb http://archive.tanglu.org/tanglu ¤t-codename;-updates main contrib non-free +#deb-src http://archive.tanglu.org/tanglu ¤t-codename;-updates main contrib non-free |