* merged with the ~ubuntu-core-dev branch

4 files changed, 30 insertions, 5 deletions

diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py
index 8ae98b55..38b55ef5 100644
--- a/SoftwareProperties/SoftwareProperties.py
+++ b/SoftwareProperties/SoftwareProperties.py
@@ -305,11 +305,12 @@ class SoftwareProperties(SimpleGladeApp):
         for server in self.distro.used_servers:
             if not re.match(server, self.distro.main_server) and \
                not re.match(server, self.distro.nearest_server):
-                #FIXME: an ubuntu hack
-                i = server.find("http://")
+                # FIXME: use regexp here instead of this
+                country = ""
+                i = server.find("://")
                 l = server.find(".archive.ubuntu.com")
                 if i != -1 and l != -1:
-                    country = server[i+7:l]
+                  country = server[i+len("://"):l]
                 if self.distro.countries.has_key(country):
                     # TRANSLATORS: %s is a country
                     server_store.append([_("Server for %s") % \
diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index 38cffc39..3e958db0 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -219,8 +219,9 @@ class UpdateList:
                                                     " of Ubuntu"), 10),
                  ("%s-updates" % dist, "Ubuntu", _("Recommended updates of "
                                                    "Ubuntu"), 9),
-                 ("%s-backports" % dist, "Ubuntu", _("Backports of Ubuntu"), 8),
-                 (dist, "Ubuntu", _("Updates of Ubuntu"), 7)]
+                 ("%s-proposed" % dist, "Ubuntu", _("Proposed updates for Ubuntu"), 8),
+                 ("%s-backports" % dist, "Ubuntu", _("Backports of Ubuntu"), 7),
+                 (dist, "Ubuntu", _("Updates of Ubuntu"), 6)]
 
     self.pkgs = {}
     self.matcher = {}
diff --git a/data/channels/Ubuntu.info.in b/data/channels/Ubuntu.info.in
index f3eb60d6..5631e93b 100644
--- a/data/channels/Ubuntu.info.in
+++ b/data/channels/Ubuntu.info.in
@@ -48,6 +48,13 @@ BaseURI: http://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/
+_Description: Proposed updates
+
 Suite: edgy-backports
 ParentSuite: edgy
 RepositoryType: deb
@@ -103,6 +110,13 @@ BaseURI: http://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/
+_Description: Proposed updates
+
 Suite: dapper-backports
 ParentSuite: dapper
 RepositoryType: deb
diff --git a/debian/changelog b/debian/changelog
index f03a4583..3f60cb20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+update-manager (0.44.4) edgy; urgency=low
+
+  * SoftwareProperties/SoftwareProperties.py:
+    - don't bomb when searching for the mirror (lp: #57015)
+  * UpdateManager/UpdateManager.py:
+    - added "%s-proposed" to the list of known origins
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 24 Aug 2006 13:00:23 +0200
+
 update-manager (0.44.3) edgy; urgency=low
 
   * help/C/update-manager-C.omf: