From a021109da0fb1e138adc912c44632f0956243769 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sun, 10 Sep 2006 12:02:11 +0200 Subject: * added new "MirrorsFile" keyword for the DistInfo Tagfile * look for mirros as well when matching distros --- data/channels/Ubuntu.info | 52 ++++++++++++++++++++----------------- data/channels/Ubuntu.info.in | 62 ++++++++++++++++++++++++++++---------------- 2 files changed, 68 insertions(+), 46 deletions(-) (limited to 'data/channels') diff --git a/data/channels/Ubuntu.info b/data/channels/Ubuntu.info index 2620a7da..93ec83d2 100644 --- a/data/channels/Ubuntu.info +++ b/data/channels/Ubuntu.info @@ -3,7 +3,8 @@ ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/change Suite: edgy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg Description: Ubuntu 6.10 'Edgy Eft' Component: main Enabled: 1 @@ -38,34 +39,35 @@ Suite: edgy-security ParentSuite: edgy RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com Description: Important security updates Suite: edgy-updates ParentSuite: edgy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu Description: Recommended updates Suite: edgy-proposed ParentSuite: edgy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu Description: Proposed updates Suite: edgy-backports ParentSuite: edgy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu Description: Backported updates Suite: dapper RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg Description: Ubuntu 6.06 LTS 'Dapper Drake' Component: main Enabled: 1 @@ -100,34 +102,35 @@ Suite: dapper-security ParentSuite: dapper RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com Description: Important security updates Suite: dapper-updates ParentSuite: dapper RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu Description: Recommended updates Suite: dapper-proposed ParentSuite: dapper RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu Description: Proposed updates Suite: dapper-backports ParentSuite: dapper RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu Description: Backported updates Suite: breezy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg Description: Ubuntu 5.10 'Breezy Badger' Component: main Enabled: 1 @@ -158,27 +161,28 @@ Suite: breezy-security ParentSuite: breezy RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com Description: Ubuntu 5.10 Security Updates Suite: breezy-updates ParentSuite: breezy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu Description: Ubuntu 5.10 Updates Suite: breezy-backports ParentSuite: breezy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu Description: Ubuntu 5.10 Backports Suite: hoary RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg Description: Ubuntu 5.04 'Hoary Hedgehog' Component: main Enabled: 1 @@ -209,31 +213,31 @@ Suite: hoary-security ParentSuite: hoary RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com Description: Ubuntu 5.04 Security Updates Suite: hoary-updates ParentSuite: hoary RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu Description: Ubuntu 5.04 Updates Suite: hoary-backports ParentSuite: hoary RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu Description: Ubuntu 5.04 Backports Suite: warty RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu Description: Ubuntu 4.10 'Warty Warthog' Component: main Enabled: 1 -CompDescription: Oficially supported +CompDescription: No longer oficially supported Component: restricted Enabled: 1 CompDescription: Restricted copyright @@ -251,7 +255,7 @@ Description: Cdrom with Ubuntu 4.10 'Warty Warthog' Available: False Component: main Enabled: 1 -CompDescription: Oficially supported +CompDescription: No longer oficially supported Component: restricted Enabled: 1 CompDescription: Restricted copyright @@ -260,19 +264,19 @@ Suite: warty-security ParentSuite: warty RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +MatchURI: archive.ubuntu.comubuntu/|security.ubuntu.com Description: Ubuntu 4.10 Security Updates Suite: warty-updates ParentSuite: warty RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu Description: Ubuntu 4.10 Updates Suite: warty-backports ParentSuite: warty RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu Description: Ubuntu 4.10 Backports diff --git a/data/channels/Ubuntu.info.in b/data/channels/Ubuntu.info.in index ed7fd50c..2b20cf8f 100644 --- a/data/channels/Ubuntu.info.in +++ b/data/channels/Ubuntu.info.in @@ -3,7 +3,8 @@ _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/chang Suite: edgy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 6.10 'Edgy Eft' Component: main Enabled: 1 @@ -38,34 +39,39 @@ Suite: edgy-security ParentSuite: edgy RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Important security updates Suite: edgy-updates ParentSuite: edgy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Recommended updates Suite: edgy-proposed ParentSuite: edgy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Proposed updates Suite: edgy-backports ParentSuite: edgy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Backported updates Suite: dapper RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 6.06 LTS 'Dapper Drake' Component: main Enabled: 1 @@ -100,34 +106,39 @@ Suite: dapper-security ParentSuite: dapper RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Important security updates Suite: dapper-updates ParentSuite: dapper RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Recommended updates Suite: dapper-proposed ParentSuite: dapper RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Proposed updates Suite: dapper-backports ParentSuite: dapper RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Backported updates Suite: breezy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.10 'Breezy Badger' Component: main Enabled: 1 @@ -158,27 +169,31 @@ Suite: breezy-security ParentSuite: breezy RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.10 Security Updates Suite: breezy-updates ParentSuite: breezy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.10 Updates Suite: breezy-backports ParentSuite: breezy RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.10 Backports Suite: hoary RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.04 'Hoary Hedgehog' Component: main Enabled: 1 @@ -209,27 +224,30 @@ Suite: hoary-security ParentSuite: hoary RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.04 Security Updates Suite: hoary-updates ParentSuite: hoary RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.04 Updates Suite: hoary-backports ParentSuite: hoary RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu +MirrorsFile: /usr/share/update-manager/mirrors.cfg _Description: Ubuntu 5.04 Backports Suite: warty RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu _Description: Ubuntu 4.10 'Warty Warthog' Component: main Enabled: 1 @@ -260,19 +278,19 @@ Suite: warty-security ParentSuite: warty RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +MatchURI: archive.ubuntu.comubuntu/|security.ubuntu.com _Description: Ubuntu 4.10 Security Updates Suite: warty-updates ParentSuite: warty RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu _Description: Ubuntu 4.10 Updates Suite: warty-backports ParentSuite: warty RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -MatchURI: archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu _Description: Ubuntu 4.10 Backports -- cgit v1.2.3