diff options
| -rw-r--r-- | SoftwareProperties/aptsources.py | 27 | ||||
| -rw-r--r-- | channels/Ubuntu.info.in | 8 |
2 files changed, 21 insertions, 14 deletions
diff --git a/SoftwareProperties/aptsources.py b/SoftwareProperties/aptsources.py index 03459adf..4252c10c 100644 --- a/SoftwareProperties/aptsources.py +++ b/SoftwareProperties/aptsources.py @@ -336,23 +336,30 @@ class SourceEntryMatcher: _("Community maintained (Universe)"), _("Non-free (Multiverse)")] # CDs + self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*6.06", + ".*", + _("CD disk with Ubuntu 6.06 'Dapper "\ + "Drake'"), self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*5.10", ".*", - _("CD disk with Ubuntu 5.10 \"Breezy Badger\""), + _("CD disk with Ubuntu 5.10 'Breezy "\ + "Badger'"), ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*5.04", ".*", - _("CD disk with Ubuntu 5.04 \"Hoary Hedgehog\""), + _("CD disk with Ubuntu 5.04 "\ + "'Hoary Hedgehog'"), ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*4.10", ".*", - _("CD disk with Ubuntu 4.10 \"Warty Warthog\""), + _("CD disk with Ubuntu 4.10 "\ + "'Warty Warthog'"), ubuntu_comps, ubuntu_comps_descr)) # URIs # Warty self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^warty$", - "Ubuntu 4.10 \"Warty Warthog\"", + "Ubuntu 4.10 'Warty Warthog'", ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist(".*security.ubuntu.com/ubuntu", "^warty-security$", @@ -377,7 +384,7 @@ class SourceEntryMatcher: ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^hoary$", - "Ubuntu 5.04 \"Hoary Hedgehog\"", + "Ubuntu 5.04 'Hoary Hedgehog'", ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^hoary-updates$", @@ -394,7 +401,7 @@ class SourceEntryMatcher: ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^breezy$", - "Ubuntu 5.10 \"Breezy Badger\"", + "Ubuntu 5.10 'Breezy Badger'", ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^breezy-updates$", @@ -403,19 +410,19 @@ class SourceEntryMatcher: # dapper self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^dapper-security$", - _("Ubuntu 6.04 Security Updates"), + _("Ubuntu 6.06 Security Updates"), ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist(".*security.ubuntu.com/ubuntu", "^dapper-security$", - _("Ubuntu 6.04 Security Updates"), + _("Ubuntu 6.06 Security Updates"), ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^dapper$", - "Ubuntu 6.04 \"Dapper Drake\"", + "Ubuntu 6.06 'Dapper Drake'", ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^dapper-updates$", - _("Ubuntu 6.04 Updates"), + _("Ubuntu 6.06 Updates"), ubuntu_comps, ubuntu_comps_descr)) diff --git a/channels/Ubuntu.info.in b/channels/Ubuntu.info.in index b0358284..fd017105 100644 --- a/channels/Ubuntu.info.in +++ b/channels/Ubuntu.info.in @@ -3,7 +3,7 @@ _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/chang Suite: dapper RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -_Description: Ubuntu 6.04 'Dapper Drake' +_Description: Ubuntu 6.06 'Dapper Drake' Component: main Enabled: 1 _CompDescription: Officially supported @@ -20,7 +20,7 @@ _CompDescription: Non-free (Multiverse) Suite: dapper-security RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ -_Description: Ubuntu 6.04 Security Updates +_Description: Ubuntu 6.06 Security Updates Component: main Enabled: 1 _CompDescription: Officially supported @@ -37,7 +37,7 @@ _CompDescription: Non-free (Multiverse) Suite: dapper-updates RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -_Description: Ubuntu 6.04 Updates +_Description: Ubuntu 6.06 Updates Component: main Enabled: 1 _CompDescription: Officially supported @@ -54,7 +54,7 @@ _CompDescription: Non-free (Multiverse) Suite: dapper-backports RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -_Description: Ubuntu 6.04 Backports +_Description: Ubuntu 6.06 Backports Component: main Enabled: 1 _CompDescription: Officially supported |