--- pyspi-0.6.1.orig/cspi.pxd +++ pyspi-0.6.1/cspi.pxd @@ -14,9 +14,7 @@ ctypedef struct AccessibleTextRange ctypedef struct AccessibleKeySet - ctypedef enum SPIBoolean: - FALSE = 0, - TRUE + ctypedef unsigned int SPIBoolean ctypedef struct AccessibleEvent: char *type --- pyspi-0.6.1.orig/pyspi.pyx +++ pyspi-0.6.1/pyspi.pyx @@ -25,9 +25,15 @@ cdef class Event (EventBase) cdef class DeviceEvent -ctypedef enum bool: +ctypedef unsigned int bool + +import __builtin__ +try: + False = __builtin__.False + True = __builtin__.True +except AttributeError: False = 0 - True + True = 1 # SPIExceptionCode values: (SPI_EXCEPTION_UNSPECIFIED, SPI_EXCEPTION_DISCONNECT, SPI_EXCEPTION_NO_IMPL, SPI_EXCEPTION_IO, SPI_EXCEPTION_BAD_DATA)=range(5) @@ -991,11 +997,11 @@ Wraps cspi.AccessibleHyperlink_getObject """ self.__checkSelf () - cdef Accessible object - object = Accessible () - object.__setItem (cspi.AccessibleHyperlink_getObject (self.__item, i)) - object.__checkSelf () - return object + cdef Accessible obj + obj = Accessible () + obj.__setItem (cspi.AccessibleHyperlink_getObject (self.__item, i)) + obj.__checkSelf () + return obj def getURI (self, i): """ @@ -1551,7 +1557,7 @@ cdef cspi.AccessibleDeviceListener *__item cdef public object modMasks - def __init__ (self, callback, eventMask = cspi.SPI_KEY_PRESSED | cspi.SPI_KEY_RELEASED): + def __init__ (self, callback, eventMask = cspi.SPI_KEY_PRESSED | cspi.SPI_KEY_RELEASED): """ Registers a python callback function to be called. --- pyspi-0.6.1.orig/debian/python-at-spi.install +++ pyspi-0.6.1/debian/python-at-spi.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/python* --- pyspi-0.6.1.orig/debian/control +++ pyspi-0.6.1/debian/control @@ -0,0 +1,38 @@ +Source: pyspi +Section: python +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Jose Carlos Garcia Sogo +Build-Depends: debhelper (>= 5), cdbs, libatspi-dev, python-pyrex, python-support (>= 0.4), python-all-dev, python-all-dbg, libx11-dev +Standards-Version: 3.7.3 +Vcs-Svn: svn://svn.tribulaciones.org/srv/svn/pyspi/trunk +Homepage: http://people.redhat.com/zcerza/dogtail + +Package: python-at-spi +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, at-spi +Provides: ${python:Provides} +Suggests: python-at-spi-dbg +Description: Assistive Technology Service Provider Interface - Python bindings + at-spi is the "Assistive Technology Service Provider Interface". + . + Accessibility is enabling people with disabilities to participate in + substantial life activities that include work and the use of + services, products and information. + . + This package contains Python bindings for the core components of + GNOME Accessibility. + +Package: python-at-spi-dbg +Priority: extra +Architecture: any +Depends: python-at-spi (= ${Source-Version}), python-dbg, ${shlibs:Depends} +Description: Assistive Technology Service Provider Interface - Python bindings (debug extension) + at-spi is the "Assistive Technology Service Provider Interface". + . + Accessibility is enabling people with disabilities to participate in + substantial life activities that include work and the use of + services, products and information. + . + This package contains Python bindings for the core components of + GNOME Accessibility (debug extension). --- pyspi-0.6.1.orig/debian/copyright +++ pyspi-0.6.1/debian/copyright @@ -0,0 +1,27 @@ +This package was debianized by Zack Cerza on +Sun, 10 Jul 2006 22:40:36 -0400 + +It was downloaded from http://people.redhat.com/zcerza/dogtail/downloads.html + +Upstream Authors: Zack Cerza, Chris Lee and Lawrence Lim + +This software is copyright (c) Red Hat, Inc. + +License: + + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. --- pyspi-0.6.1.orig/debian/changelog +++ pyspi-0.6.1/debian/changelog @@ -0,0 +1,142 @@ +pyspi (0.6.1-1.3ubuntu2) natty; urgency=low + + * Rebuild to add support for python 2.7. + + -- Matthias Klose Fri, 03 Dec 2010 00:09:14 +0000 + +pyspi (0.6.1-1.3ubuntu1) maverick; urgency=low + + * Merge from debian (LP: #579750), remaining changes: + Build a python-at-spi-dbg package + + -- Charlie Smotherman Wed, 13 May 2010 09:38:57 -0500 + +pyspi (0.6.1-1.3) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS: Error: pkg-config could not find x11", by adding libx11-dev to + Build-Depends; thanks to Kumar Appaiah for the patch (closes: #556214). + + -- gregor herrmann Sun, 20 Dec 2009 18:20:31 +0100 + +pyspi (0.6.1-1.2ubuntu1) lucid; urgency=low + + * Merge from debian (LP: #502727), remaining changes: + Build a python-at-spi-dbg package. + + -- Charlie Smotherman Sun, 03 Jan 2010 19:50:23 -0500 + +pyspi (0.6.1-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Add a simple-patchsys rule and a patch to fix a FTBFS (Closes: #482260). + + -- Ruben Molina Tue, 28 Apr 2009 21:32:13 -0500 + +pyspi (0.6.1-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Update copyright url, closes: #411300 + * Update Vcs-Svn and add Homepage: fields + * Adapt to new pyrex, closes: #422661 + * Move to python section + + -- Riku Voipio Wed, 09 Jan 2008 17:04:12 +0200 + +pyspi (0.6.1-1ubuntu3) jaunty; urgency=low + + * Rebuild for Python 2.6 transition. + * pyspi.pyx: replace "type" with "key_type", fix FTBFS. + + -- Luca Falavigna Thu, 05 Mar 2009 22:55:37 +0000 + +pyspi (0.6.1-1ubuntu2) gutsy; urgency=low + + * Fix build failure with recent pyrex. LP: #128227. + + -- Matthias Klose Fri, 24 Aug 2007 08:27:57 +0000 + +pyspi (0.6.1-1ubuntu1) feisty; urgency=low + + * Build a python-at-spi-dbg package. + * Set package section to python. + * Set Ubuntu maintainer address. + + -- Matthias Klose Sun, 18 Feb 2007 00:01:11 +0100 + +pyspi (0.6.1-1) unstable; urgency=low + + * New upstream release. + + Upload to Debian (Closes: #399325) + * Use python-support, and as it is handled by CDBS, we don't need any hack + in debian/rules file. + + -- Jose Carlos Garcia Sogo Sun, 19 Nov 2006 01:17:18 +0100 + +pyspi (0.5.5-0ubuntu1) edgy; urgency=low + + * New upstream release: + - 0.5.5: + - Better error and exception handling. Where before, calls would + mysteriously fail and "IDL:omg.org/CORBA/COMM_FAILURE:1.0" would be + printed, now a SpiException is raised. + - AccessibleValue bindings + - AccessibleSelection bindings + - Bugfixes: + - EventListener's deregistering now works properly: it is possible to + register and deregister the same EventListener multiple times. + - 0.5.4: + - An improved build system for RPMs + - Initial support for DeviceListener - note: the current implementation + seems to be nonworking; callbacks are never called. + + -- Daniel Holbach Tue, 1 Aug 2006 22:55:09 +0200 + +pyspi (0.5.3-0ubuntu1) dapper; urgency=low + + * [Zack Cerza] + - New upstream release. + - Build -dbg package by default. + * [Daniel Holbach] + - debian/changelog + - changed to Ubuntu versioning + - debian/rules: + - use dh_python, + - remove -dbg package. + - debian/compat: + - set to 5. + - debian/control: + - added {shlibs,misc,python}:Depends. + - added python-dev (>= 2.4) Build-Depends. + - bumped debhelper Build-Dep to 5. + - bumped Standards-Version. + - dropped -dbg package. + - debian/copyright: + - wrapped a line. + + -- Daniel Holbach Sat, 28 Jan 2006 12:35:30 +0100 + +pyspi (0.5.2-1) unstable; urgency=low + + * New upstream release. + + -- Zack Cerza Thu, 6 Oct 2005 23:26:05 -0400 + +pyspi (0.5.1-1) unstable; urgency=low + + * New upstream release. + + -- Zack Cerza Thu, 6 Oct 2005 17:24:03 -0400 + +pyspi (0.5.0-1) unstable; urgency=low + + * New upstream release. + + -- Zack Cerza Thu, 6 Oct 2005 16:57:47 -0400 + +pyspi (0.0.1.90-1) unstable; urgency=low + + * Initial Release + + -- Zack Cerza Sun, 10 Jul 2006 22:40:36 -0400 + --- pyspi-0.6.1.orig/debian/rules +++ pyspi-0.6.1/debian/rules @@ -0,0 +1,31 @@ +#!/usr/bin/make -f + +DEB_PYTHON_SYSTEM=pysupport +PYVERS=$(shell pyversions -vr) + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/python-distutils.mk + +build/python-at-spi-dbg:: + set -e; \ + for i in $(cdbs_python_build_versions); do \ + python$$i-dbg ./setup.py build; \ + done + +install/python-at-spi-dbg:: + for i in $(cdbs_python_build_versions); do \ + python$$i-dbg ./setup.py install --root $(CURDIR)/debian/python-at-spi-dbg; \ + done + find debian/python-at-spi-dbg \ + ! -type d ! -name '*.so' | xargs rm -f + find debian/python-at-spi-dbg -depth -empty -exec rmdir {} \; + +binary-predeb/python-at-spi-dbg:: + rm -rf debian/python-at-spi-dbg/usr/share/doc/python-at-spi-dbg + ln -s python-at-spi debian/python-at-spi-dbg/usr/share/doc/python-at-spi-dbg + +clean:: + rm -rf build + rm -f atspi.c + --- pyspi-0.6.1.orig/debian/compat +++ pyspi-0.6.1/debian/compat @@ -0,0 +1 @@ +5 --- pyspi-0.6.1.orig/debian/pycompat +++ pyspi-0.6.1/debian/pycompat @@ -0,0 +1 @@ +2 --- pyspi-0.6.1.orig/debian/pyversions +++ pyspi-0.6.1/debian/pyversions @@ -0,0 +1 @@ +2.4- --- pyspi-0.6.1.orig/debian/patches/482260.patch +++ pyspi-0.6.1/debian/patches/482260.patch @@ -0,0 +1,38 @@ +--- pyspi-0.6.1.orig/pyspi.pyx ++++ pyspi-0.6.1/pyspi.pyx +@@ -737,7 +737,7 @@ + Wrapper around the low-level cspi.AccessibleComponent_ functions, + giving an OO-style API. + """ +- def getExtents (self, type=0): ++ def getExtents (self, key_type=0): + """ + Wraps cspi.AccessibleComponent_getExtents, returning an + (x,y,w,h) tuple. +@@ -747,7 +747,7 @@ + cspi.AccessibleComponent_getExtents (self.__item, &x, &y, &w, &h, type) + return (x, y, w, h) + +- def getPosition (self, type = 0): ++ def getPosition (self, key_type=0): + """ + Wraps cspi.AccessibleComponent_getPosition, returning an + (x,y) tuple. +@@ -1038,7 +1038,7 @@ + cspi.AccessibleImage_getImageSize(self.__item, &w, &h); + return [w, h] + +- def getImagePosition (self, type=0): ++ def getImagePosition (self, key_type=0): + """ + Wraps cspi.AccessibleImage_getImagePosition, returning a (x,y) + pair +@@ -1048,7 +1048,7 @@ + cspi.AccessibleImage_getImagePosition(self.__item, &x, &y, type) + return [x, y] + +- def getImageExtents (self, type=0): ++ def getImageExtents (self, key_type=0): + """ + Wraps cspi.AccessibleImage_getImageExtents, returning a + (x,y,w,h) tuple