summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--SoftwareProperties/aptsources.py21
-rw-r--r--debian/changelog5
2 files changed, 25 insertions, 1 deletions
diff --git a/SoftwareProperties/aptsources.py b/SoftwareProperties/aptsources.py
index 74ef2f4a..5da04b23 100644
--- a/SoftwareProperties/aptsources.py
+++ b/SoftwareProperties/aptsources.py
@@ -468,6 +468,27 @@ class SourceEntryMatcher:
"^dapper-updates$",
_("Ubuntu 6.06 LTS Updates"),
ubuntu_comps, ubuntu_comps_descr))
+ # edgy
+ self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
+ "^edgy-security$",
+ _("Ubuntu 6.10 Security Updates"),
+ ubuntu_comps, ubuntu_comps_descr))
+ self.dist_list.append(self.MatchDist(".*security.ubuntu.com/ubuntu",
+ "^edgy-security$",
+ _("Ubuntu 6.10 Security Updates"),
+ ubuntu_comps, ubuntu_comps_descr))
+ self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
+ "^edgy$",
+ "Ubuntu 6.10",
+ ubuntu_comps, ubuntu_comps_descr))
+ self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
+ "^edgy-backports$",
+ _("Ubuntu 6.10 Backports"),
+ ubuntu_comps, ubuntu_comps_descr))
+ self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
+ "^edgy-updates$",
+ _("Ubuntu 6.10 Updates"),
+ ubuntu_comps, ubuntu_comps_descr))
# DEBIAN
diff --git a/debian/changelog b/debian/changelog
index 200ee407..55cb82bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ update-manager (0.43) edgy; urgency=low
* fixes in the changelog reading code
* speedup in the cache clear code
+ * runs as user by default now
+ * uses dbus to implement singleton behaviour
+ * updated the software-properties code to know about edgy
- -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 28 Jun 2006 10:17:48 +0200
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 4 Jul 2006 11:16:31 +0200
update-manager (0.42.2ubuntu22) dapper; urgency=low