Ubuntu
ubuntuone-installer package

Merge lp:~dobey/ubuntu/oneiric/ubuntuone-installer/release-174 into lp:ubuntu/oneiric/ubuntuone-installer

  1. Oneiric (11.10)
  2. release-174
  3. Merge into oneiric
Proposed by dobey
Status: Merged
Merged at revision: 6
Proposed branch: lp:~dobey/ubuntu/oneiric/ubuntuone-installer/release-174
Merge into: lp:ubuntu/oneiric/ubuntuone-installer
Diff against target: 188 lines (+35/-14)
6 files modified
PKG-INFO (+1/-1)
bin/ubuntuone-installer (+6/-2)
debian/changelog (+9/-0)
po/POTFILES.in (+1/-0)
setup.py (+1/-1)
ubuntuone/installer/gui.py (+17/-10)
To merge this branch: bzr merge lp:~dobey/ubuntu/oneiric/ubuntuone-installer/release-174
Reviewer Review Type Date Requested Status
Jamie Strandboge Approve
Review via email: mp+75437@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jamie Strandboge (jdstrand) wrote :

Looks good. Bug-fix only. Cause it is a new source I need the full source package before uploading (see #ubuntu-devel for discussion).

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'PKG-INFO'
--- PKG-INFO 2011-08-24 20:30:01 +0000
+++ PKG-INFO 2011-09-14 21:54:36 +0000
@@ -1,6 +1,6 @@
1Metadata-Version: 1.11Metadata-Version: 1.1
2Name: ubuntuone-installer2Name: ubuntuone-installer
3Version: 1.7.33Version: 1.7.4
4Summary: Ubuntu One Installer4Summary: Ubuntu One Installer
5Home-page: https://launchpad.net/ubuntuone-installer5Home-page: https://launchpad.net/ubuntuone-installer
6Author: Ubuntu One Hackers6Author: Ubuntu One Hackers
77
=== modified file 'bin/ubuntuone-installer'
--- bin/ubuntuone-installer 2011-08-17 12:00:40 +0000
+++ bin/ubuntuone-installer 2011-09-14 21:54:36 +0000
@@ -17,14 +17,18 @@
17"""The main script for the Ubuntu One Installer."""17"""The main script for the Ubuntu One Installer."""
1818
19import apt19import apt
20import os
2021
21from gi.repository import Gtk, GLib22from gi.repository import Gtk, GLib
2223
2324
24def is_installed(package):25def is_installed(package):
25 """Check if things are installed already."""26 """Check if things are installed already."""
26 cache = apt.Cache()27 try:
27 return package in cache and cache[package].is_installed28 cache = apt.Cache()
29 return package in cache and cache[package].is_installed
30 except SystemError:
31 return os.path.exists('/usr/bin/ubuntuone-control-panel-gtk')
2832
29 33
30if __name__ == "__main__":34if __name__ == "__main__":
3135
=== modified file 'debian/changelog'
--- debian/changelog 2011-08-24 20:34:34 +0000
+++ debian/changelog 2011-09-14 21:54:36 +0000
@@ -1,3 +1,12 @@
1ubuntuone-installer (1.7.4-0ubuntu1) oneiric; urgency=low
2
3 * New upstream release.
4 - Work around apt.Cache crash with unreadable sources (LP: #843002)
5 - Mark strings for translation in the UI (LP: #849408)
6 - Install more of the Ubuntu One packages (LP: #840072)
7
8 -- Rodney Dawes <rodney.dawes@ubuntu.com> Wed, 14 Sep 2011 17:32:14 -0400
9
1ubuntuone-installer (1.7.3-0ubuntu1) oneiric; urgency=low10ubuntuone-installer (1.7.3-0ubuntu1) oneiric; urgency=low
211
3 * New upstream release.12 * New upstream release.
413
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in 2011-08-17 12:00:40 +0000
+++ po/POTFILES.in 2011-09-14 21:54:36 +0000
@@ -1,2 +1,3 @@
1ubuntuone-installer.desktop.in1ubuntuone-installer.desktop.in
2ubuntuone/installer/gui.py
23
34
=== modified file 'setup.py'
--- setup.py 2011-08-24 20:30:01 +0000
+++ setup.py 2011-09-14 21:54:36 +0000
@@ -52,7 +52,7 @@
5252
53DistUtilsExtra.auto.setup(53DistUtilsExtra.auto.setup(
54 name='ubuntuone-installer',54 name='ubuntuone-installer',
55 version='1.7.3',55 version='1.7.4',
56 license='GPL v3',56 license='GPL v3',
57 author='Ubuntu One Hackers',57 author='Ubuntu One Hackers',
58 author_email='ubuntuone-users@lists.launchpad.net',58 author_email='ubuntuone-users@lists.launchpad.net',
5959
=== modified file 'ubuntuone/installer/gui.py'
--- ubuntuone/installer/gui.py 2011-08-24 20:30:01 +0000
+++ ubuntuone/installer/gui.py 2011-09-14 21:54:36 +0000
@@ -17,6 +17,7 @@
1717
18import aptdaemon.gtk3widgets as aptgtk18import aptdaemon.gtk3widgets as aptgtk
19import aptdaemon.client as aptclient19import aptdaemon.client as aptclient
20import gettext
20import os21import os
2122
22from gi.repository import Gtk, GObject, GLib, Gdk, Pango23from gi.repository import Gtk, GObject, GLib, Gdk, Pango
@@ -31,6 +32,9 @@
31if inline_callbacks is None:32if inline_callbacks is None:
32 inline_callbacks = old_callbacks33 inline_callbacks = old_callbacks
3334
35gettext.textdomain('ubuntuone-installer')
36_ = gettext.gettext
37
3438
35class UnsupportedDistribution(BaseException):39class UnsupportedDistribution(BaseException):
36 """Exception for when on an unsupported distribution."""40 """Exception for when on an unsupported distribution."""
@@ -91,14 +95,14 @@
91 self.__hlabelbox.show()95 self.__hlabelbox.show()
9296
93 self.__hlabel = Gtk.Label((u'<span size="xx-large">{}</span>').format(97 self.__hlabel = Gtk.Label((u'<span size="xx-large">{}</span>').format(
94 u'Install Ubuntu One'))98 _(u'Install Ubuntu One')))
95 self.__hlabel.set_use_markup(True)99 self.__hlabel.set_use_markup(True)
96 self.__hlabel.set_alignment(0.0, 0.0)100 self.__hlabel.set_alignment(0.0, 0.0)
97 self.__hlabelbox.pack_start(self.__hlabel, False, False, 0)101 self.__hlabelbox.pack_start(self.__hlabel, False, False, 0)
98 self.__hlabel.show()102 self.__hlabel.show()
99103
100 self.__hlabel2 = Gtk.Label((u'<span size="large">{}</span>').format(104 self.__hlabel2 = Gtk.Label((u'<span size="large">{}</span>').format(
101 u'Discover the freedom of your personal cloud'))105 _(u'Discover the freedom of your personal cloud')))
102 self.__hlabel2.set_use_markup(True)106 self.__hlabel2.set_use_markup(True)
103 self.__hlabel2.set_alignment(0.0, 0.0)107 self.__hlabel2.set_alignment(0.0, 0.0)
104 self.__hlabelbox.pack_start(self.__hlabel2, False, False, 0)108 self.__hlabelbox.pack_start(self.__hlabel2, False, False, 0)
@@ -217,7 +221,7 @@
217 page.pack_start(table, True, True, 24)221 page.pack_start(table, True, True, 24)
218 table.show()222 table.show()
219223
220 label = Gtk.Label(u'<big>{}</big>'.format(u'Sync'))224 label = Gtk.Label(u'<big>{}</big>'.format(_(u'Sync')))
221 label.set_use_markup(True)225 label.set_use_markup(True)
222 table.attach_defaults(label, 0, 1, 0, 1)226 table.attach_defaults(label, 0, 1, 0, 1)
223 label.show()227 label.show()
@@ -233,7 +237,7 @@
233 width_chars = (image.get_pixbuf().get_width() / width) * 2.5237 width_chars = (image.get_pixbuf().get_width() / width) * 2.5
234238
235 label = Gtk.Label(u'<small>{}</small>'.format(239 label = Gtk.Label(u'<small>{}</small>'.format(
236 (u'Sync files across your devices.')))240 _(u'Sync files across your devices.')))
237 label.set_max_width_chars(width_chars)241 label.set_max_width_chars(width_chars)
238 label.set_width_chars(width_chars)242 label.set_width_chars(width_chars)
239 label.set_use_markup(True)243 label.set_use_markup(True)
@@ -247,7 +251,7 @@
247 table.attach_defaults(separator, 1, 2, 0, 3)251 table.attach_defaults(separator, 1, 2, 0, 3)
248 separator.show()252 separator.show()
249253
250 label = Gtk.Label(u'<big>{}</big>'.format(u'Stream'))254 label = Gtk.Label(u'<big>{}</big>'.format(_(u'Stream')))
251 label.set_use_markup(True)255 label.set_use_markup(True)
252 table.attach_defaults(label, 2, 3, 0, 1)256 table.attach_defaults(label, 2, 3, 0, 1)
253 label.show()257 label.show()
@@ -260,7 +264,7 @@
260 image.set_from_file(path)264 image.set_from_file(path)
261265
262 label = Gtk.Label(u'<small>{}</small>'.format(266 label = Gtk.Label(u'<small>{}</small>'.format(
263 (u'Stream your music on the move and offline.')))267 _(u'Stream your music on the move and offline.')))
264 label.set_max_width_chars(width_chars)268 label.set_max_width_chars(width_chars)
265 label.set_width_chars(width_chars)269 label.set_width_chars(width_chars)
266 label.set_use_markup(True)270 label.set_use_markup(True)
@@ -274,7 +278,7 @@
274 table.attach_defaults(separator, 3, 4, 0, 3)278 table.attach_defaults(separator, 3, 4, 0, 3)
275 separator.show()279 separator.show()
276280
277 label = Gtk.Label(u'<big>{}</big>'.format(u'Share'))281 label = Gtk.Label(u'<big>{}</big>'.format(_(u'Share')))
278 label.set_use_markup(True)282 label.set_use_markup(True)
279 table.attach_defaults(label, 4, 5, 0, 1)283 table.attach_defaults(label, 4, 5, 0, 1)
280 label.show()284 label.show()
@@ -287,7 +291,7 @@
287 image.set_from_file(path)291 image.set_from_file(path)
288292
289 label = Gtk.Label(u'<small>{}</small>'.format(293 label = Gtk.Label(u'<small>{}</small>'.format(
290 (u'Share with colleagues, friends, and family.')))294 _(u'Share with colleagues, friends, and family.')))
291 label.set_max_width_chars(width_chars)295 label.set_max_width_chars(width_chars)
292 label.set_width_chars(width_chars)296 label.set_width_chars(width_chars)
293 label.set_use_markup(True)297 label.set_use_markup(True)
@@ -306,7 +310,7 @@
306 page.set_spacing(6)310 page.set_spacing(6)
307 page.show()311 page.show()
308312
309 label = Gtk.Label(u'Ubuntu One is installing…')313 label = Gtk.Label(_(u'Ubuntu One is installing…'))
310 label.set_alignment(0.0, 0.0)314 label.set_alignment(0.0, 0.0)
311 page.pack_start(label, False, True, 0)315 page.pack_start(label, False, True, 0)
312 label.show()316 label.show()
@@ -354,7 +358,10 @@
354 Gtk.main_quit()358 Gtk.main_quit()
355359
356 transaction = yield self.client.install_packages(360 transaction = yield self.client.install_packages(
357 package_names=['ubuntuone-control-panel-gtk',361 package_names=['banshee-extension-ubuntuonemusicstore',
362 'ubuntuone-client-gnome',
363 'ubuntuone-control-panel-gtk',
364 'ubuntuone-couch',
358 ])365 ])
359 transaction.connect('finished', finished)366 transaction.connect('finished', finished)
360 self.__apt_progress.set_transaction(transaction)367 self.__apt_progress.set_transaction(transaction)

Subscribers

People subscribed via source and target branches

to all changes: