* don't show codenames but only version numbers (as per

  https://wiki.ubuntu.com/CodeNamesToVersionNumbers)

3 files changed, 19 insertions, 82 deletions

diff --git a/SoftwareProperties/aptsources.py b/SoftwareProperties/aptsources.py
index 133e9b3d..bd8ef381 100644
--- a/SoftwareProperties/aptsources.py
+++ b/SoftwareProperties/aptsources.py
@@ -369,29 +369,25 @@ class SourceEntryMatcher:
     # CDs
     self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*6.06",
                                          ".*",
-                                         _("CD disk with Ubuntu 6.06 'Dapper "\
-                                           "Drake'"),
+                                         _("CD disk with Ubuntu 6.06 LTS"),
                                          ubuntu_comps, ubuntu_comps_descr))
     self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*5.10",
                                          ".*",
-                                         _("CD disk with Ubuntu 5.10 'Breezy "\
-                                           "Badger'"),
+                                         _("CD disk with Ubuntu 5.10"),
                                          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"),
                                          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"),
                                          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",
                                          ubuntu_comps, ubuntu_comps_descr))
     self.dist_list.append(self.MatchDist(".*security.ubuntu.com/ubuntu",
                                          "^warty-security$",
@@ -420,7 +416,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",
                                          ubuntu_comps, ubuntu_comps_descr))
     self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
                                          "^hoary-updates$",
@@ -441,7 +437,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",
                                          ubuntu_comps, ubuntu_comps_descr))
     self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
                                          "^breezy-backports$",
@@ -454,15 +450,15 @@ class SourceEntryMatcher:
     # dapper
     self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
                                          "^dapper-security$",
-                                         _("Ubuntu 6.06 Security Updates"),
+                                         _("Ubuntu 6.06 LTS Security Updates"),
                                          ubuntu_comps, ubuntu_comps_descr))
     self.dist_list.append(self.MatchDist(".*security.ubuntu.com/ubuntu",
                                          "^dapper-security$",
-                                         _("Ubuntu 6.06 Security Updates"),
+                                         _("Ubuntu 6.06 LTS Security Updates"),
                                          ubuntu_comps, ubuntu_comps_descr))
     self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
                                          "^dapper$",
-                                         "Ubuntu 6.06 'Dapper Drake'",
+                                         "Ubuntu 6.06 LTS",
                                          ubuntu_comps, ubuntu_comps_descr))
     self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
                                          "^dapper-backports$",
diff --git a/channels/Ubuntu.info.in b/channels/Ubuntu.info.in
index fd017105..d8eb1eae 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.06 'Dapper Drake'
+_Description: Ubuntu 6.06 LTS
 Component: main
 Enabled: 1
 _CompDescription: Officially supported
@@ -68,70 +68,3 @@ Component: multiverse
 Enabled: 0
 _CompDescription: Non-free (Multiverse)
 
-Suite: breezy
-RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-_Description: Ubuntu 5.10 'Breezy Badger'
-Component: main
-Enabled: 1
-_CompDescription: Officially supported
-Component: restricted
-Enabled: 1
-_CompDescription: Restricted copyright
-Component: universe
-Enabled: 0
-_CompDescription: Community maintained (Universe)
-Component: multiverse
-Enabled: 0
-_CompDescription: Non-free (Multiverse)
-
-Suite: breezy-security
-RepositoryType: deb
-BaseURI: http://security.ubuntu.com/ubuntu/
-_Description: Ubuntu 5.10 Security Updates
-Component: main
-Enabled: 1
-_CompDescription: Officially supported
-Component: restricted
-Enabled: 1
-_CompDescription: Restricted copyright
-Component: universe
-Enabled: 0
-_CompDescription: Community maintained (Universe)
-Component: multiverse
-Enabled: 0
-_CompDescription: Non-free (Multiverse)
-
-Suite: breezy-updates
-RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-_Description: Ubuntu 5.10 Updates
-Component: main
-Enabled: 1
-_CompDescription: Officially supported
-Component: restricted
-Enabled: 1
-_CompDescription: Restricted copyright
-Component: universe
-Enabled: 0
-_CompDescription: Community maintained (Universe)
-Component: multiverse
-Enabled: 0
-_CompDescription: Non-free (Multiverse)
-
-Suite: breezy-backports
-RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-_Description: Ubuntu 5.10 Backports
-Component: main
-Enabled: 1
-_CompDescription: Officially supported
-Component: restricted
-Enabled: 1
-_CompDescription: Restricted copyright
-Component: universe
-Enabled: 0
-_CompDescription: Community maintained (Universe)
-Component: multiverse
-Enabled: 0
-_CompDescription: Non-free (Multiverse)
diff --git a/debian/changelog b/debian/changelog
index c5beff84..abe2edbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+update-manager (0.42.2ubuntu20) dapper; urgency=low
+
+  * SoftwareProperties/aptsources.py, channels/Ubuntu.info.in:
+    - remove the codenames from the releases (as per 
+      https://wiki.ubuntu.com/CodeNamesToVersionNumbers)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 23 May 2006 16:04:39 +0200
+
 update-manager (0.42.2ubuntu19) dapper; urgency=low
 
   * help/C/figures: