From 83da965795c8a670997353ef33cd174c731003f7 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Mon, 4 Dec 2006 06:23:22 +0100 Subject: * remove stable, testing and unstable from the template. this is handled by the code --- data/templates/Debian.info.in | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/data/templates/Debian.info.in b/data/templates/Debian.info.in index 2bd171f4..ecf31dd9 100644 --- a/data/templates/Debian.info.in +++ b/data/templates/Debian.info.in @@ -46,32 +46,6 @@ RepositoryType: deb ParentSuite: sarge _Description: Security updates -Suite: stable -RepositoryType: deb -BaseURI: http://http.us.debian.org/debian/ -MatchUri: ftp[0-9]*\.[a-z]\.debian\.org -MirrorsFile: /usr/share/python-aptsources/templates/Debian.mirrors -_Description: Debian current stable release -Component: main -_CompDescription: Officially supported -Component: contrib -_CompDescription: DFSG-compatible Software with Non-Free Dependencies -Component: non-free -_CompDescription: Non-DFSG-compatible Software - -Suite: testing -RepositoryType: deb -BaseURI: http://http.us.debian.org/debian/ -MatchUri: ftp[0-9]*\.[a-z]\.debian\.org -MirrorsFile: /usr/share/python-aptsources/templates/Debian.mirrors -_Description: Debian 'Sid' (unstable) -Component: main -_CompDescription: Officially supported -Component: contrib -_CompDescription: DFSG-compatible Software with Non-Free Dependencies -Component: non-free -_CompDescription: Non-DFSG-compatible Software - Suite: sid RepositoryType: deb BaseURI: http://http.us.debian.org/debian/ @@ -84,15 +58,3 @@ Component: contrib _CompDescription: DFSG-compatible Software with Non-Free Dependencies Component: non-free _CompDescription: Non-DFSG-compatible Software - -Suite: unstable -RepositoryType: deb -BaseURI: http://http.us.debian.org/debian/ -MirrorsFile: /usr/share/python-aptsources/templates/Debian.mirrors -_Description: Debian 'Sid' (unstable) -Component: main -_CompDescription: Officially supported -Component: contrib -_CompDescription: DFSG-compatible Software with Non-Free Dependencies -Component: non-free -_CompDescription: Non-DFSG-compatible Software -- cgit v1.2.3 From 4b10fc07a8bf314a56392e53c0bb389075700ba5 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Mon, 4 Dec 2006 06:33:09 +0100 Subject: * revert last changes - we still need to identify the corresponding sources --- data/templates/Debian.info.in | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/data/templates/Debian.info.in b/data/templates/Debian.info.in index ecf31dd9..2bd171f4 100644 --- a/data/templates/Debian.info.in +++ b/data/templates/Debian.info.in @@ -46,6 +46,32 @@ RepositoryType: deb ParentSuite: sarge _Description: Security updates +Suite: stable +RepositoryType: deb +BaseURI: http://http.us.debian.org/debian/ +MatchUri: ftp[0-9]*\.[a-z]\.debian\.org +MirrorsFile: /usr/share/python-aptsources/templates/Debian.mirrors +_Description: Debian current stable release +Component: main +_CompDescription: Officially supported +Component: contrib +_CompDescription: DFSG-compatible Software with Non-Free Dependencies +Component: non-free +_CompDescription: Non-DFSG-compatible Software + +Suite: testing +RepositoryType: deb +BaseURI: http://http.us.debian.org/debian/ +MatchUri: ftp[0-9]*\.[a-z]\.debian\.org +MirrorsFile: /usr/share/python-aptsources/templates/Debian.mirrors +_Description: Debian 'Sid' (unstable) +Component: main +_CompDescription: Officially supported +Component: contrib +_CompDescription: DFSG-compatible Software with Non-Free Dependencies +Component: non-free +_CompDescription: Non-DFSG-compatible Software + Suite: sid RepositoryType: deb BaseURI: http://http.us.debian.org/debian/ @@ -58,3 +84,15 @@ Component: contrib _CompDescription: DFSG-compatible Software with Non-Free Dependencies Component: non-free _CompDescription: Non-DFSG-compatible Software + +Suite: unstable +RepositoryType: deb +BaseURI: http://http.us.debian.org/debian/ +MirrorsFile: /usr/share/python-aptsources/templates/Debian.mirrors +_Description: Debian 'Sid' (unstable) +Component: main +_CompDescription: Officially supported +Component: contrib +_CompDescription: DFSG-compatible Software with Non-Free Dependencies +Component: non-free +_CompDescription: Non-DFSG-compatible Software -- cgit v1.2.3 From 32a39d656e52aeab54dce24e6907d4b57301dce7 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Mon, 4 Dec 2006 06:34:03 +0100 Subject: * actually use the DebianDistriubtion class on Debian :) --- AptSources/aptsources.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AptSources/aptsources.py b/AptSources/aptsources.py index 45441cdd..2fd4b845 100644 --- a/AptSources/aptsources.py +++ b/AptSources/aptsources.py @@ -811,7 +811,7 @@ def get_distro(): return UbuntuDistribution(id, codename, description, release) elif id == "Debian": - return UbuntuDistribution(id, codename, description, + return DebianDistribution(id, codename, description, release) else: return Distribution(id, codename, description, relase) -- cgit v1.2.3