summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--SoftwareProperties/aptsources.py44
-rw-r--r--UpdateManager/UpdateManager.py20
-rw-r--r--channels/Ubuntu.info.in8
-rw-r--r--data/SoftwareProperties.glade2
-rw-r--r--data/UpdateManager.glade2
-rw-r--r--debian/changelog10
-rw-r--r--update-manager1
7 files changed, 67 insertions, 20 deletions
diff --git a/SoftwareProperties/aptsources.py b/SoftwareProperties/aptsources.py
index 03459adf..77de510b 100644
--- a/SoftwareProperties/aptsources.py
+++ b/SoftwareProperties/aptsources.py
@@ -336,23 +336,31 @@ class SourceEntryMatcher:
_("Community maintained (Universe)"),
_("Non-free (Multiverse)")]
# CDs
+ self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*6.06",
+ ".*",
+ _("CD disk with Ubuntu 6.06 'Dapper "\
+ "Drake'"),
+ ubuntu_comps, ubuntu_comps_descr))
self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*5.10",
".*",
- _("CD disk with Ubuntu 5.10 \"Breezy Badger\""),
+ _("CD disk with Ubuntu 5.10 'Breezy "\
+ "Badger'"),
ubuntu_comps, ubuntu_comps_descr))
self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*5.04",
".*",
- _("CD disk with Ubuntu 5.04 \"Hoary Hedgehog\""),
+ _("CD disk with Ubuntu 5.04 'Hoary "\
+ "Hedgehog'"),
ubuntu_comps, ubuntu_comps_descr))
self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*4.10",
".*",
- _("CD disk with Ubuntu 4.10 \"Warty Warthog\""),
+ _("CD disk with Ubuntu 4.10 "\
+ "'Warty Warthog'"),
ubuntu_comps, ubuntu_comps_descr))
# URIs
# Warty
self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
"^warty$",
- "Ubuntu 4.10 \"Warty Warthog\"",
+ "Ubuntu 4.10 'Warty Warthog'",
ubuntu_comps, ubuntu_comps_descr))
self.dist_list.append(self.MatchDist(".*security.ubuntu.com/ubuntu",
"^warty-security$",
@@ -366,6 +374,10 @@ class SourceEntryMatcher:
"^warty-updates$",
_("Ubuntu 4.10 Updates"),
ubuntu_comps, ubuntu_comps_descr))
+ self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
+ "^warty-backports$",
+ _("Ubuntu 4.10 Backports"),
+ ubuntu_comps, ubuntu_comps_descr))
# Hoary
self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
"^hoary-security$",
@@ -377,12 +389,16 @@ class SourceEntryMatcher:
ubuntu_comps, ubuntu_comps_descr))
self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
"^hoary$",
- "Ubuntu 5.04 \"Hoary Hedgehog\"",
+ "Ubuntu 5.04 'Hoary Hedgehog'",
ubuntu_comps, ubuntu_comps_descr))
self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
"^hoary-updates$",
_("Ubuntu 5.04 Updates"),
ubuntu_comps, ubuntu_comps_descr))
+ self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
+ "^hoary-backports$",
+ _("Ubuntu 5.04 Backports"),
+ ubuntu_comps, ubuntu_comps_descr))
# Breezy
self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
"^breezy-security$",
@@ -394,7 +410,11 @@ class SourceEntryMatcher:
ubuntu_comps, ubuntu_comps_descr))
self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
"^breezy$",
- "Ubuntu 5.10 \"Breezy Badger\"",
+ "Ubuntu 5.10 'Breezy Badger'",
+ ubuntu_comps, ubuntu_comps_descr))
+ self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
+ "^breezy-backports$",
+ _("Ubuntu 5.10 Backports"),
ubuntu_comps, ubuntu_comps_descr))
self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
"^breezy-updates$",
@@ -403,19 +423,23 @@ class SourceEntryMatcher:
# dapper
self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
"^dapper-security$",
- _("Ubuntu 6.04 Security Updates"),
+ _("Ubuntu 6.06 Security Updates"),
ubuntu_comps, ubuntu_comps_descr))
self.dist_list.append(self.MatchDist(".*security.ubuntu.com/ubuntu",
"^dapper-security$",
- _("Ubuntu 6.04 Security Updates"),
+ _("Ubuntu 6.06 Security Updates"),
ubuntu_comps, ubuntu_comps_descr))
self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
"^dapper$",
- "Ubuntu 6.04 \"Dapper Drake\"",
+ "Ubuntu 6.06 'Dapper Drake'",
+ ubuntu_comps, ubuntu_comps_descr))
+ self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
+ "^dapper-backports$",
+ _("Ubuntu 6.06 Backports"),
ubuntu_comps, ubuntu_comps_descr))
self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu",
"^dapper-updates$",
- _("Ubuntu 6.04 Updates"),
+ _("Ubuntu 6.06 Updates"),
ubuntu_comps, ubuntu_comps_descr))
diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index 1c996a66..1cbf03d6 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -428,17 +428,16 @@ class UpdateManager(SimpleGladeApp):
self.treeview_update.set_sensitive(False)
self.label_downsize.set_text=""
self.button_close.grab_default()
+ return (text_header, text_download, None)
else:
text_header = "<big><b>"+gettext.ngettext("You can install one update", "You can install %s updates" % len(self.store), len(self.store))+"</b></big>"
text_download = _("Download size: %s" % apt_pkg.SizeToStr(self.dl_size))
- self.treeview_update.set_cursor(0)
self.expander_details.set_sensitive(True)
self.treeview_update.set_sensitive(True)
self.button_install.grab_default()
+ return (text_header, text_download, 0)
- self.label_header.set_markup(text_header)
- self.label_downsize.set_markup(text_download)
def activate_details(self, expander, data):
expanded = self.expander_details.get_expanded()
@@ -498,6 +497,7 @@ class UpdateManager(SimpleGladeApp):
# set window to insensitive
self.window_main.set_sensitive(False)
+ self.window_main.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH))
lock = thread.allocate_lock()
lock.acquire()
t = thread.start_new_thread(self.run_synaptic,
@@ -510,6 +510,7 @@ class UpdateManager(SimpleGladeApp):
gtk.main_iteration()
self.fillstore()
self.window_main.set_sensitive(True)
+ self.window_main.window.set_cursor(None)
def toggled(self, renderer, path_string):
""" a toggle button in the listview was toggled """
@@ -589,6 +590,8 @@ class UpdateManager(SimpleGladeApp):
self.window_main.set_sensitive(True)
def fillstore(self):
+ # use the watch cursor
+ self.window_main.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH))
# clean most objects
self.packages = []
@@ -631,7 +634,16 @@ class UpdateManager(SimpleGladeApp):
i = i + 1
- self.update_count()
+ # show the text messages corresponding to the number of available
+ # updates
+ (text_header, text_download, selected) = self.update_count()
+ self.label_header.set_markup(text_header)
+ self.label_downsize.set_markup(text_download)
+ # select the first update
+ if selected != None: self.treeview_update.set_cursor(selected)
+
+ # use the normal cursor
+ self.window_main.window.set_cursor(None)
return False
def dist_no_longer_supported(self, meta_release):
diff --git a/channels/Ubuntu.info.in b/channels/Ubuntu.info.in
index b0358284..fd017105 100644
--- a/channels/Ubuntu.info.in
+++ b/channels/Ubuntu.info.in
@@ -3,7 +3,7 @@ _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/chang
Suite: dapper
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-_Description: Ubuntu 6.04 'Dapper Drake'
+_Description: Ubuntu 6.06 'Dapper Drake'
Component: main
Enabled: 1
_CompDescription: Officially supported
@@ -20,7 +20,7 @@ _CompDescription: Non-free (Multiverse)
Suite: dapper-security
RepositoryType: deb
BaseURI: http://security.ubuntu.com/ubuntu/
-_Description: Ubuntu 6.04 Security Updates
+_Description: Ubuntu 6.06 Security Updates
Component: main
Enabled: 1
_CompDescription: Officially supported
@@ -37,7 +37,7 @@ _CompDescription: Non-free (Multiverse)
Suite: dapper-updates
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-_Description: Ubuntu 6.04 Updates
+_Description: Ubuntu 6.06 Updates
Component: main
Enabled: 1
_CompDescription: Officially supported
@@ -54,7 +54,7 @@ _CompDescription: Non-free (Multiverse)
Suite: dapper-backports
RepositoryType: deb
BaseURI: http://archive.ubuntu.com/ubuntu/
-_Description: Ubuntu 6.04 Backports
+_Description: Ubuntu 6.06 Backports
Component: main
Enabled: 1
_CompDescription: Officially supported
diff --git a/data/SoftwareProperties.glade b/data/SoftwareProperties.glade
index 89a56f11..5d55f68a 100644
--- a/data/SoftwareProperties.glade
+++ b/data/SoftwareProperties.glade
@@ -371,7 +371,7 @@
<widget class="GtkCheckButton" id="checkbutton_auto_download">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Download updates in the backgound, but do not install them</property>
+ <property name="label" translatable="yes">_Download updates in the background, but do not install them</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
diff --git a/data/UpdateManager.glade b/data/UpdateManager.glade
index e6eddaba..f43f4d6f 100644
--- a/data/UpdateManager.glade
+++ b/data/UpdateManager.glade
@@ -328,7 +328,7 @@
<child>
<widget class="GtkLabel" id="label29">
<property name="visible">True</property>
- <property name="label" translatable="yes">C_heck</property>
+ <property name="label" translatable="yes">Chec_k</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
diff --git a/debian/changelog b/debian/changelog
index 7949f088..5da220a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+update-manager (0.42.2ubuntu10) unstable; urgency=low
+
+ * update-manger: fix a missing import (#36138)
+ * typo fix (#36123)
+ * correct dapper version number (#36136)
+ * keybindings fixed (#36116)
+ * calc the update before downloading the changelog (#36140)
+
+ --
+
update-manager (0.42.2ubuntu9) dapper; urgency=low
* Better English (tm) (fixes #35985)
diff --git a/update-manager b/update-manager
index 341aa034..04005c74 100644
--- a/update-manager
+++ b/update-manager
@@ -27,6 +27,7 @@ import os
pygtk.require('2.0')
import gtk
import gtk.glade
+import sys
from UpdateManager.UpdateManager import UpdateManager
import gettext
generated by cgit v1.2.3 (git 2.46.0) at 2026-05-18 13:42:15 +0000