diff -Nru ubuntuone-installer-2.99.5/debian/changelog ubuntuone-installer-2.99.90/debian/changelog --- ubuntuone-installer-2.99.5/debian/changelog 2012-02-24 19:42:47.000000000 +0000 +++ ubuntuone-installer-2.99.90/debian/changelog 2012-03-07 20:32:23.000000000 +0000 @@ -1,3 +1,13 @@ +ubuntuone-installer (2.99.90-0ubuntu1) precise; urgency=low + + * New upstream release. + * debian/patches: + - Remove pachages that are included in new upstream release. + * debian/control: + - Bump standards version to 3.9.3. + + -- Rodney Dawes Wed, 07 Mar 2012 15:22:12 -0500 + ubuntuone-installer (2.99.5-0ubuntu3) precise; urgency=low * 01_bzr-fix-939797.patch: diff -Nru ubuntuone-installer-2.99.5/debian/control ubuntuone-installer-2.99.90/debian/control --- ubuntuone-installer-2.99.5/debian/control 2012-02-24 19:39:50.000000000 +0000 +++ ubuntuone-installer-2.99.90/debian/control 2012-03-07 20:34:30.000000000 +0000 @@ -7,7 +7,7 @@ python-distutils-extra (>= 2.29) Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Ubuntu One Hackers -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 X-Python-Version: >= 2.6 Package: ubuntuone-installer diff -Nru ubuntuone-installer-2.99.5/debian/patches/00_bzr-unicode-gettext.patch ubuntuone-installer-2.99.90/debian/patches/00_bzr-unicode-gettext.patch --- ubuntuone-installer-2.99.5/debian/patches/00_bzr-unicode-gettext.patch 2012-02-24 19:39:50.000000000 +0000 +++ ubuntuone-installer-2.99.90/debian/patches/00_bzr-unicode-gettext.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -=== modified file 'ubuntuone/installer/gui.py' ---- old/ubuntuone/installer/gui.py 2012-02-22 14:50:05 +0000 -+++ new/ubuntuone/installer/gui.py 2012-02-23 15:37:34 +0000 -@@ -35,8 +35,9 @@ except ImportError: - if inline_callbacks is None: - inline_callbacks = old_callbacks - --gettext.textdomain('ubuntuone-installer') --_ = gettext.gettext -+gettext.install(domain='ubuntuone-installer', unicode=True) -+if '_' not in __builtins__: -+ _ = gettext.gettext - - - class UnsupportedDistribution(BaseException): - diff -Nru ubuntuone-installer-2.99.5/debian/patches/01_bzr-fix-939797.patch ubuntuone-installer-2.99.90/debian/patches/01_bzr-fix-939797.patch --- ubuntuone-installer-2.99.5/debian/patches/01_bzr-fix-939797.patch 2012-02-24 19:40:38.000000000 +0000 +++ ubuntuone-installer-2.99.90/debian/patches/01_bzr-fix-939797.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,62 +0,0 @@ -=== modified file 'ubuntuone/installer/__init__.py' ---- old/ubuntuone/installer/__init__.py 2012-02-22 14:50:05 +0000 -+++ new/ubuntuone/installer/__init__.py 2012-02-24 19:40:06 +0000 -@@ -19,6 +19,8 @@ import apt - - from gi.repository import GLib - -+CLIENT_SHELL_PACKAGE = 'ubuntuone-client-gnome' -+ - CONTROL_PANEL_COMMAND = 'ubuntuone-control-panel-qt' - CONTROL_PANEL_PACKAGE = 'ubuntuone-control-panel-qt' - - -=== modified file 'ubuntuone/installer/gui.py' ---- old/ubuntuone/installer/gui.py 2012-02-23 10:38:20 +0000 -+++ new/ubuntuone/installer/gui.py 2012-02-24 19:40:06 +0000 -@@ -21,9 +21,11 @@ import gettext - import os - - from gi.repository import Gtk, GObject, GLib, Gdk, Pango --from ubuntuone.installer import (CONTROL_PANEL_COMMAND, -+from ubuntuone.installer import (CLIENT_SHELL_PACKAGE, -+ CONTROL_PANEL_COMMAND, - CONTROL_PANEL_PACKAGE, -- MUSIC_STORE_PACKAGE) -+ MUSIC_STORE_PACKAGE, -+ is_installed) - - # Some shenanigans to deal with pyflakes complaining - inline_callbacks = None -@@ -196,6 +198,18 @@ class Window(Gtk.Window): - if os.path.exists(path): - return path - -+ def __get_package_list(self): -+ """Build the list of packages, to only include non-installed ones.""" -+ packages = [] -+ if not is_installed(CONTROL_PANEL_PACKAGE, CONTROL_PANEL_COMMAND): -+ packages.append(CONTROL_PANEL_PACKAGE) -+ if not is_installed(MUSIC_STORE_PACKAGE): -+ packages.append(MUSIC_STORE_PACKAGE) -+ if not is_installed(CLIENT_SHELL_PACKAGE): -+ packages.append(CLIENT_SHELL_PACKAGE) -+ -+ return packages -+ - def __got_response(self, dialog, response): - """Handle the dialog response actions.""" - if response in [Gtk.ResponseType.CANCEL, -@@ -362,10 +376,7 @@ class Window(Gtk.Window): - Gtk.main_quit() - - transaction = yield self.client.install_packages( -- package_names=[MUSIC_STORE_PACKAGE, -- 'ubuntuone-client-gnome', -- CONTROL_PANEL_PACKAGE, -- ]) -+ package_names=self.__get_package_list()) - transaction.connect('finished', finished) - self.__apt_progress.set_transaction(transaction) - transaction.run() - diff -Nru ubuntuone-installer-2.99.5/debian/patches/series ubuntuone-installer-2.99.90/debian/patches/series --- ubuntuone-installer-2.99.5/debian/patches/series 2012-02-24 19:41:12.000000000 +0000 +++ ubuntuone-installer-2.99.90/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -00_bzr-unicode-gettext.patch -01_bzr-fix-939797.patch - diff -Nru ubuntuone-installer-2.99.5/MANIFEST ubuntuone-installer-2.99.90/MANIFEST --- ubuntuone-installer-2.99.5/MANIFEST 2012-02-22 19:41:37.000000000 +0000 +++ ubuntuone-installer-2.99.90/MANIFEST 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -# file GENERATED by distutils, do NOT edit -COPYING -MANIFEST -run-tests -setup.py -ubuntuone-installer.desktop.in -ubuntuone.installer.pth -bin/ubuntuone-installer -data/share.png -data/stream.png -data/sync.png -data/u1logo.png -data/icons/16x16/apps/ubuntuone-installer.png -data/icons/24x24/apps/ubuntuone-installer.png -data/icons/32x32/apps/ubuntuone-installer.png -data/icons/48x48/apps/ubuntuone-installer.png -po/LINGUAS -po/POTFILES.in -ubuntuone/__init__.py -ubuntuone/installer/__init__.py -ubuntuone/installer/gui.py -ubuntuone/installer/tests/__init__.py -ubuntuone/installer/tests/test_gui.py -ubuntuone/installer/tests/test_installer.py diff -Nru ubuntuone-installer-2.99.5/PKG-INFO ubuntuone-installer-2.99.90/PKG-INFO --- ubuntuone-installer-2.99.5/PKG-INFO 2012-02-22 19:41:37.000000000 +0000 +++ ubuntuone-installer-2.99.90/PKG-INFO 2012-03-07 14:47:41.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: ubuntuone-installer -Version: 2.99.5 +Version: 2.99.90 Summary: Ubuntu One Installer Home-page: https://launchpad.net/ubuntuone-installer Author: Ubuntu One Hackers diff -Nru ubuntuone-installer-2.99.5/setup.py ubuntuone-installer-2.99.90/setup.py --- ubuntuone-installer-2.99.5/setup.py 2012-02-22 19:41:18.000000000 +0000 +++ ubuntuone-installer-2.99.90/setup.py 2012-03-07 14:47:31.000000000 +0000 @@ -52,7 +52,7 @@ DistUtilsExtra.auto.setup( name='ubuntuone-installer', - version='2.99.5', + version='2.99.90', license='GPL v3', author='Ubuntu One Hackers', author_email='ubuntuone-users@lists.launchpad.net', diff -Nru ubuntuone-installer-2.99.5/ubuntuone/installer/gui.py ubuntuone-installer-2.99.90/ubuntuone/installer/gui.py --- ubuntuone-installer-2.99.5/ubuntuone/installer/gui.py 2012-02-22 19:41:08.000000000 +0000 +++ ubuntuone-installer-2.99.90/ubuntuone/installer/gui.py 2012-03-07 14:46:51.000000000 +0000 @@ -21,9 +21,11 @@ import os from gi.repository import Gtk, GObject, GLib, Gdk, Pango -from ubuntuone.installer import (CONTROL_PANEL_COMMAND, +from ubuntuone.installer import (CLIENT_SHELL_PACKAGE, + CONTROL_PANEL_COMMAND, CONTROL_PANEL_PACKAGE, - MUSIC_STORE_PACKAGE) + MUSIC_STORE_PACKAGE, + is_installed) # Some shenanigans to deal with pyflakes complaining inline_callbacks = None @@ -35,8 +37,9 @@ if inline_callbacks is None: inline_callbacks = old_callbacks -gettext.textdomain('ubuntuone-installer') -_ = gettext.gettext +gettext.install(domain='ubuntuone-installer', unicode=True) +if '_' not in __builtins__: + _ = gettext.gettext class UnsupportedDistribution(BaseException): @@ -195,6 +198,18 @@ if os.path.exists(path): return path + def __get_package_list(self): + """Build the list of packages, to only include non-installed ones.""" + packages = [] + if not is_installed(CONTROL_PANEL_PACKAGE, CONTROL_PANEL_COMMAND): + packages.append(CONTROL_PANEL_PACKAGE) + if not is_installed(MUSIC_STORE_PACKAGE): + packages.append(MUSIC_STORE_PACKAGE) + if not is_installed(CLIENT_SHELL_PACKAGE): + packages.append(CLIENT_SHELL_PACKAGE) + + return packages + def __got_response(self, dialog, response): """Handle the dialog response actions.""" if response in [Gtk.ResponseType.CANCEL, @@ -361,10 +376,7 @@ Gtk.main_quit() transaction = yield self.client.install_packages( - package_names=[MUSIC_STORE_PACKAGE, - 'ubuntuone-client-gnome', - CONTROL_PANEL_PACKAGE, - ]) + package_names=self.__get_package_list()) transaction.connect('finished', finished) self.__apt_progress.set_transaction(transaction) transaction.run() diff -Nru ubuntuone-installer-2.99.5/ubuntuone/installer/__init__.py ubuntuone-installer-2.99.90/ubuntuone/installer/__init__.py --- ubuntuone-installer-2.99.5/ubuntuone/installer/__init__.py 2012-02-22 19:41:08.000000000 +0000 +++ ubuntuone-installer-2.99.90/ubuntuone/installer/__init__.py 2012-03-07 14:46:51.000000000 +0000 @@ -19,6 +19,8 @@ from gi.repository import GLib +CLIENT_SHELL_PACKAGE = 'ubuntuone-client-gnome' + CONTROL_PANEL_COMMAND = 'ubuntuone-control-panel-qt' CONTROL_PANEL_PACKAGE = 'ubuntuone-control-panel-qt'