From 58a62822e7267b3297f8ef7413f6c243f6f93063 Mon Sep 17 00:00:00 2001
From: "Manuel A. Fernandez Montecelo" <manuel.montezelo@gmail.com>
Date: Fri, 26 Oct 2018 01:23:56 +0200
Subject: Remove "Ultimedia" config for Acquire::Changelogs

This is an inactive derivative according to the census, and all the URLs which
are part of .ultimediaos.com are dead.
---
 apt-pkg/init.cc | 1 -
 1 file changed, 1 deletion(-)

(limited to 'apt-pkg')

diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 9a51e31e7..9da0148ea 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -207,7 +207,6 @@ bool pkgInitConfig(Configuration &Cnf)
    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
-- 
cgit v1.2.3-70-g09d2


From 8f503447a4e5e494487672e4678498e288f6d9be Mon Sep 17 00:00:00 2001
From: "Manuel A. Fernandez Montecelo" <manuel.montezelo@gmail.com>
Date: Fri, 26 Oct 2018 01:31:10 +0200
Subject: Remove "Tanglu" config for Acquire::Changelogs and as vendor

This is an inactive derivative according to the census, and all the URLs which
are part of tanglu.org are dead.
---
 apt-pkg/init.cc               |  1 -
 vendor/tanglu/apt-vendor.ent  | 14 --------------
 vendor/tanglu/sources.list.in |  7 -------
 3 files changed, 22 deletions(-)
 delete mode 100644 vendor/tanglu/apt-vendor.ent
 delete mode 100644 vendor/tanglu/sources.list.in

(limited to 'apt-pkg')

diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 9da0148ea..3502e7ddc 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -205,7 +205,6 @@ 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::AlwaysOnline::Origin::Ubuntu", true);
 
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 &current-codename; main contrib non-free">
-<!ENTITY sourceslist-sources-format "Types: deb
-URIs: http://archive.tanglu.org/tanglu
-Suites: &current-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 &current-codename; main contrib non-free
-#deb-src http://archive.tanglu.org/tanglu &current-codename; main contrib non-free
-
-#deb http://archive.tanglu.org/tanglu &current-codename;-updates main contrib non-free
-#deb-src http://archive.tanglu.org/tanglu &current-codename;-updates main contrib non-free
-- 
cgit v1.2.3-70-g09d2