From 0a77702288c82b8b212f1b140a48a7fb22cfca9c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 13 Sep 2010 10:41:41 +0200 Subject: * data/templates/Ubuntu.info.in: - add extras.ubuntu.com and archvie.canonical.com to the templates * aptsources/distinfo.py, aptsources/distro.py: - support non-official templates (like extras.ubuntu.com) --- data/templates/Ubuntu.info.in | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'data') diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index 74095516..de883c05 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -35,6 +35,24 @@ _CompDescription: Officially supported Component: restricted _CompDescription: Restricted copyright +Suite: maverick +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +_Description: Canonical Partner Repository +Component: partner +_CompDescription: Partner offered software +_CompDescriptionLong: This software is not part of Ubuntu but offered by partners + +Suite: maverick +Official: false +RepositoryType: deb +BaseURI: http://extras.ubuntu.com +_Description: Independent Repository +Component: main +_CompDescription: Third Party Software +_CompDescriptionLong: Software offered by third party developers + Suite: maverick-security ParentSuite: maverick RepositoryType: deb @@ -756,3 +774,4 @@ Suite: warty-backports ParentSuite: warty RepositoryType: deb _Description: Ubuntu 4.10 Backports + -- cgit v1.2.3 From 34274f571119f0a2a3fd2fec0074aa682657b241 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 13 Sep 2010 11:04:41 +0200 Subject: data/templates/Ubuntu.info.in: updated based on the feedback from mpt (thanks) --- data/templates/Ubuntu.info.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data') diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index de883c05..e7aa553a 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -39,19 +39,19 @@ Suite: maverick Official: false RepositoryType: deb BaseURI: http://archive.canonical.com -_Description: Canonical Partner Repository +_Description: Canonical Partners Component: partner -_CompDescription: Partner offered software -_CompDescriptionLong: This software is not part of Ubuntu but offered by partners +_CompDescription: Software packaged by Canonical for their partners +_CompDescriptionLong: This software is not part of Ubuntu. Suite: maverick Official: false RepositoryType: deb BaseURI: http://extras.ubuntu.com -_Description: Independent Repository +_Description: Independent Component: main -_CompDescription: Third Party Software -_CompDescriptionLong: Software offered by third party developers +_CompDescription: Provided by third-party software developers +_CompDescriptionLong: Software offered by third party developers. Suite: maverick-security ParentSuite: maverick -- cgit v1.2.3 From e1fcd2d16fe2736ca71fadc05d463d99599b98c3 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 13 Sep 2010 11:22:04 +0200 Subject: data/templates/Ubuntu.info.in: add MatchURI --- data/templates/Ubuntu.info.in | 2 ++ 1 file changed, 2 insertions(+) (limited to 'data') diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index e7aa553a..a9b539af 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -39,6 +39,7 @@ Suite: maverick 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 @@ -48,6 +49,7 @@ Suite: maverick Official: false RepositoryType: deb BaseURI: http://extras.ubuntu.com +MatchURI: extras.ubuntu.com _Description: Independent Component: main _CompDescription: Provided by third-party software developers -- cgit v1.2.3