From d9deeabe21f828ae4301c4aab5073f775f954e25 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 18 Oct 2010 10:43:22 +0200 Subject: * data/templates/Ubuntu.info.in: - add natty, LP:661578 --- data/templates/Ubuntu.info.in | 81 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) (limited to 'data') diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index a9b539af..ca041c26 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -1,5 +1,86 @@ _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog +Suite: natty +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +_Description: Ubuntu 11.04 'Natty Narwhal' +Component: main +_CompDescription: Officially supported +_CompDescriptionLong: Canonical-supported Open Source software +Component: universe +_CompDescription: Community-maintained +_CompDescriptionLong: Community-maintained Open Source software +Component: restricted +_CompDescription: Non-free drivers +_CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +_CompDescription: Restricted software +_CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: natty +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*11.04 +MatchURI: cdrom:\[Ubuntu.*11.04 +_Description: Cdrom with Ubuntu 11.04 'Natty Narwhal' +Available: False +Component: main +_CompDescription: Officially supported +Component: restricted +_CompDescription: Restricted copyright + +Suite: natty +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +_Description: Canonical Partners +Component: partner +_CompDescription: Software packaged by Canonical for their partners +_CompDescriptionLong: This software is not part of Ubuntu. + +Suite: natty +Official: false +RepositoryType: deb +BaseURI: http://extras.ubuntu.com +MatchURI: extras.ubuntu.com +_Description: Independent +Component: main +_CompDescription: Provided by third-party software developers +_CompDescriptionLong: Software offered by third party developers. + +Suite: natty-security +ParentSuite: natty +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +_Description: Important security updates + +Suite: natty-updates +ParentSuite: natty +RepositoryType: deb +_Description: Recommended updates + +Suite: natty-proposed +ParentSuite: natty +RepositoryType: deb +_Description: Pre-released updates + +Suite: natty-backports +ParentSuite: natty +RepositoryType: deb +_Description: Unsupported updates + Suite: maverick RepositoryType: deb BaseURI: http://ports.ubuntu.com/ubuntu-ports/ -- cgit v1.2.3 From 3db02c5215d36bb1cd2c912ad69e5ed2796380c0 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 20 Apr 2011 18:13:47 +0200 Subject: releasing version 0.7.100.3ubuntu5 --- aptsources/sourceslist.py | 5 ++++- data/templates/Ubuntu.info.in | 48 +++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 8 ++++++++ 3 files changed, 60 insertions(+), 1 deletion(-) (limited to 'data') diff --git a/aptsources/sourceslist.py b/aptsources/sourceslist.py index 83d2c8b9..04f6a5a7 100644 --- a/aptsources/sourceslist.py +++ b/aptsources/sourceslist.py @@ -449,7 +449,10 @@ class SourceEntryMatcher(object): found = False for template in self.templates: if (re.search(template.match_uri, source.uri) and - re.match(template.match_name, source.dist)): + re.match(template.match_name, source.dist) and + # deb is a valid fallback for deb-src (if that is not + # definied, see #760035 + (source.type == template.type or template.type == "deb")): found = True source.template = template break diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index ca041c26..99bd5422 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -25,6 +25,13 @@ _CompDescription: Restricted software _CompDescriptionLong: Software restricted by copyright or legal issues Suite: natty +ParentSuite: natty +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports + +Suite: natty +RepositoryType: deb MatchName: .* BaseURI: cdrom:\[Ubuntu.*11.04 MatchURI: cdrom:\[Ubuntu.*11.04 @@ -66,21 +73,49 @@ BaseURI-i386: http://security.ubuntu.com/ubuntu/ MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com _Description: Important security updates +Suite: natty-security +ParentSuite: natty +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com +_Description: Important security updates + Suite: natty-updates ParentSuite: natty RepositoryType: deb _Description: Recommended updates +Suite: natty-updates +ParentSuite: natty +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Recommended updates + Suite: natty-proposed ParentSuite: natty RepositoryType: deb _Description: Pre-released updates +Suite: natty-proposed +ParentSuite: natty +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Pre-released updates + Suite: natty-backports ParentSuite: natty RepositoryType: deb _Description: Unsupported updates +Suite: natty-backports +ParentSuite: natty +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Unsupported updates + Suite: maverick RepositoryType: deb BaseURI: http://ports.ubuntu.com/ubuntu-ports/ @@ -106,6 +141,7 @@ _CompDescription: Restricted software _CompDescriptionLong: Software restricted by copyright or legal issues Suite: maverick +RepositoryType: deb MatchName: .* BaseURI: cdrom:\[Ubuntu.*10.10 MatchURI: cdrom:\[Ubuntu.*10.10 @@ -187,6 +223,7 @@ _CompDescription: Restricted software _CompDescriptionLong: Software restricted by copyright or legal issues Suite: lucid +RepositoryType: deb MatchName: .* BaseURI: cdrom:\[Ubuntu.*10.04 MatchURI: cdrom:\[Ubuntu.*10.04 @@ -248,6 +285,7 @@ _CompDescription: Restricted software _CompDescriptionLong: Software restricted by copyright or legal issues Suite: karmic +RepositoryType: deb MatchName: .* BaseURI: cdrom:\[Ubuntu.*9.10 MatchURI: cdrom:\[Ubuntu.*9.10 @@ -309,6 +347,7 @@ _CompDescription: Restricted software _CompDescriptionLong: Software restricted by copyright or legal issues Suite: jaunty +RepositoryType: deb MatchName: .* BaseURI: cdrom:\[Ubuntu.*9.04 MatchURI: cdrom:\[Ubuntu.*9.04 @@ -370,6 +409,7 @@ _CompDescription: Restricted software _CompDescriptionLong: Software restricted by copyright or legal issues Suite: intrepid +RepositoryType: deb MatchName: .* BaseURI: cdrom:\[Ubuntu.*8.10 MatchURI: cdrom:\[Ubuntu.*8.10 @@ -432,6 +472,7 @@ _CompDescription: Restricted software _CompDescriptionLong: Software restricted by copyright or legal issues Suite: hardy +RepositoryType: deb MatchName: .* BaseURI: cdrom:\[Ubuntu.*8.04 MatchURI: cdrom:\[Ubuntu.*8.04 @@ -495,6 +536,7 @@ _CompDescription: Restricted software _CompDescriptionLong: Software restricted by copyright or legal issues Suite: gutsy +RepositoryType: deb MatchName: .* BaseURI: cdrom:\[Ubuntu.*7.10 MatchURI: cdrom:\[Ubuntu.*7.10 @@ -558,6 +600,7 @@ _CompDescription: Restricted software _CompDescriptionLong: Software restricted by copyright or legal issues Suite: feisty +RepositoryType: deb MatchName: .* BaseURI: cdrom:\[Ubuntu.*7.04 MatchURI: cdrom:\[Ubuntu.*7.04 @@ -618,6 +661,7 @@ _CompDescription: Restricted software _CompDescriptionLong: Software restricted by copyright or legal issues Suite: edgy +RepositoryType: deb MatchName: .* BaseURI: cdrom:\[Ubuntu.*6.10 MatchURI: cdrom:\[Ubuntu.*6.10 @@ -678,6 +722,7 @@ _CompDescription: Restricted software (Multiverse) _CompDescriptionLong: Software restricted by copyright or legal issues Suite: dapper +RepositoryType: deb MatchName: .* BaseURI: cdrom:\[Ubuntu.*6.06 MatchURI: cdrom:\[Ubuntu.*6.06 @@ -734,6 +779,7 @@ Component: multiverse _CompDescription: Non-free (Multiverse) Suite: breezy +RepositoryType: deb MatchName: .* BaseURI: cdrom:\[Ubuntu.*5.10 MatchURI: cdrom:\[Ubuntu.*5.10 @@ -785,6 +831,7 @@ Component: multiverse _CompDescription: Non-free (Multiverse) Suite: hoary +RepositoryType: deb MatchName: .* BaseURI: cdrom:\[Ubuntu.*5.04 MatchURI: cdrom:\[Ubuntu.*5.04 @@ -831,6 +878,7 @@ Component: multiverse _CompDescription: Non-free (Multiverse) Suite: warty +RepositoryType: deb MatchName: .* BaseURI: cdrom:\[Ubuntu.*4.10 MatchURI: cdrom:\[Ubuntu.*4.10 diff --git a/debian/changelog b/debian/changelog index 695d59a4..6624e8c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +python-apt (0.7.100.3ubuntu5) natty; urgency=low + + [ Stéphane Graber ] + * fix enable_components for deb-src entries on ports.ubuntu.com + (LP: #760035) + + -- Michael Vogt Wed, 20 Apr 2011 18:05:51 +0200 + python-apt (0.7.100.3ubuntu4) natty; urgency=low * Update enable_component to also apply to -src entries (LP: #758732) -- cgit v1.2.3 From 35e1f9341f30acc3e059234945108a7e976a2eb8 Mon Sep 17 00:00:00 2001 From: Stéphane Graber Date: Sun, 24 Apr 2011 13:26:22 -0400 Subject: releasing version 0.7.100.3ubuntu6 --- data/templates/Ubuntu.info.in | 1 + debian/changelog | 7 +++++++ 2 files changed, 8 insertions(+) (limited to 'data') diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index 99bd5422..b49312e8 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -29,6 +29,7 @@ ParentSuite: natty RepositoryType: deb-src BaseURI: http://archive.ubuntu.com/ubuntu/ MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Ubuntu 11.04 'Natty Narwhal' Suite: natty RepositoryType: deb diff --git a/debian/changelog b/debian/changelog index 6624e8c5..adf51acc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-apt (0.7.100.3ubuntu6) natty; urgency=low + + * Add missing _Description entry to Ubuntu.info for new deb-src entries. + (LP: #768363) + + -- Stéphane Graber Sun, 24 Apr 2011 13:24:53 -0400 + python-apt (0.7.100.3ubuntu5) natty; urgency=low [ Stéphane Graber ] -- cgit v1.2.3 From 8c291baf30b7fe903461823100004bc994707086 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 28 Apr 2011 12:27:20 +0200 Subject: * data/templates/Ubuntu.info.in: - add oneiric templates --- data/templates/Ubuntu.info.in | 118 ++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 7 +++ 2 files changed, 125 insertions(+) (limited to 'data') diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index b49312e8..39d9256e 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -1,5 +1,123 @@ _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog +Suite: oneiric +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +_Description: Ubuntu 11.10 'Oneiric Ocelot' +Component: main +_CompDescription: Officially supported +_CompDescriptionLong: Canonical-supported Open Source software +Component: universe +_CompDescription: Community-maintained +_CompDescriptionLong: Community-maintained Open Source software +Component: restricted +_CompDescription: Non-free drivers +_CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +_CompDescription: Restricted software +_CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: oneiric +ParentSuite: oneiric +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Ubuntu 11.10 'Oneiric Ocelot' + +Suite: oneiric +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*11.10 +MatchURI: cdrom:\[Ubuntu.*11.10 +_Description: Cdrom with Ubuntu 11.10 'Oneiric Ocelot' +Available: False +Component: main +_CompDescription: Officially supported +Component: restricted +_CompDescription: Restricted copyright + +Suite: oneiric +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +_Description: Canonical Partners +Component: partner +_CompDescription: Software packaged by Canonical for their partners +_CompDescriptionLong: This software is not part of Ubuntu. + +Suite: oneiric +Official: false +RepositoryType: deb +BaseURI: http://extras.ubuntu.com +MatchURI: extras.ubuntu.com +_Description: Independent +Component: main +_CompDescription: Provided by third-party software developers +_CompDescriptionLong: Software offered by third party developers. + +Suite: oneiric-security +ParentSuite: oneiric +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +_Description: Important security updates + +Suite: oneiric-security +ParentSuite: oneiric +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com +_Description: Important security updates + +Suite: oneiric-updates +ParentSuite: oneiric +RepositoryType: deb +_Description: Recommended updates + +Suite: oneiric-updates +ParentSuite: oneiric +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Recommended updates + +Suite: oneiric-proposed +ParentSuite: oneiric +RepositoryType: deb +_Description: Pre-released updates + +Suite: oneiric-proposed +ParentSuite: oneiric +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Pre-released updates + +Suite: oneiric-backports +ParentSuite: oneiric +RepositoryType: deb +_Description: Unsupported updates + +Suite: oneiric-backports +ParentSuite: oneiric +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Unsupported updates + + Suite: natty RepositoryType: deb BaseURI: http://ports.ubuntu.com/ubuntu-ports/ diff --git a/debian/changelog b/debian/changelog index adf51acc..983a480a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-apt (0.7.100.3ubuntu7) UNRELEASEDoneiric; urgency=low + + * data/templates/Ubuntu.info.in: + - add oneiric templates + + -- Michael Vogt Thu, 28 Apr 2011 11:49:32 +0200 + python-apt (0.7.100.3ubuntu6) natty; urgency=low * Add missing _Description entry to Ubuntu.info for new deb-src entries. -- cgit v1.2.3 From bbe36232eb04a191d8fefee5bc65710e4347c0dd Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 28 Sep 2011 16:25:09 +0200 Subject: add concept of "ParentComponent" for e.g. ubuntu/multiverse that needs universe enabled as well (plus add test) LP: #829284 --- aptsources/distinfo.py | 11 ++++++++++- aptsources/distro.py | 14 ++++++++++++-- data/templates/Ubuntu.info.in | 4 ++++ debian/changelog | 8 ++++++++ tests/test_aptsources.py | 23 +++++++++++++++++++++++ 5 files changed, 57 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/aptsources/distinfo.py b/aptsources/distinfo.py index dbd28939..c8ec5c46 100644 --- a/aptsources/distinfo.py +++ b/aptsources/distinfo.py @@ -69,10 +69,17 @@ class Template(object): class Component(object): - def __init__(self, name, desc=None, long_desc=None): + def __init__(self, name, desc=None, long_desc=None, parent_component=None): self.name = name self.description = desc self.description_long = long_desc + self.parent_component = parent_component + + def get_parent_component(self): + return self.parent_component + + def set_parent_component(self, parent): + self.parent_component = parent def get_description(self): if self.description_long is not None: @@ -257,6 +264,8 @@ class DistInfo(object): component.set_description(_(value)) elif field == 'CompDescriptionLong': component.set_description_long(_(value)) + elif field == 'ParentComponent': + component.set_parent_component(value) self.finish_template(template, component) template=None component=None diff --git a/aptsources/distro.py b/aptsources/distro.py index 41c86981..f777a4ea 100644 --- a/aptsources/distro.py +++ b/aptsources/distro.py @@ -291,6 +291,16 @@ class Distribution(object): comp: the component that should be enabled """ + comps = set([comp]) + # look for parent components that we may have to add + for source in self.main_sources: + for c in source.template.components: + if c.name == comp and c.parent_component: + comps.add(c.parent_component) + for c in comps: + self._enable_component(c) + + def _enable_component(self, comp): def add_component_only_once(source, comps_per_dist): """ @@ -298,12 +308,12 @@ class Distribution(object): a repository could be splitted into different apt lines. If not add the component """ - # if we don't that distro, just reutnr (can happen for e.g. + # if we don't have that distro, just return (can happen for e.g. # dapper-update only in deb-src if source.dist not in comps_per_dist: return # if we have seen this component already for this distro, - # return (nothing to do + # return (nothing to do) if comp in comps_per_dist[source.dist]: return # add it diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index 39d9256e..e8afe443 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -21,6 +21,7 @@ Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices Component: multiverse +ParentComponent: universe _CompDescription: Restricted software _CompDescriptionLong: Software restricted by copyright or legal issues @@ -139,6 +140,7 @@ Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices Component: multiverse +ParentComponent: universe _CompDescription: Restricted software _CompDescriptionLong: Software restricted by copyright or legal issues @@ -256,6 +258,7 @@ Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices Component: multiverse +ParentComponent: universe _CompDescription: Restricted software _CompDescriptionLong: Software restricted by copyright or legal issues @@ -338,6 +341,7 @@ Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices Component: multiverse +ParentComponent: universe _CompDescription: Restricted software _CompDescriptionLong: Software restricted by copyright or legal issues diff --git a/debian/changelog b/debian/changelog index 3d998dd4..47ff5efd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +python-apt (0.8.0ubuntu8) UNRELEASEDoneiric; urgency=low + + * add concept of "ParentComponent" for e.g. ubuntu/multiverse + that needs universe enabled as well (plus add test) + LP: #829284 + + -- Michael Vogt Wed, 28 Sep 2011 15:48:23 +0200 + python-apt (0.8.0ubuntu7) oneiric; urgency=low * aptsources/distinfo.py: diff --git a/tests/test_aptsources.py b/tests/test_aptsources.py index 193d3806..dcfb0682 100644 --- a/tests/test_aptsources.py +++ b/tests/test_aptsources.py @@ -160,6 +160,29 @@ class TestAptSources(unittest.TestCase): assert sources.list[8].comps == ["main"] assert sources.list[8].line.strip() == str(sources.list[8]) + def test_enable_component(self): + from subprocess import Popen, PIPE + target = "./data/aptsources/sources.list.enable_comps" + line = "deb http://archive.ubuntu.com/ubuntu lucid main\n" + open(target, "w").write(line) + apt_pkg.config.set("Dir::Etc::sourcelist", target) + sources = aptsources.sourceslist.SourcesList(True, self.templates) + distro = aptsources.distro.get_distro(id="Ubuntu") + # make sure we are using the right distro + distro.codename = "lucid" + distro.id = "Ubuntu" + distro.release = "10.04" + # and get the sources + distro.get_sources(sources) + # test enable_component + comp = "multiverse" + distro.enable_component(comp) + comps = set() + for entry in sources: + comps = comps.union(set(entry.comps)) + self.assertTrue("multiverse" in comps) + self.assertTrue("universe" in comps) + def testDistribution(self): """aptsources: Test distribution detection.""" apt_pkg.config.set("Dir::Etc::sourcelist", "data/aptsources/" -- cgit v1.2.3 From 8c24ad05afb705f7842cb2bc7e08450acbe49653 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 19 Oct 2011 17:38:57 +0200 Subject: * data/templates/Ubuntu.info.in: - add precise --- data/templates/Ubuntu.info.in | 121 ++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 2 + 2 files changed, 123 insertions(+) (limited to 'data') diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index e8afe443..9e62c0fa 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -1,5 +1,123 @@ _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog +Suite: precise +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +_Description: Ubuntu 12.04 'Precise Pangolin' +Component: main +_CompDescription: Officially supported +_CompDescriptionLong: Canonical-supported Open Source software +Component: universe +_CompDescription: Community-maintained +_CompDescriptionLong: Community-maintained Open Source software +Component: restricted +_CompDescription: Non-free drivers +_CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +_CompDescription: Restricted software +_CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: precise +ParentSuite: precise +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Ubuntu 12.04 'Precise Pangolin' + +Suite: precise +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*12.04 +MatchURI: cdrom:\[Ubuntu.*12.04 +_Description: Cdrom with Ubuntu 12.04 'Precise Pangolin' +Available: False +Component: main +_CompDescription: Officially supported +Component: restricted +_CompDescription: Restricted copyright + +Suite: precise +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +_Description: Canonical Partners +Component: partner +_CompDescription: Software packaged by Canonical for their partners +_CompDescriptionLong: This software is not part of Ubuntu. + +Suite: precise +Official: false +RepositoryType: deb +BaseURI: http://extras.ubuntu.com +MatchURI: extras.ubuntu.com +_Description: Independent +Component: main +_CompDescription: Provided by third-party software developers +_CompDescriptionLong: Software offered by third party developers. + +Suite: precise-security +ParentSuite: precise +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +_Description: Important security updates + +Suite: precise-security +ParentSuite: precise +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com +_Description: Important security updates + +Suite: precise-updates +ParentSuite: precise +RepositoryType: deb +_Description: Recommended updates + +Suite: precise-updates +ParentSuite: precise +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Recommended updates + +Suite: precise-proposed +ParentSuite: precise +RepositoryType: deb +_Description: Pre-released updates + +Suite: precise-proposed +ParentSuite: precise +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Pre-released updates + +Suite: precise-backports +ParentSuite: precise +RepositoryType: deb +_Description: Unsupported updates + +Suite: precise-backports +ParentSuite: precise +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Unsupported updates + Suite: oneiric RepositoryType: deb BaseURI: http://ports.ubuntu.com/ubuntu-ports/ @@ -404,6 +522,7 @@ Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices Component: multiverse +ParentComponent: universe _CompDescription: Restricted software _CompDescriptionLong: Software restricted by copyright or legal issues @@ -528,6 +647,7 @@ Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices Component: multiverse +ParentComponent: universe _CompDescription: Restricted software _CompDescriptionLong: Software restricted by copyright or legal issues @@ -591,6 +711,7 @@ Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices Component: multiverse +ParentComponent: universe _CompDescription: Restricted software _CompDescriptionLong: Software restricted by copyright or legal issues diff --git a/debian/changelog b/debian/changelog index 246391b9..7c76edb1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ python-apt (0.8.0ubuntu10) UNRELEASEDoneiric-updates; urgency=low * aptsources/sourceslist.py: - import distinfo from the same dir (LP: #871007) + * data/templates/Ubuntu.info.in: + - add precise -- Michael Vogt Mon, 10 Oct 2011 11:13:20 +0200 -- cgit v1.2.3 From 4600b96f047154b4adadfc8f862c0f6201d21bdc Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 24 Nov 2011 16:36:48 +0100 Subject: fixed a typo, changed "Open Source software" to "free and open-source software" (LP: #500940) --- data/templates/Ubuntu.info.in | 52 +++++++++++++++++++++---------------------- debian/changelog | 4 ++++ 2 files changed, 30 insertions(+), 26 deletions(-) (limited to 'data') diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index 9e62c0fa..3a9562f4 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -13,10 +13,10 @@ MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 12.04 'Precise Pangolin' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -131,10 +131,10 @@ MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 11.10 'Oneiric Ocelot' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -250,10 +250,10 @@ MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 11.04 'Natty Narwhal' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -368,10 +368,10 @@ MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 10.10 'Maverick Meerkat' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -451,10 +451,10 @@ MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 10.04 'Lucid Lynx' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -514,10 +514,10 @@ MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 9.10 'Karmic Koala' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -577,10 +577,10 @@ MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 9.04 'Jaunty Jackalope' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -639,10 +639,10 @@ MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 8.10 'Intrepid Ibex' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -703,10 +703,10 @@ MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 8.04 'Hardy Heron' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -768,10 +768,10 @@ MirrorsFile: Ubuntu.mirrors _Description: Ubuntu 7.10 'Gutsy Gibbon' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -832,10 +832,10 @@ MirrorsFile: Ubuntu.mirrors _Description: Ubuntu 7.04 'Feisty Fawn' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -893,10 +893,10 @@ MirrorsFile: Ubuntu.mirrors _Description: Ubuntu 6.10 'Edgy Eft' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -954,10 +954,10 @@ MirrorsFile: Ubuntu.mirrors _Description: Ubuntu 6.06 LTS 'Dapper Drake' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained (universe) -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices diff --git a/debian/changelog b/debian/changelog index 6e750980..7150adf7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,10 @@ python-apt (0.8.2) UNRELEASED; urgency=low to get output from require_changes and missing_deps (closes: #624379) + [ Nikola Pavlović ] + * fixed a typo, changed "Open Source software" to + "free and open-source software" (LP: #500940) + -- Michael Vogt Wed, 19 Oct 2011 18:03:42 +0200 python-apt (0.8.1) unstable; urgency=low -- cgit v1.2.3 From e65c125fb031c219317c77724a6b4213cb3c695b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 4 May 2012 10:26:26 -0700 Subject: merge from ubuntu --- data/templates/Ubuntu.info.in | 118 ++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 7 ++- 2 files changed, 124 insertions(+), 1 deletion(-) (limited to 'data') diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index 3a9562f4..2aba269e 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -1,5 +1,123 @@ _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog +Suite: quantal +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +_Description: Ubuntu 12.04 'Precise Pangolin' +Component: main +_CompDescription: Officially supported +_CompDescriptionLong: Canonical-supported free and open-source software +Component: universe +_CompDescription: Community-maintained +_CompDescriptionLong: Community-maintained free and open-source software +Component: restricted +_CompDescription: Non-free drivers +_CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +_CompDescription: Restricted software +_CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: quantal +ParentSuite: quantal +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Ubuntu 12.04 'Precise Pangolin' + +Suite: quantal +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*12.04 +MatchURI: cdrom:\[Ubuntu.*12.04 +_Description: Cdrom with Ubuntu 12.04 'Precise Pangolin' +Available: False +Component: main +_CompDescription: Officially supported +Component: restricted +_CompDescription: Restricted copyright + +Suite: quantal +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +_Description: Canonical Partners +Component: partner +_CompDescription: Software packaged by Canonical for their partners +_CompDescriptionLong: This software is not part of Ubuntu. + +Suite: quantal +Official: false +RepositoryType: deb +BaseURI: http://extras.ubuntu.com +MatchURI: extras.ubuntu.com +_Description: Independent +Component: main +_CompDescription: Provided by third-party software developers +_CompDescriptionLong: Software offered by third party developers. + +Suite: quantal-security +ParentSuite: quantal +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +_Description: Important security updates + +Suite: quantal-security +ParentSuite: quantal +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com +_Description: Important security updates + +Suite: quantal-updates +ParentSuite: quantal +RepositoryType: deb +_Description: Recommended updates + +Suite: quantal-updates +ParentSuite: quantal +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Recommended updates + +Suite: quantal-proposed +ParentSuite: quantal +RepositoryType: deb +_Description: Pre-released updates + +Suite: quantal-proposed +ParentSuite: quantal +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Pre-released updates + +Suite: quantal-backports +ParentSuite: quantal +RepositoryType: deb +_Description: Unsupported updates + +Suite: quantal-backports +ParentSuite: quantal +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Unsupported updates + Suite: precise RepositoryType: deb BaseURI: http://ports.ubuntu.com/ubuntu-ports/ diff --git a/debian/changelog b/debian/changelog index 63f72fa5..d786c3c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,15 @@ python-apt (0.8.5) UNRELEASED; urgency=low + [ Michael Vogt ] * python/cache.cc: - ensure that pkgApplyStatus is called when the cache is opened (thanks to Sebastian Heinlein for finding this bug), LP: #659438 - -- Michael Vogt Tue, 17 Apr 2012 14:09:24 +0200 + [ Stéphane Graber ] + * data/templates/Ubuntu.info.in: + - add quantal + + -- Michael Vogt Tue, 17 Apr 2012 14:09:24 +0200 python-apt (0.8.4) unstable; urgency=low -- cgit v1.2.3 From fc369093bbefbd319f8713877026df9bedd48f6a Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 25 Jun 2012 14:33:29 +0200 Subject: * data/templates/Debian.info.in: - Add wheezy --- data/templates/Debian.info.in | 25 +++++++++++++++++++++++++ debian/changelog | 2 ++ po/python-apt.pot | 29 +++++++++++++++++------------ 3 files changed, 44 insertions(+), 12 deletions(-) (limited to 'data') diff --git a/data/templates/Debian.info.in b/data/templates/Debian.info.in index b9f70940..21b07608 100644 --- a/data/templates/Debian.info.in +++ b/data/templates/Debian.info.in @@ -1,5 +1,30 @@ _ChangelogURI: http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog +Suite: wheezy +RepositoryType: deb +BaseURI: http://http.us.debian.org/debian/ +MatchURI: ftp[0-9]*\.([a-z]*\.){0,1}debian\.org +MirrorsFile: Debian.mirrors +_Description: Debian 7.0 'Wheezy' +Component: main +_CompDescription: Officially supported +Component: contrib +_CompDescription: DFSG-compatible Software with Non-Free Dependencies +Component: non-free +_CompDescription: Non-DFSG-compatible Software + +Suite: wheezy-proposed-updates +RepositoryType: deb +ParentSuite: wheezy +_Description: Proposed updates + +Suite: wheezy/updates +RepositoryType: deb +BaseURI: http://security.debian.org/ +MatchURI: security\.debian\.org +ParentSuite: wheezy +_Description: Security updates + Suite: squeeze RepositoryType: deb BaseURI: http://http.us.debian.org/debian/ diff --git a/debian/changelog b/debian/changelog index 92507eed..2ee2a17b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ python-apt (0.8.6) UNRELEASED; urgency=low - exec apt-key, otherwise we ignore the return value * debian/control: - Build-depend on fakeroot, needed for the apt.auth tests + * data/templates/Debian.info.in: + - Add wheezy -- Michael Vogt Mon, 25 Jun 2012 13:41:02 +0200 diff --git a/po/python-apt.pot b/po/python-apt.pot index d6ac301e..940cd13a 100644 --- a/po/python-apt.pot +++ b/po/python-apt.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" +"POT-Creation-Date: 2012-06-25 14:31+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -284,7 +284,7 @@ msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174 msgid "Officially supported" msgstr "" @@ -356,56 +356,61 @@ msgstr "" #. Description #: ../data/templates/Debian.info.in:8 -msgid "Debian 6.0 'Squeeze' " +msgid "Debian 7.0 'Wheezy' " msgstr "" #. Description #: ../data/templates/Debian.info.in:33 -msgid "Debian 5.0 'Lenny' " +msgid "Debian 6.0 'Squeeze' " msgstr "" #. Description #: ../data/templates/Debian.info.in:58 -msgid "Debian 4.0 'Etch'" +msgid "Debian 5.0 'Lenny' " msgstr "" #. Description #: ../data/templates/Debian.info.in:83 +msgid "Debian 4.0 'Etch'" +msgstr "" + +#. Description +#: ../data/templates/Debian.info.in:108 msgid "Debian 3.1 'Sarge'" msgstr "" #. Description -#: ../data/templates/Debian.info.in:94 +#: ../data/templates/Debian.info.in:119 msgid "Proposed updates" msgstr "" #. Description -#: ../data/templates/Debian.info.in:101 +#: ../data/templates/Debian.info.in:126 msgid "Security updates" msgstr "" #. Description -#: ../data/templates/Debian.info.in:108 +#: ../data/templates/Debian.info.in:133 msgid "Debian current stable release" msgstr "" #. Description -#: ../data/templates/Debian.info.in:121 +#: ../data/templates/Debian.info.in:146 msgid "Debian testing" msgstr "" #. Description -#: ../data/templates/Debian.info.in:147 +#: ../data/templates/Debian.info.in:172 msgid "Debian 'Sid' (unstable)" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:151 +#: ../data/templates/Debian.info.in:176 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:153 +#: ../data/templates/Debian.info.in:178 msgid "Non-DFSG-compatible Software" msgstr "" -- cgit v1.2.3 From 30446f851f06569b1c1a014f76c96eaa303d370b Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 25 Jun 2012 14:54:45 +0200 Subject: Add wheezy-updates as Recommended Updates --- data/templates/Debian.info.in | 5 +++++ debian/changelog | 1 + 2 files changed, 6 insertions(+) (limited to 'data') diff --git a/data/templates/Debian.info.in b/data/templates/Debian.info.in index 21b07608..cfc8645a 100644 --- a/data/templates/Debian.info.in +++ b/data/templates/Debian.info.in @@ -25,6 +25,11 @@ MatchURI: security\.debian\.org ParentSuite: wheezy _Description: Security updates +Suite: wheezy-updates +RepositoryType: deb +ParentSuite: wheezy +_Description: Recommended updates + Suite: squeeze RepositoryType: deb BaseURI: http://http.us.debian.org/debian/ diff --git a/debian/changelog b/debian/changelog index 613b4b13..8a8fcb6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ python-apt (0.8.6) UNRELEASED; urgency=low - Build-depend on fakeroot, needed for the apt.auth tests * data/templates/Debian.info.in: - Add wheezy + - Add wheezy-updates as Recommended Updates * po: - Fixup the translations for wheezy again -- cgit v1.2.3 From dfd6bacface878eecf3fec4876bdae2f0491a646 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 25 Jun 2012 14:55:16 +0200 Subject: Order wheezy-proposed-updates after wheezy/updates and wheezy-updates --- data/templates/Debian.info.in | 10 +++++----- debian/changelog | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'data') diff --git a/data/templates/Debian.info.in b/data/templates/Debian.info.in index cfc8645a..3ffe174d 100644 --- a/data/templates/Debian.info.in +++ b/data/templates/Debian.info.in @@ -13,11 +13,6 @@ _CompDescription: DFSG-compatible Software with Non-Free Dependencies Component: non-free _CompDescription: Non-DFSG-compatible Software -Suite: wheezy-proposed-updates -RepositoryType: deb -ParentSuite: wheezy -_Description: Proposed updates - Suite: wheezy/updates RepositoryType: deb BaseURI: http://security.debian.org/ @@ -30,6 +25,11 @@ RepositoryType: deb ParentSuite: wheezy _Description: Recommended updates +Suite: wheezy-proposed-updates +RepositoryType: deb +ParentSuite: wheezy +_Description: Proposed updates + Suite: squeeze RepositoryType: deb BaseURI: http://http.us.debian.org/debian/ diff --git a/debian/changelog b/debian/changelog index 8a8fcb6b..59845f0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ python-apt (0.8.6) UNRELEASED; urgency=low * data/templates/Debian.info.in: - Add wheezy - Add wheezy-updates as Recommended Updates + - Order wheezy-proposed-updates after wheezy/updates and wheezy-updates * po: - Fixup the translations for wheezy again -- cgit v1.2.3