diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-08-24 14:23:19 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-08-24 14:23:19 +0200 |
| commit | 558f70b24693a1692be2ab79c4047af762f9e010 (patch) | |
| tree | 6c1904424dc917faac8c0b55cfc6374181ca9f24 | |
| parent | 7f6bff5a191c2bb563198f20d1c2803f5054464b (diff) | |
| download | python-apt-558f70b24693a1692be2ab79c4047af762f9e010.tar.gz | |
* properly added -proposed
| -rw-r--r-- | UpdateManager/UpdateManager.py | 5 | ||||
| -rw-r--r-- | data/channels/Ubuntu.info.in | 14 | ||||
| -rw-r--r-- | debian/changelog | 9 |
3 files changed, 26 insertions, 2 deletions
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: |