From 6d740ab2dee60d3fe10c563932fc62d5dd5d2057 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 4 Jul 2006 11:25:23 +0200 Subject: * SoftwareProperties/aptsources.py: - added edgy sources * debian/changelog: - prepared a new upload --- SoftwareProperties/aptsources.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'SoftwareProperties') 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 -- cgit v1.2.3 From 54d5696fa964d3cc7a79a1ba0ed4083d9701de1e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 27 Jul 2006 17:20:33 +0200 Subject: * data/glade/SoftwareProperties.glade: - changed the text for Popcon participation * SoftwareProperties/SoftwareProperties.py: - support popcon pariticipation --- SoftwareProperties/SoftwareProperties.py | 22 ++++++++++++++++++++++ data/glade/SoftwareProperties.glade | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) (limited to 'SoftwareProperties') diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index f7a40821..07170fa6 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -440,6 +440,27 @@ class SoftwareProperties(SimpleGladeApp): source.file) self.modified_sourceslist() + def on_checkbutton_popcon_toggled(self, widget): + """ The user clicked on the popcon paritipcation button """ + popcon = "/etc/popularity-contest.conf" + if widget.get_active(): + new_value = "yes" + else: + new_value = "no" + if os.path.exists(popcon): + # read it + lines = open(popcon).read().split("\n") + for line in lines: + try: + (key,value) = line.split("=") + if key == "PARTICIPATE": + lines[lines.index(line)] = 'PARTICIPATE=\"%s"' % new_value + except ValueError: + continue + # write it + open(popcon,"w").write("\n".join(lines)) + + def open_file(self, file): """Show an confirmation for adding the channels of the specified file""" dialog = dialog_add_sources_list.AddSourcesList(self.window_main, @@ -1003,3 +1024,4 @@ class GtkCdromProgress(apt.progress.CdromProgress, SimpleGladeApp): return True return False + diff --git a/data/glade/SoftwareProperties.glade b/data/glade/SoftwareProperties.glade index 08ffd743..98bf65bc 100644 --- a/data/glade/SoftwareProperties.glade +++ b/data/glade/SoftwareProperties.glade @@ -1057,7 +1057,7 @@ True - <i>Please take part in the popularity contest, to improve the user experience of Ubuntu. Therefor the following data will be collected and sent to the Ubuntu project anonymously on a weekly basis: the list of installed software and how often it was used. + <i>To improve the user experience of Ubuntu please take part in the popularity contest. If you do so the list of installed software and how often it was used will be collected and sent anonymously to the Ubuntu project on a weekly basis. The results are used to improve the support for popular applications and to rank applications in the search results.</i> False -- cgit v1.2.3