From d08caea3196550e700db9a1d83fcaa3a8ad35b2d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 15 Aug 2006 22:20:33 +0200 Subject: * DistUpgrade/DistUpgradeControler.py: - always enable "main" on upgrades, this ensures that we do not end up with a system without the main archive (various bugs for breezy->dapper) * data/channels/Debian.info, data/channels/Ubuntu.info: - added pre-generated files (required for the upgrader) * UpdateManager/Common/aptsources.py: - add a "matcherPath" parameter to SourcesList (for the upgrader) --- data/channels/Debian.info | 57 ++++++++++ data/channels/Makefile | 4 +- data/channels/Ubuntu.info | 264 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 323 insertions(+), 2 deletions(-) create mode 100644 data/channels/Debian.info create mode 100644 data/channels/Ubuntu.info (limited to 'data') diff --git a/data/channels/Debian.info b/data/channels/Debian.info new file mode 100644 index 00000000..3958607a --- /dev/null +++ b/data/channels/Debian.info @@ -0,0 +1,57 @@ +ChangelogURI: http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog + +Suite: sarge +RepositoryType: deb +BaseURI: http://http.us.debian.org/debian/ +Description: Debian 3.1 "Sarge" +Component: main +Enabled: 1 +CompDescription: Officially supported +Component: contrib +Enabled: 0 +CompDescription: DFSG-compatible Software with Non-Free Dependencies +Component: non-free +Enabled: 0 +CompDescription: Non-DFSG-compatible Software + +Suite: sarge/updates +RepositoryType: deb +BaseURI: http://security.debian.org/ +Description: Debian 3.1 "Sarge" Security Updates +Component: main +Enabled: 1 +CompDescription: Officially supported +Component: contrib +Enabled: 0 +CompDescription: DFSG-compatible Software with Non-Free Dependencies +Component: non-free +Enabled: 0 +CompDescription: Non-DFSG-compatible Software + +Suite: etch +RepositoryType: deb +BaseURI: http://http.us.debian.org/debian/ +Description: Debian "Etch" (testing) +Component: main +Enabled: 1 +CompDescription: Officially supported +Component: contrib +Enabled: 0 +CompDescription: DFSG-compatible Software with Non-Free Dependencies +Component: non-free +Enabled: 0 +CompDescription: Non-DFSG-compatible Software + +Suite: sid +RepositoryType: deb +BaseURI: http://http.us.debian.org/debian/ +Description: Debian "Sid" (unstable) +Component: main +Enabled: 1 +CompDescription: Officially supported +Component: contrib +Enabled: 0 +CompDescription: DFSG-compatible Software with Non-Free Dependencies +Component: non-free +Enabled: 0 +CompDescription: Non-DFSG-compatible Software diff --git a/data/channels/Makefile b/data/channels/Makefile index 3901f9cc..49cc13e1 100644 --- a/data/channels/Makefile +++ b/data/channels/Makefile @@ -5,10 +5,10 @@ INFO_FILES := $(patsubst %.info.in,%.info,$(wildcard *.info.in)) all: $(INFO_FILES) -%.info: %.info.in ../po/$(DOMAIN).pot +%.info: %.info.in sed 's/^_//g' < $< > $@ intltool-extract --type=gettext/rfc822deb $< #intltool-merge -d ../po $< $@ clean: - rm -f $(INFO_FILES) $(wildcard *.h) \ No newline at end of file + rm -f $(wildcard *.h) diff --git a/data/channels/Ubuntu.info b/data/channels/Ubuntu.info new file mode 100644 index 00000000..99c202ba --- /dev/null +++ b/data/channels/Ubuntu.info @@ -0,0 +1,264 @@ +ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog + +Suite: edgy +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +Description: Ubuntu 6.10 'Edgy Eft' +Component: main +Enabled: 1 +CompDescription: Officially supported +CompDescriptionLong: OpenSource software that is officially supported by Canonical Ltd. (main) +Component: universe +Enabled: 0 +CompDescription: Community maintained (universe) +CompDescriptionLong: OpenSource software that is maintained by the community (universe) +Component: restricted +Enabled: 1 +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices (restricted) +Component: multiverse +Enabled: 0 +CompDescription: Restricted software (Multiverse) +CompDescriptionLong: Software that is restricted by copyright or legal issues (multiverse) + +Suite: edgy +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*6.10 +Description: Cdrom with Ubuntu 6.10 'Edgy Eft' +Available: False +Component: main +Enabled: 1 +CompDescription: Oficially supported +Component: restricted +Enabled: 1 +CompDescription: Restricted copyright + +Suite: edgy-security +ParentSuite: edgy +RepositoryType: deb +BaseURI: http://security.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +Description: Important security updates + +Suite: edgy-updates +ParentSuite: edgy +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +Description: Recommended updates + +Suite: edgy-backports +ParentSuite: edgy +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +Description: Backported updates + +Suite: dapper +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +Description: Ubuntu 6.06 LTS 'Dapper Drake' +Component: main +Enabled: 1 +CompDescription: Officially supported +CompDescriptionLong: OpenSource software that is officially supported by Canonical Ltd. (main) +Component: universe +Enabled: 0 +CompDescription: Community maintained (universe) +CompDescriptionLong: OpenSource software that is maintained by the community (universe) +Component: restricted +Enabled: 1 +CompDescription: Non-free drivers +CompDescriptionLong: Proprietary drivers for devices (restricted) +Component: multiverse +Enabled: 0 +CompDescription: Restricted software (Multiverse) +CompDescriptionLong: Software that is restricted by copyright or legal issues (multiverse) + +Suite: dapper +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*6.06 +Description: Cdrom with Ubuntu 6.06 LTS 'Dapper Drake' +Available: False +Component: main +Enabled: 1 +CompDescription: Oficially supported +Component: restricted +Enabled: 1 +CompDescription: Restricted copyright + +Suite: dapper-security +ParentSuite: dapper +RepositoryType: deb +BaseURI: http://security.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +Description: Important security updates + +Suite: dapper-updates +ParentSuite: dapper +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +Description: Recommended updates + +Suite: dapper-backports +ParentSuite: dapper +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +Description: Backported updates + +Suite: breezy +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: 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 +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*5.10 +Description: Cdrom with Ubuntu 5.10 'Breezy Badger' +Available: False +Component: main +Enabled: 1 +CompDescription: Oficially supported +Component: restricted +Enabled: 1 +CompDescription: Restricted copyright + +Suite: breezy-security +ParentSuite: breezy +RepositoryType: deb +BaseURI: http://security.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +Description: Ubuntu 5.10 Security Updates + +Suite: breezy-updates +ParentSuite: breezy +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +Description: Ubuntu 5.10 Updates + +Suite: breezy-backports +ParentSuite: breezy +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +Description: Ubuntu 5.10 Backports + +Suite: hoary +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +Description: Ubuntu 5.04 'Hoary Hedgehog' +Component: main +Enabled: 1 +CompDescription: Oficially 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: hoary +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*5.04 +Description: Cdrom with Ubuntu 5.04 'Hoary Hedgehog' +Available: False +Component: main +Enabled: 1 +CompDescription: Oficially supported +Component: restricted +Enabled: 1 +CompDescription: Restricted copyright + +Suite: hoary-security +ParentSuite: hoary +RepositoryType: deb +BaseURI: http://security.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +Description: Ubuntu 5.04 Security Updates + +Suite: hoary-updates +ParentSuite: hoary +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +Description: Ubuntu 5.04 Updates + +Suite: hoary-backports +ParentSuite: hoary +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +Description: Ubuntu 5.04 Backports + +Suite: warty +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +Description: Ubuntu 4.10 'Warty Warthog' +Component: main +Enabled: 1 +CompDescription: Oficially 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: warty +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*4.10 +Description: Cdrom with Ubuntu 4.10 'Warty Warthog' +Available: False +Component: main +Enabled: 1 +CompDescription: Oficially supported +Component: restricted +Enabled: 1 +CompDescription: Restricted copyright + +Suite: warty-security +ParentSuite: warty +RepositoryType: deb +BaseURI: http://security.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +Description: Ubuntu 4.10 Security Updates + +Suite: warty-updates +ParentSuite: warty +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +Description: Ubuntu 4.10 Updates + +Suite: warty-backports +ParentSuite: warty +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +Description: Ubuntu 4.10 Backports -- cgit v1.2.3 From 558f70b24693a1692be2ab79c4047af762f9e010 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 24 Aug 2006 14:23:19 +0200 Subject: * properly added -proposed --- UpdateManager/UpdateManager.py | 5 +++-- data/channels/Ubuntu.info.in | 14 ++++++++++++++ debian/changelog | 9 +++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) (limited to 'data') 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 Thu, 24 Aug 2006 13:00:23 +0200 + update-manager (0.44.3) edgy; urgency=low * help/C/update-manager-C.omf: -- cgit v1.2.3