On 15.12.2011 23:01, Michael Biebl wrote:
> Hi Mario, hi Samuel,
>
> to unblock the situation regarding GNOME 3.2, I wanted to let you know
> that I'm planning to NMU pyatspi tomorrow and upload the current version
> 2.0.2 to unstable via DELAYED/5.
I've done the NMU a few moments ago. Attached is the debdiff.
As using static and dynamic pygobject at the same time does not really
work that well, I've pulled a fix from upstream Git for that.
I've changed the dependency on python-gobject to python-gi accordingly.
The complete changelog reads:
pyatspi (2.0.2+dfsg-1.1) unstable; urgency=low
.
* Non-maintainer upload.
* Upload to unstable.
* Use introspection for the GLib main loop.
Patch cherry-picked from upstream Git.
* Depend on python-gi instead of python-gobject.
* Use dh_python2 so ${python:Depends} is correctly set.
--
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?
diff -Nru pyatspi-2.0.2+dfsg/debian/changelog pyatspi-2.0.2+dfsg/debian/changelog
--- pyatspi-2.0.2+dfsg/debian/changelog 2011-07-28 14:34:35.000000000 +0200
+++ pyatspi-2.0.2+dfsg/debian/changelog 2011-12-16 15:51:54.000000000 +0100
@@ -1,3 +1,14 @@
+pyatspi (2.0.2+dfsg-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Upload to unstable.
+ * Use introspection for the GLib main loop.
+ Patch cherry-picked from upstream Git.
+ * Depend on python-gi instead of python-gobject.
+ * Use dh_python2 so ${python:Depends} is correctly set.
+
+ -- Michael Biebl <biebl@debian.org> Fri, 16 Dec 2011 15:40:13 +0100
+
pyatspi (2.0.2+dfsg-1) experimental; urgency=low
* Remove tests/* until upstream clarifies licensing.
diff -Nru pyatspi-2.0.2+dfsg/debian/control pyatspi-2.0.2+dfsg/debian/control
--- pyatspi-2.0.2+dfsg/debian/control 2011-07-28 14:34:35.000000000 +0200
+++ pyatspi-2.0.2+dfsg/debian/control 2011-12-16 15:50:43.000000000 +0100
@@ -7,9 +7,11 @@
Vcs-Git: git://git.debian.org/git/pkg-a11y/pyatspi.git
Homepage: http://live.gnome.org/Accessibility/GNOME3
Build-Depends: debhelper (>= 7),
+ python (>= 2.6.6-3~),
python-dbus,
pkg-config,
python-gobject-dev (>= 2.26.0)
+X-Python-Version: >= 2.5
Standards-Version: 3.9.2
Package: python-pyatspi2
@@ -18,7 +20,7 @@
Replaces: python-pyatspi
Depends: ${misc:Depends},
${python:Depends},
- python-gobject (>= 2.26.0),
+ python-gi (>= 3.0),
gir1.2-atspi-2.0
Description: Assistive Technology Service Provider Interface - Python bindings
at-spi is the "Assistive Technology Service Provider Interface".
diff -Nru pyatspi-2.0.2+dfsg/debian/patches/0001-Use-introspection-for-the-GLib-main-loop.patch pyatspi-2.0.2+dfsg/debian/patches/0001-Use-introspection-for-the-GLib-main-loop.patch
--- pyatspi-2.0.2+dfsg/debian/patches/0001-Use-introspection-for-the-GLib-main-loop.patch 1970-01-01 01:00:00.000000000 +0100
+++ pyatspi-2.0.2+dfsg/debian/patches/0001-Use-introspection-for-the-GLib-main-loop.patch 2011-12-16 15:38:12.000000000 +0100
@@ -0,0 +1,33 @@
+From a48759f60b1a863f14238a5cc089eaac79d3bf2c Mon Sep 17 00:00:00 2001
+From: Mike Gorse <mgorse@novell.com>
+Date: Thu, 25 Aug 2011 13:18:00 -0500
+Subject: [PATCH] Use introspection for the GLib main loop
+
+---
+ pyatspi/registry.py | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/pyatspi/registry.py b/pyatspi/registry.py
+index 89a36bd..0b0130c 100644
+--- a/pyatspi/registry.py
++++ b/pyatspi/registry.py
+@@ -28,7 +28,6 @@ __all__ = ["Registry",
+ "set_default_registry"]
+
+ import os as _os
+-import gobject
+ from gi.repository import Atspi
+ from gi.repository import GObject
+ import time
+@@ -80,7 +79,7 @@ class Registry(object):
+ self.app_event_register = None
+ self.desktop = None
+
+- self.main_loop = gobject.MainLoop()
++ self.main_loop = GObject.MainLoop()
+
+ def __call__(self):
+ """
+--
+1.7.7.3
+
diff -Nru pyatspi-2.0.2+dfsg/debian/patches/series pyatspi-2.0.2+dfsg/debian/patches/series
--- pyatspi-2.0.2+dfsg/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ pyatspi-2.0.2+dfsg/debian/patches/series 2011-12-16 15:38:17.000000000 +0100
@@ -0,0 +1 @@
+0001-Use-introspection-for-the-GLib-main-loop.patch
diff -Nru pyatspi-2.0.2+dfsg/debian/rules pyatspi-2.0.2+dfsg/debian/rules
--- pyatspi-2.0.2+dfsg/debian/rules 2011-07-28 14:34:35.000000000 +0200
+++ pyatspi-2.0.2+dfsg/debian/rules 2011-12-16 15:51:02.000000000 +0100
@@ -1,3 +1,3 @@
#!/usr/bin/make -f
%:
- dh $@
+ dh $@ --with python2
Attachment:
signature.asc
Description: OpenPGP digital signature