diff -Nru zeroinstall-injector-1.6/debian/changelog zeroinstall-injector-1.6/debian/changelog --- zeroinstall-injector-1.6/debian/changelog 2012-02-12 15:39:31.000000000 +0000 +++ zeroinstall-injector-1.6/debian/changelog 2012-03-28 00:05:11.000000000 +0000 @@ -1,3 +1,9 @@ +zeroinstall-injector (1.6-1ubuntu1) precise; urgency=low + + * Fixed API incompatibility with PackageKit's InstallPackages (LP: #953756). + + -- Thomas Leonard Fri, 16 Mar 2012 07:15:46 +0000 + zeroinstall-injector (1.6-1) unstable; urgency=low * New upstream release. diff -Nru zeroinstall-injector-1.6/debian/control zeroinstall-injector-1.6/debian/control --- zeroinstall-injector-1.6/debian/control 2012-02-12 15:39:31.000000000 +0000 +++ zeroinstall-injector-1.6/debian/control 2012-03-28 00:12:54.000000000 +0000 @@ -1,7 +1,8 @@ Source: zeroinstall-injector Section: admin Priority: extra -Maintainer: Thomas Leonard +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Thomas Leonard Build-Depends: debhelper (>= 5.0.37.2), python (>= 2.6), python-gobject (>= 2.12) Standards-Version: 3.9.2.0 Homepage: http://0install.net/ diff -Nru zeroinstall-injector-1.6/debian/patches/packagekit-api.patch zeroinstall-injector-1.6/debian/patches/packagekit-api.patch --- zeroinstall-injector-1.6/debian/patches/packagekit-api.patch 1970-01-01 00:00:00.000000000 +0000 +++ zeroinstall-injector-1.6/debian/patches/packagekit-api.patch 2012-03-28 00:05:11.000000000 +0000 @@ -0,0 +1,62 @@ +Description: Fixed API incompatibility with PackageKit's InstallPackages. + Ubuntu uses its own implementation of PackageKit, which behaves slightly + differently. +Author: Thomas Leonard +Origin: upstream, http://repo.or.cz/w/zeroinstall.git/commit/9b466b9b5fab731a9eaa565627cf3b2bea713153 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/zeroinstall-injector/+bug/953756 +Last-Update: 2012-03-26 + +Index: zeroinstall-injector.dev/zeroinstall/injector/packagekit.py +=================================================================== +--- zeroinstall-injector.dev.orig/zeroinstall/injector/packagekit.py 2012-03-26 17:05:10.902188000 +0100 ++++ zeroinstall-injector.dev/zeroinstall/injector/packagekit.py 2012-03-26 17:05:39.420375222 +0100 +@@ -204,8 +204,8 @@ + package_name = self.packagekit_id + self._transaction = _PackageKitTransaction(self.pk, installed_cb, error_cb) + self._transaction.compat_call([ +- ('InstallPackages', [package_name]), + ('InstallPackages', False, [package_name]), ++ ('InstallPackages', [package_name]), + ]) + + _auth_wrapper(install_packages) +@@ -289,8 +289,8 @@ + defaultlocale = locale.getdefaultlocale()[0] + if defaultlocale is not None: + self.compat_call([ +- ('SetLocale', defaultlocale), + ('SetHints', ['locale=%s' % defaultlocale]), ++ ('SetLocale', defaultlocale), + ]) + + def getPercentage(self): +@@ -305,6 +305,8 @@ + except: + return default + ++ # note: Ubuntu's aptdaemon implementation of PackageKit crashes if passed the wrong ++ # arguments (rather than returning InvalidArgs), so always try its API first. + def compat_call(self, calls): + for call in calls: + method = call[0] +@@ -313,8 +315,9 @@ + dbus_method = self.proxy.get_dbus_method(method) + return dbus_method(*args) + except dbus.exceptions.DBusException as e: +- if e.get_dbus_name() != \ +- 'org.freedesktop.DBus.Error.UnknownMethod': ++ if e.get_dbus_name() not in ( ++ 'org.freedesktop.DBus.Error.UnknownMethod', ++ 'org.freedesktop.DBus.Error.InvalidArgs'): + raise + raise Exception('Cannot call %r DBus method' % calls) + +@@ -340,7 +343,7 @@ + package_name, version, arch, repo_ = id.split(';') + clean_version = distro.try_cleanup_distro_version(version) + if not clean_version: +- _logger_pk.warn(_("Can't parse distribution version '%(version)s' for package '%(package)s'"), {'version': version, 'package': package_name}) ++ _logger_pk.info(_("Can't parse distribution version '%(version)s' for package '%(package)s'"), {'version': version, 'package': package_name}) + clean_arch = distro.canonical_machine(arch) + package = {'version': clean_version, + 'name': package_name, diff -Nru zeroinstall-injector-1.6/debian/patches/series zeroinstall-injector-1.6/debian/patches/series --- zeroinstall-injector-1.6/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ zeroinstall-injector-1.6/debian/patches/series 2012-03-28 00:05:11.000000000 +0000 @@ -0,0 +1 @@ +packagekit-api.patch