From 29fc5269d2ed7205ec5a103615cbef5ac9c316a1 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 24 May 2006 15:07:47 +0200
Subject: * show version not codename when in the upgrade button

---
 UpdateManager/MetaRelease.py   | 3 ++-
 UpdateManager/UpdateManager.py | 6 +++++-
 debian/changelog               | 9 +++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/UpdateManager/MetaRelease.py b/UpdateManager/MetaRelease.py
index b655f36a..681190c8 100644
--- a/UpdateManager/MetaRelease.py
+++ b/UpdateManager/MetaRelease.py
@@ -32,8 +32,9 @@ import rfc822
 from subprocess import Popen,PIPE
 
 class Dist(object):
-    def __init__(self, name, date, supported):
+    def __init__(self, name, version, date, supported):
         self.name = name
+        self.version = version
         self.date = date
         self.supported = supported
         self.releaseNotesURI = None
diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index 5b8be99a..ac9e98f5 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -314,6 +314,10 @@ class UpdateManager(SimpleGladeApp):
           proxy_support = urllib2.ProxyHandler({"http":"http://%s:%s" % (proxy_host, proxy_port)})
           opener = urllib2.build_opener(proxy_support)
           urllib2.install_opener(opener)
+	  # install a proxy environment too
+	  if not os.environ.has_key("http_proxy"):
+		  os.putenv("http_proxy",
+			    "http://%s:%s/" % (proxy_host, proxy_port))
 
     # setup the help viewer and disable the help button if there
     # is no viewer available
@@ -655,7 +659,7 @@ class UpdateManager(SimpleGladeApp):
     #  self.gconfclient.set_string("/apps/update-manager/seen_dist",name)
     #dialog.destroy()
     self.frame_new_release.show()
-    self.label_new_release.set_markup("<b>New distribution release '%s' is available</b>" % upgradable_to.name)
+    self.label_new_release.set_markup("<b>New distribution release '%s' is available</b>" % upgradable_to.version)
     self.new_dist = upgradable_to
     
 
diff --git a/debian/changelog b/debian/changelog
index abe2edbb..b87daeb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+update-manager (0.42.2ubuntu21) dapper; urgency=low
+
+  * UpdateManager/UpdateManager.py:
+    - when a distribution release becomes available, display the 
+      version, not the codename (as per 
+      https://wiki.ubuntu.com/CodeNamesToVersionNumbers)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 24 May 2006 15:07:19 +0200
+
 update-manager (0.42.2ubuntu20) dapper; urgency=low
 
   * SoftwareProperties/aptsources.py, channels/Ubuntu.info.in:
-- 
cgit v1.2.3