diff -u gnome-orca-2.21.90/debian/control gnome-orca-2.21.90/debian/control --- gnome-orca-2.21.90/debian/control +++ gnome-orca-2.21.90/debian/control @@ -1,8 +1,9 @@ Source: gnome-orca Section: gnome Priority: optional -Maintainer: Mario Lang -Uploaders: Debian GNOME Maintainers +Maintainer: Ubuntu Accessibility Developers +XSBC-Original-Maintainer: Mario Lang +Uploaders: Debian GNOME Maintainers , Mario Lang Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/experimental/gnome-orca Build-Depends: cdbs, debhelper (>= 5.0.38), @@ -33,11 +34,12 @@ python-gtk2 (>= 2.10), python-glade2, python-gnome2 (>= 2.6.2), - python-brlapi + python-brlapi, + libgail-gnome-module Recommends: gnome-mag (>= 0.12.5), wget -Conflicts: gnome-orca-common (<< 2.20.1-2) -Replaces: gnome-orca-common (<< 2.20.1-2) +Conflicts: gnome-orca-common (<< 2.20.1-2), python-orca-brlapi (<< 2.20.1-2) +Replaces: gnome-orca-common (<< 2.20.1-2), python-orca-brlapi (<< 2.20.1-2) XB-Python-Version: ${python:Versions} Homepage: http://live.gnome.org/Orca Description: Scriptable screen reader diff -u gnome-orca-2.21.90/debian/changelog gnome-orca-2.21.90/debian/changelog --- gnome-orca-2.21.90/debian/changelog +++ gnome-orca-2.21.90/debian/changelog @@ -1,3 +1,17 @@ +gnome-orca (2.21.90-1ubuntu1) hardy; urgency=low + + * Merge from debian experimental (LP: #189802), remaining changes: + - debian/patches/01_add_ubiquity-script.dpatch, Added + - set Maintainer: Ubuntu Accessibility Developers + + - Add conflicts/replaces for python-orca-brlapi + - Keep debian/patches/04_solaris_specific_fixes.patch + * debian/control, debian/control.in: + - Added libgail-gnome-module to dependencies. Provides extra + functionality + + -- Luke Yelavich Fri, 08 Feb 2008 09:38:28 +1100 + gnome-orca (2.21.90-1) experimental; urgency=low * New upstream release. @@ -5,6 +19,13 @@ -- Mario Lang Tue, 05 Feb 2008 22:17:19 +0100 +gnome-orca (2.21.5-0ubuntu1) hardy; urgency=low + + * New upstream release (LP: #182992) + * debian/patches/02_disable_brlmodule.patch: Updated. + + -- Luke Yelavich Tue, 15 Jan 2008 09:14:41 +1100 + gnome-orca (2.21.4-1) experimental; urgency=low * Add Vcs-Svn field. @@ -13,12 +34,39 @@ -- Mario Lang Wed, 19 Dec 2007 00:19:24 +0100 +gnome-orca (2.21.4-0ubuntu1) hardy; urgency=low + + * New upstream release (LP: #177088) + + -- Luke Yelavich Tue, 18 Dec 2007 18:14:36 +1100 + gnome-orca (2.21.3-1) experimental; urgency=low * New upstream release. -- Mario Lang Tue, 04 Dec 2007 18:52:37 +0100 +gnome-orca (2.21.3-0ubuntu2) hardy; urgency=low + + * src/orca/orca.in: + Updated 04_solaris_specific_fixes.patch to use bash instead of dash + for the orca startup script. (LP #176480) + + -- Luke Yelavich Sat, 15 Dec 2007 14:53:56 +1100 + +gnome-orca (2.21.3-0ubuntu1) hardy; urgency=low + + * New upstream release + * debian/patches/01_add_ubiquity-script.patch: + - Updated, Thanks to Rich Burridge . + * debian/control: + - Orca depends on python-pyatspi (>= 1.21.1). + - Move all recommends to depends. We need these to support all + accessibility features, and orca will not work without brltty's + python bindings. + + -- Luke Yelavich Tue, 04 Dec 2007 09:50:39 +1100 + gnome-orca (2.21.2-1) experimental; urgency=low * New upstream release. @@ -31,6 +79,28 @@ -- Mario Lang Sat, 01 Dec 2007 18:31:22 +0100 +gnome-orca (2.21.2-0ubuntu1) hardy; urgency=low + + * Merge from debian unstable (LP: #172515), remaining changes: + - debian/patches/01_add_ubiquity-script.dpatch, + debian/patches/01_no_default_desktop_item.dpatch: Added patches. + - set Maintainer: Ubuntu Accessibility Developers + + - Add conflicts/replaces for python-orca-brlapi + * Ubuntu changes dropped: + - debian/patches/01_libbrlapi_fix.dpatch, + debian/patches/01_link_libbrlapi.dpatch, + debian/patches/02_libbrlapi_fix.dpatch: dropped + - python-orca-brlapi* packages dropped. Using python bindings from + brltty 3.9. + * New upstream release. + * debian/patches/01_add_ubiquity-script.patch: Renamed and removed + dpatch header. + * debian/patches/04_solaris_specific_fixes.patch: Updated. + * debian/watch: Point to 2.21. + + -- Luke Yelavich Wed, 28 Nov 2007 21:50:18 +1100 + gnome-orca (2.20.2-1) unstable; urgency=low * New upstream release. @@ -72,12 +142,26 @@ -- Mario Lang Fri, 21 Sep 2007 10:29:17 +0200 +gnome-orca (2.20.0-0ubuntu1) gutsy; urgency=low + + * New upstream release. + + -- Daniel Holbach Mon, 17 Sep 2007 14:46:33 +0200 + gnome-orca (2.19.91-1) experimental; urgency=low * New upstream release. -- Mario Lang Sun, 02 Sep 2007 13:24:53 +0200 +gnome-orca (2.19.91-0ubuntu1) gutsy; urgency=low + + * New upstream release (2.19.91) + * New upstream release (2.19.90) + * New upstream release (2.19.6) + + -- Aron Sisak Mon, 27 Aug 2007 11:57:13 +0200 + gnome-orca (2.19.90-2) experimental; urgency=low * Drop libbrlapi1-dev from Build-Depends. @@ -105,12 +189,26 @@ -- Mario Lang Tue, 10 Jul 2007 17:50:46 +0200 +gnome-orca (2.19.5-0ubuntu1) gutsy; urgency=low + + * New upstream release. + + -- Luke Yelavich Tue, 10 Jul 2007 21:54:54 +1000 + gnome-orca (2.19.4-1) experimental; urgency=low * New upstream release. -- Mario Lang Mon, 18 Jun 2007 11:25:05 +0200 +gnome-orca (2.19.4-0ubuntu1) gutsy; urgency=low + + * New upstream release. + * debian/control: use ${binary:Version} instead of ${Source-Version}. + * debian/patches/01_add_ubiquity-script.dpatch: updated + + -- Daniel Holbach Mon, 18 Jun 2007 10:29:13 +0200 + gnome-orca (2.19.3-1) experimental; urgency=low * New upstream release. @@ -140,6 +238,22 @@ -- Mario Lang Sun, 13 May 2007 20:11:32 +0200 +gnome-orca (2.19.2-0ubuntu2) gutsy; urgency=low + + * debian/control: + - libgnome-speech3-dev -> libgnome-speech-dev. + - libgnome-speech3 -> libgnome-speech7 (This is an unpleasant hack. Reason + is that the libgnome-speech7 package ships binaries, which should be + split out into a separate package.) + + -- Daniel Holbach Thu, 31 May 2007 09:52:57 +0200 + +gnome-orca (2.19.2-0ubuntu1) gutsy; urgency=low + + * New upstream release. + + -- Daniel Holbach Wed, 16 May 2007 11:21:06 +0200 + gnome-orca (2.19.1-1) experimental; urgency=low * New upstream release. @@ -147,6 +261,35 @@ -- Mario Lang Thu, 03 May 2007 10:18:28 +0200 +gnome-orca (2.19.1-0ubuntu1) gutsy; urgency=low + + * Synchronized with Debian, remaining Ubuntu changes: + - debian/control: + - newer Depends/Build-Depends, add Packages python-orca-brlapi and + python-orca-brlapi-dbg. + - debian/patches/01_add_ubiquity-script.dpatch, + debian/patches/01_libbrlapi_fix.dpatch, + debian/patches/01_link_libbrlapi.dpatch, + debian/patches/01_no_default_desktop_item.dpatch, + debian/patches/02_libbrlapi_fix.dpatch: added patches. + - debian/rules, debian/control: + - use pycentral, build python packages. + - debian/copyright, debian/README.Debian: give credit to Luke Yelavich. + - debian/install: python2.4 -> python*, install *.so files to different + package. + - debian/watch: added. + * New upstream release. + * debian/control: + - added python-gconf as Build-Depends and Depends. + - set Maintainer: Ubuntu Accessibility Developers + + * debian/patches/01_add_ubiquity-script.dpatch: + - updated. + * debian/patches/01_no_default_desktop_item.dpatch: + - removed .rej file. + + -- Daniel Holbach Thu, 26 Apr 2007 11:06:56 +0200 + gnome-orca (2.18.1-3) unstable; urgency=low * Convert to cdbs (removed most of debian/rules and converted patches @@ -217,0 +361 @@ + diff -u gnome-orca-2.21.90/debian/control.in gnome-orca-2.21.90/debian/control.in --- gnome-orca-2.21.90/debian/control.in +++ gnome-orca-2.21.90/debian/control.in @@ -1,7 +1,8 @@ Source: gnome-orca Section: gnome Priority: optional -Maintainer: Mario Lang +Maintainer: Ubuntu Accessibility Developers +XSBC-Original-Maintainer: Mario Lang Uploaders: @GNOME_TEAM@ Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/experimental/gnome-orca Build-Depends: cdbs, @@ -33,11 +34,12 @@ python-gtk2 (>= 2.10), python-glade2, python-gnome2 (>= 2.6.2), - python-brlapi + python-brlapi, + libgail-gnome-module Recommends: gnome-mag (>= 0.12.5), wget -Conflicts: gnome-orca-common (<< 2.20.1-2) -Replaces: gnome-orca-common (<< 2.20.1-2) +Conflicts: gnome-orca-common (<< 2.20.1-2), python-orca-brlapi (<< 2.20.1-2) +Replaces: gnome-orca-common (<< 2.20.1-2), python-orca-brlapi (<< 2.20.1-2) XB-Python-Version: ${python:Versions} Homepage: http://live.gnome.org/Orca Description: Scriptable screen reader only in patch2: unchanged: --- gnome-orca-2.21.90.orig/debian/patches/01_add_ubiquity-script.patch +++ gnome-orca-2.21.90/debian/patches/01_add_ubiquity-script.patch @@ -0,0 +1,142 @@ +diff -Nur gnome-orca-2.21.3/po/POTFILES.in gnome-orca-2.21.3.new/po/POTFILES.in +--- gnome-orca-2.21.3/po/POTFILES.in 2007-11-09 03:02:37.000000000 +1100 ++++ gnome-orca-2.21.3.new/po/POTFILES.in 2007-12-04 09:40:29.000000000 +1100 +@@ -48,6 +48,7 @@ + src/orca/scripts/planner.py + src/orca/scripts/StarOffice.py + src/orca/scripts/Thunderbird.py ++src/orca/scripts/ubiquity.py + src/orca/settings.py + src/orca/speechdispatcherfactory.py + src/orca/speechgenerator.py +diff -Nur gnome-orca-2.21.3/src/orca/scripts/Makefile.am gnome-orca-2.21.3.new/src/orca/scripts/Makefile.am +--- gnome-orca-2.21.3/src/orca/scripts/Makefile.am 2007-11-09 03:02:24.000000000 +1100 ++++ gnome-orca-2.21.3.new/src/orca/scripts/Makefile.am 2007-12-04 09:40:29.000000000 +1100 +@@ -24,7 +24,8 @@ + planner.py \ + self_voicing.py \ + StarOffice.py \ +- Thunderbird.py ++ Thunderbird.py \ ++ ubiquity.py + + orca_pythondir=$(pyexecdir)/orca/scripts + +diff -Nur gnome-orca-2.21.3/src/orca/scripts/Makefile.in gnome-orca-2.21.3.new/src/orca/scripts/Makefile.in +--- gnome-orca-2.21.3/src/orca/scripts/Makefile.in 2007-12-04 06:40:30.000000000 +1100 ++++ gnome-orca-2.21.3.new/src/orca/scripts/Makefile.in 2007-12-04 09:40:29.000000000 +1100 +@@ -250,7 +250,8 @@ + planner.py \ + self_voicing.py \ + StarOffice.py \ +- Thunderbird.py ++ Thunderbird.py \ ++ ubiquity.py + + orca_pythondir = $(pyexecdir)/orca/scripts + all: all-am +diff -Nur gnome-orca-2.21.3/src/orca/scripts/ubiquity.py gnome-orca-2.21.3.new/src/orca/scripts/ubiquity.py +--- gnome-orca-2.21.3/src/orca/scripts/ubiquity.py 1970-01-01 10:00:00.000000000 +1000 ++++ gnome-orca-2.21.3.new/src/orca/scripts/ubiquity.py 2007-12-04 09:41:26.000000000 +1100 +@@ -0,0 +1,101 @@ ++# Orca ++# ++# Copyright 2005-2006 Sun Microsystems Inc. ++# ++# This library is free software; you can redistribute it and/or ++# modify it under the terms of the GNU Library General Public ++# License as published by the Free Software Foundation; either ++# version 2 of the License, or (at your option) any later version. ++# ++# This library 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 ++# Library General Public License for more details. ++# ++# You should have received a copy of the GNU Library General Public ++# License along with this library; if not, write to the ++# Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++# Boston, MA 02111-1307, USA. ++ ++"""Custom script for Ubuiquity.""" ++ ++__id__ = "$Id: Ubiquity.py,v 1.63 2006/07/28 17:33:18 wwalker Exp $" ++__version__ = "$Revision: 1.63 $" ++__date__ = "$Date: 2006/07/28 17:33:18 $" ++__copyright__ = "Copyright (c) 2005-2006 Sun Microsystems Inc." ++__license__ = "LGPL" ++ ++import orca.default as default ++import orca.rolenames as rolenames ++import orca.speech as speech ++import orca.util as util ++ ++######################################################################## ++# # ++# The Ubiquity script class. # ++# # ++######################################################################## ++ ++class Script(default.Script): ++ ++ def __init__(self, app): ++ """Creates a new script for the given application. ++ ++ Arguments: ++ - app: the application to create a script for. ++ """ ++ ++ default.Script.__init__(self, app) ++ ++ self.setupLabels = {} ++ self.currentTab = None ++ ++ def onWindowActivated(self, event): ++ if self.currentTab: #Speak current open tab ++ obj = self.currentTab.child(0) ++ for n in range(obj.childCount): ++ if util.getDisplayedText(obj.child(n)): ++ speech.speak(util.getDisplayedText(obj.child(n))) ++ ++ default.Script.onWindowActivated(self, event) ++ ++ def onSelectionChanged(self, event): ++ ++ if event.source.name:#for location selection. ++ panel = event.source.parent ++ ++ allLabels = util.findByRole(panel, rolenames.ROLE_LABEL) ++ ++ speech.speak(util.getDisplayedText(allLabels[6])) ++ speech.speak(util.getDisplayedText(event.source)) ++ speech.speak(util.getDisplayedText(allLabels[3])) ++ speech.speak(util.getDisplayedText(allLabels[0])) ++ speech.speak(util.getDisplayedText(allLabels[5])) ++ speech.speak(util.getDisplayedText(allLabels[2])) ++ speech.speak(util.getDisplayedText(allLabels[4])) ++ speech.speak(util.getDisplayedText(allLabels[1])) ++ return ++ ++ def onStateChanged(self, event): ++ if event.detail1 == 1 and event.type.endswith("showing"): ++ # for text box on last page. ++ if event.source.role == rolenames.ROLE_VIEWPORT and \ ++ event.source.child(0).role == rolenames.ROLE_TEXT: ++ speech.speak(util.getDisplayedText(event.source.child(0))) ++ ++ obj = event.source ++ # To read the headers and instruction labels not associated ++ # with an input widget. ++ # ++ while not obj.role == rolenames.ROLE_FRAME: ++ if obj.parent.role == rolenames.ROLE_PAGE_TAB and \ ++ not self.currentTab == obj.parent: ++ self.currentTab = obj.parent ++ ++ for n in range(obj.childCount): ++ if util.getDisplayedText(obj.child(n)): ++ speech.speak(util.getDisplayedText(obj.child(n))) ++ ++ return ++ else: ++ obj = obj.parent only in patch2: unchanged: --- gnome-orca-2.21.90.orig/debian/patches/04_solaris_specific_fixes.patch +++ gnome-orca-2.21.90/debian/patches/04_solaris_specific_fixes.patch @@ -0,0 +1,33 @@ +The orca startup shell script seems to contain some *isms. +Remove solaris specific PATH components, use set -e, and other cleanups. + +--- gnome-orca-2.18.1/src/orca/orca.in.orig 2007-04-09 21:59:57.000000000 +0200 ++++ gnome-orca-2.18.1/src/orca/orca.in 2007-04-30 03:54:43.000000000 +0200 +@@ -30,7 +30,7 @@ + + # Set the user's $PATH for this script. + # +-export PATH="${PATH}:/usr/ccs/bin:/usr/bin:/usr/sbin:/bin:/usr/sfw/bin:/usr/openwin/bin:/usr/X11R6/bin" ++export PATH="${PATH}:/usr/bin:/usr/sbin:/bin:/usr/X11R6/bin" + + # If you set RUNONCE to "true", then this will just run Orca once and quit. + # +@@ -55,16 +55,8 @@ + # do not want a background process that periodically pings Orca to see + # if it is responding. + # +-IFS=: +-WGETCMD= +-WATCHDOG=0 +-for dir in $PATH:/usr/sfw/bin:/usr/local/bin; do +- test -x "$dir/wget" && { +- WGETCMD="$dir/wget" +- WATCHDOG=1 +- break +- } +-done ++WATCHDOG=1 ++WGETCMD=`which wget || WATCHDOG=0` + + # Cleans up any orca-related processes that might be running, + # restricting it to those processes owned by the user. These include