diff options
| author | Julian Andres Klode <jak@debian.org> | 2018-12-04 11:52:28 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2018-12-04 11:52:28 +0000 |
| commit | dbf202ff9d20a043855d41f4bea1d954b0cef579 (patch) | |
| tree | a1e4eec65808cd201547171ab559982d1f0d17fd | |
| parent | 2c0318af1445f4edbb8a36a3949019267621679e (diff) | |
| parent | 8f503447a4e5e494487672e4678498e288f6d9be (diff) | |
Merge branch 'remove_old_derivatives' into 'master'
Remove old derivatives
See merge request apt-team/apt!31
| -rw-r--r-- | apt-pkg/init.cc | 2 | ||||
| -rw-r--r-- | vendor/tanglu/apt-vendor.ent | 14 | ||||
| -rw-r--r-- | vendor/tanglu/sources.list.in | 7 |
3 files changed, 0 insertions, 23 deletions
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 9a51e31e7..3502e7ddc 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -205,9 +205,7 @@ bool pkgInitConfig(Configuration &Cnf) Cnf.CndSet("Acquire::IndexTargets::deb-src::Sources::Optional", false); Cnf.CndSet("Acquire::Changelogs::URI::Origin::Debian", "https://metadata.ftp-master.debian.org/changelogs/@CHANGEPATH@_changelog"); - Cnf.CndSet("Acquire::Changelogs::URI::Origin::Tanglu", "http://metadata.tanglu.org/changelogs/@CHANGEPATH@_changelog"); Cnf.CndSet("Acquire::Changelogs::URI::Origin::Ubuntu", "https://changelogs.ubuntu.com/changelogs/pool/@CHANGEPATH@/changelog"); - Cnf.CndSet("Acquire::Changelogs::URI::Origin::Ultimedia", "http://packages.ultimediaos.com/changelogs/pool/@CHANGEPATH@/changelog.txt"); Cnf.CndSet("Acquire::Changelogs::AlwaysOnline::Origin::Ubuntu", true); // Read an alternate config file diff --git a/vendor/tanglu/apt-vendor.ent b/vendor/tanglu/apt-vendor.ent deleted file mode 100644 index f5cd813bf..000000000 --- a/vendor/tanglu/apt-vendor.ent +++ /dev/null @@ -1,14 +0,0 @@ -<!-- 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"> - -<!ENTITY sourceslist-list-format "deb http://archive.tanglu.org/tanglu ¤t-codename; main contrib non-free"> -<!ENTITY sourceslist-sources-format "Types: deb -URIs: http://archive.tanglu.org/tanglu -Suites: ¤t-codename; -Components: main contrib non-free"> diff --git a/vendor/tanglu/sources.list.in b/vendor/tanglu/sources.list.in deleted file mode 100644 index ce95e70c2..000000000 --- a/vendor/tanglu/sources.list.in +++ /dev/null @@ -1,7 +0,0 @@ -# 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 |