diff -Nru kupfer-0+v206+dfsg/debian/changelog kupfer-0+v206+dfsg/debian/changelog --- kupfer-0+v206+dfsg/debian/changelog 2012-01-10 21:31:42.000000000 +0000 +++ kupfer-0+v206+dfsg/debian/changelog 2012-03-27 08:54:01.000000000 +0000 @@ -1,3 +1,11 @@ +kupfer (0+v206+dfsg-1ubuntu1) precise; urgency=low + + * kupfer/dbuscompat.py + - copied gobject_service.py verbatim from dbus-python version 0.84.0 to + kupfer/dbuscompat.py (LP: #921829) + + -- Vibhav Pant Sat, 24 Mar 2012 21:11:51 +0530 + kupfer (0+v206+dfsg-1) unstable; urgency=low * Upstream tarball repacked to provide unpacked waf (Closes: #654480). diff -Nru kupfer-0+v206+dfsg/debian/control kupfer-0+v206+dfsg/debian/control --- kupfer-0+v206+dfsg/debian/control 2012-01-10 20:47:40.000000000 +0000 +++ kupfer-0+v206+dfsg/debian/control 2012-03-27 08:46:12.000000000 +0000 @@ -1,7 +1,8 @@ Source: kupfer Section: utils Priority: optional -Maintainer: Luca Falavigna +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Luca Falavigna Uploaders: Python Applications Packaging Team Build-Depends: debhelper (>= 7.0.50~) Build-Depends-Indep: python (>= 2.6.6-3~), gettext, intltool, gnome-doc-utils, python-docutils diff -Nru kupfer-0+v206+dfsg/debian/patches/dbuscompat.patch kupfer-0+v206+dfsg/debian/patches/dbuscompat.patch --- kupfer-0+v206+dfsg/debian/patches/dbuscompat.patch 1970-01-01 00:00:00.000000000 +0000 +++ kupfer-0+v206+dfsg/debian/patches/dbuscompat.patch 2012-03-27 08:55:13.000000000 +0000 @@ -0,0 +1,115 @@ +Description: dbus-python has switched over to `gi` bindings and that makes it + incompatible with Kupfer that is still using static gtk2 and glib bindings. + We workaround this by copying gobject_service.py verbatim from dbus-python + version 0.84.0. kupfer/dbuscompat.py is copyright collabora 2007 and + x11-licensed (GPL compatible). + . + kupfer (0+v206+dfsg-1ubuntu1) precise; urgency=low + . + * kupfer/dbuscompat.py + - copied gobject_service.py verbatim from dbus-python version 0.84.0 + to kupfer/dbuscompat.py (LP: #921829) +Author: Vibhav Pant +Bug-Ubuntu: https://bugs.launchpad.net/bugs/921829 + +--- +Origin: http://git.gnome.org/browse/kupfer/commit/?id=a259639a80f9381d7bf7182863f9832b6676b20f +Bug: https://bugs.launchpad.net/ubuntu/+source/kupfer/+bug/921829 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/921829 +Forwarded: no +Reviewed-By: Ulrik Sverdrup +Last-Update: 2012-02-13## Description: add some description +Index: kupfer-0+v206+dfsg/kupfer/dbuscompat.py +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ kupfer-0+v206+dfsg/kupfer/dbuscompat.py 2012-03-27 10:53:43.126137139 +0200 +@@ -0,0 +1,71 @@ ++"""Support code for implementing D-Bus services via GObjects.""" ++ ++# Copyright (C) 2007 Collabora Ltd. ++# ++# Permission is hereby granted, free of charge, to any person ++# obtaining a copy of this software and associated documentation ++# files (the "Software"), to deal in the Software without ++# restriction, including without limitation the rights to use, copy, ++# modify, merge, publish, distribute, sublicense, and/or sell copies ++# of the Software, and to permit persons to whom the Software is ++# furnished to do so, subject to the following conditions: ++# ++# The above copyright notice and this permission notice shall be ++# included in all copies or substantial portions of the Software. ++# ++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT ++# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, ++# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ++# DEALINGS IN THE SOFTWARE. ++ ++import gobject ++import dbus.service ++ ++class ExportedGObjectType(gobject.GObjectMeta, dbus.service.InterfaceType): ++ """A metaclass which inherits from both GObjectMeta and ++ `dbus.service.InterfaceType`. Used as the metaclass for `ExportedGObject`. ++ """ ++ def __init__(cls, name, bases, dct): ++ gobject.GObjectMeta.__init__(cls, name, bases, dct) ++ dbus.service.InterfaceType.__init__(cls, name, bases, dct) ++ ++class ExportedGObject(gobject.GObject, dbus.service.Object): ++ """A GObject which is exported on the D-Bus. ++ ++ Because GObject and `dbus.service.Object` both have custom metaclasses, ++ the naive approach using simple multiple inheritance won't work. This ++ class has `ExportedGObjectType` as its metaclass, which is sufficient ++ to make it work correctly. ++ """ ++ __metaclass__ = ExportedGObjectType ++ ++ def __init__(self, conn=None, object_path=None, **kwargs): ++ """Initialize an exported GObject. ++ ++ :Parameters: ++ `conn` : dbus.connection.Connection ++ The D-Bus connection or bus ++ `object_path` : str ++ The object path at which to register this object. ++ :Keywords: ++ `bus_name` : dbus.service.BusName ++ A bus name to be held on behalf of this object, or None. ++ `gobject_properties` : dict ++ GObject properties to be set on the constructed object. ++ ++ Any unrecognised keyword arguments will also be interpreted ++ as GObject properties. ++ """ ++ bus_name = kwargs.pop('bus_name', None) ++ gobject_properties = kwargs.pop('gobject_properties', None) ++ ++ if gobject_properties is not None: ++ kwargs.update(gobject_properties) ++ gobject.GObject.__init__(self, **kwargs) ++ dbus.service.Object.__init__(self, conn=conn, ++ object_path=object_path, ++ bus_name=bus_name) +Index: kupfer-0+v206+dfsg/kupfer/ui/listen.py +=================================================================== +--- kupfer-0+v206+dfsg.orig/kupfer/ui/listen.py 2012-03-27 10:52:38.718136171 +0200 ++++ kupfer-0+v206+dfsg/kupfer/ui/listen.py 2012-03-27 10:53:43.126137139 +0200 +@@ -4,10 +4,12 @@ + """ + + import gobject ++ + try: + import dbus + import dbus.glib +- from dbus.gobject_service import ExportedGObject ++ import dbus.service ++ from kupfer.dbuscompat import ExportedGObject + + # if dbus unavailable print the exception here + # but further actions (register) will fail without warning diff -Nru kupfer-0+v206+dfsg/debian/patches/series kupfer-0+v206+dfsg/debian/patches/series --- kupfer-0+v206+dfsg/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ kupfer-0+v206+dfsg/debian/patches/series 2012-03-27 08:53:20.000000000 +0000 @@ -0,0 +1 @@ +dbuscompat.patch