4 files changed, 277 insertions, 121 deletions

diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
index 608fa0e0fcc7..36205dd2346b 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/orca/Makefile,v 1.42 2008/03/10 00:56:17 mezz Exp $
+#   $MCom: ports/accessibility/orca/Makefile,v 1.58 2008/11/25 05:37:04 mezz Exp $
 #
 
 PORTNAME=	orca
-PORTVERSION=	2.22.3
+PORTVERSION=	2.24.2
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -15,7 +15,9 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Scriptable screen reader
 
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus
 LIB_DEPENDS=	gnome-mag.2:${PORTSDIR}/accessibility/gnome-mag
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus
 
 LATEST_LINK=	gnome-orca
 
@@ -23,7 +25,8 @@ USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_PYTHON=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack libgnomeui atspi gnomespeech pygnome2
+USE_GNOME=	gnomeprefix gnomehack libgnomeui atspi gnomespeech pygnome2 \
+		pygnomedesktop
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/accessibility/orca/distinfo b/accessibility/orca/distinfo
index 9f07eaeecad8..15b796b0b5be 100644
--- a/accessibility/orca/distinfo
+++ b/accessibility/orca/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/orca-2.22.3.tar.bz2) = cc0ca608caff98f265b4a040dbc3d170
-SHA256 (gnome2/orca-2.22.3.tar.bz2) = 71cddc670282264a872568677ea03b6d3b97bdd2c790206f911c4ce59dbb7277
-SIZE (gnome2/orca-2.22.3.tar.bz2) = 1801770
+MD5 (gnome2/orca-2.24.2.tar.bz2) = 2235902841d39b46168c30a160f7afe2
+SHA256 (gnome2/orca-2.24.2.tar.bz2) = 7eddb03f32a5668365446fe3d3e788928d82b98d6bf3ed7826e87247eed698c7
+SIZE (gnome2/orca-2.24.2.tar.bz2) = 2125637
diff --git a/accessibility/orca/files/patch-src_orca_orca.in b/accessibility/orca/files/patch-src_orca_orca.in
index ec31af2bc8c3..484b6de03461 100644
--- a/accessibility/orca/files/patch-src_orca_orca.in
+++ b/accessibility/orca/files/patch-src_orca_orca.in
@@ -1,5 +1,5 @@
---- src/orca/orca.in.orig	2008-05-26 16:22:08.000000000 -0500
-+++ src/orca/orca.in	2008-05-26 16:25:53.000000000 -0500
+--- src/orca/orca.in.orig	2008-10-16 14:56:18.000000000 -0500
++++ src/orca/orca.in	2008-10-16 15:04:04.000000000 -0500
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -13,44 +13,32 @@
 -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/local/bin"
  
- # If you set RUNONCE to "true", then this will just run Orca once and quit.
+ # Save the arguments away.
  #
-@@ -74,7 +74,7 @@
+@@ -83,7 +83,7 @@
  cleanup()
  {
      USERID=`id | cut -f2 -d= | cut -f1 -d\(`
--    PIDS=`ps -eo pid,ruid,args | grep $USERID | egrep "orca[.]orca|synthesis-driver|festival [-][-]server" | grep -v grep | awk '{ print $1 }'`
-+    PIDS=`ps -exo pid,ruid,args | grep $USERID | egrep "orca[.]orca|synthesis-driver|festival [-][-]server" | grep -v grep | awk '{ print $1 }'`
- 
+-    PIDS=`ps -eo pid,ruid,args | grep $USERID | \
++    PIDS=`ps -exo pid,ruid,args | grep $USERID | \
+ 	egrep "orca[.]orca|synthesis-driver|festival [-][-]server" | \
+ 	grep -v grep | awk '{ print $1 }'`
      IFS='
-     '
-@@ -145,7 +145,7 @@
-         do
-             sleep 5
-             USERID=`id | cut -f2 -d= | cut -f1 -d\(`
--            PID=`ps -eo pid,ruid,args | grep $USERID | egrep "orca[.]orca" | grep -v grep | awk '{ print $1 }'`
-+            PID=`ps -exo pid,ruid,args | grep $USERID | egrep "orca[.]orca" | grep -v grep | awk '{ print $1 }'`
+@@ -137,7 +137,7 @@
+     fi
+ fi
  
-             if [ "x$PID" = "x" ]
-             then
-@@ -258,7 +258,7 @@
- then
-     main
- else
--    if [ `grep -c "\-q" <<< $ARGS` -gt 0 ]
-+    if [ `echo $ARGS | grep -c "\-q"` -gt 0 ]
-     then
-         cleanup
+-if [ `grep -c "\-q" <<< $ARGS` -gt 0 ] ; then
++if [ `echo $ARGS | grep -c "\-q"` -gt 0 ] ; then
+     # If the user has done -q or --quit, that means to tell any
+     # existing orca process to quit.  So, we just do a cleanup.
+     #
+@@ -154,7 +154,7 @@
+     if [ "x$ARGS" = "x" ] ; then
+         CLEANUP=1
      else
-@@ -270,9 +270,9 @@
-         # erroneously types an illegal command line argument, the
-         # help text is emitted and the other orca is not killed.
-         #
--        if [ `egrep -c "\-s|\-g|\-n|\-u|\-e|\-d" <<< $ARGS` -eq 0 ]
-+        if [ `echo $ARGS | egrep -c "\-s|\-g|\-n|\-u|\-e|\-d"` -eq 0 ]
-         then
--            if [ `egrep -c "\-t" <<< $ARGS` -eq 0 ]
-+            if [ `echo $ARGS | egrep -c "\-t"` -eq 0 ]
-             then
-                 runOrca "NO_CLEANUP"
-             else
+-        CLEANUP=`egrep -c "\-s|\-t|\-n|\-u|\-e|\-d" <<< $ARGS`
++        CLEANUP=`echo $ARGS | egrep -c "\-s|\-t|\-n|\-u|\-e|\-d"`
+     fi
+ 
+     # Clean up before running orca to get anything that might
diff --git a/accessibility/orca/pkg-plist b/accessibility/orca/pkg-plist
index 2525d4526715..3483c5493b5f 100644
--- a/accessibility/orca/pkg-plist
+++ b/accessibility/orca/pkg-plist
@@ -1,10 +1,4 @@
 bin/orca
-%%PYTHON_SITELIBDIR%%/orca/Gecko.py
-%%PYTHON_SITELIBDIR%%/orca/Gecko.pyc
-%%PYTHON_SITELIBDIR%%/orca/Gecko.pyo
-%%PYTHON_SITELIBDIR%%/orca/J2SE-access-bridge.py
-%%PYTHON_SITELIBDIR%%/orca/J2SE-access-bridge.pyc
-%%PYTHON_SITELIBDIR%%/orca/J2SE-access-bridge.pyo
 %%PYTHON_SITELIBDIR%%/orca/__init__.py
 %%PYTHON_SITELIBDIR%%/orca/__init__.pyc
 %%PYTHON_SITELIBDIR%%/orca/__init__.pyo
@@ -34,6 +28,9 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/chnames.py
 %%PYTHON_SITELIBDIR%%/orca/chnames.pyc
 %%PYTHON_SITELIBDIR%%/orca/chnames.pyo
+%%PYTHON_SITELIBDIR%%/orca/dbusserver.py
+%%PYTHON_SITELIBDIR%%/orca/dbusserver.pyc
+%%PYTHON_SITELIBDIR%%/orca/dbusserver.pyo
 %%PYTHON_SITELIBDIR%%/orca/debug.py
 %%PYTHON_SITELIBDIR%%/orca/debug.pyc
 %%PYTHON_SITELIBDIR%%/orca/debug.pyo
@@ -79,6 +76,9 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/mag.py
 %%PYTHON_SITELIBDIR%%/orca/mag.pyc
 %%PYTHON_SITELIBDIR%%/orca/mag.pyo
+%%PYTHON_SITELIBDIR%%/orca/mouse_review.py
+%%PYTHON_SITELIBDIR%%/orca/mouse_review.pyc
+%%PYTHON_SITELIBDIR%%/orca/mouse_review.pyo
 %%PYTHON_SITELIBDIR%%/orca/orca.py
 %%PYTHON_SITELIBDIR%%/orca/orca.pyc
 %%PYTHON_SITELIBDIR%%/orca/orca.pyo
@@ -109,6 +109,9 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/orca_state.py
 %%PYTHON_SITELIBDIR%%/orca/orca_state.pyc
 %%PYTHON_SITELIBDIR%%/orca/orca_state.pyo
+%%PYTHON_SITELIBDIR%%/orca/outline.py
+%%PYTHON_SITELIBDIR%%/orca/outline.pyc
+%%PYTHON_SITELIBDIR%%/orca/outline.pyo
 %%PYTHON_SITELIBDIR%%/orca/outloud.py
 %%PYTHON_SITELIBDIR%%/orca/outloud.pyc
 %%PYTHON_SITELIBDIR%%/orca/outloud.pyo
@@ -133,84 +136,219 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/script.py
 %%PYTHON_SITELIBDIR%%/orca/script.pyc
 %%PYTHON_SITELIBDIR%%/orca/script.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/Evolution.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/Evolution.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/Evolution.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/Mozilla.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/Mozilla.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/Mozilla.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/StarOffice.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/StarOffice.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/StarOffice.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/Thunderbird.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/Thunderbird.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/Thunderbird.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/__init__.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/__init__.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/__init__.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/acroread.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/acroread.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/acroread.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/gaim.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/gaim.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/gaim.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/gcalctool.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/gcalctool.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/gcalctool.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/gdmlogin.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/gdmlogin.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/gdmlogin.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/gedit.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/gedit.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/gedit.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-keyring-ask.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-keyring-ask.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-keyring-ask.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-mud.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-mud.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-mud.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-panel.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-panel.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-panel.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-screensaver-dialog.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-screensaver-dialog.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-screensaver-dialog.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-search-tool.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-search-tool.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-search-tool.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-system-monitor.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-system-monitor.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-system-monitor.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-terminal.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-terminal.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-terminal.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-window-properties.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-window-properties.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-window-properties.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome_segv2.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome_segv2.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/gnome_segv2.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/liferea.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/liferea.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/liferea.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/metacity.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/metacity.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/metacity.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/nautilus.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/nautilus.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/nautilus.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/notification-daemon.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/notification-daemon.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/notification-daemon.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/planner.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/planner.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/planner.pyo
-%%PYTHON_SITELIBDIR%%/orca/scripts/rhythmbox.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/rhythmbox.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/rhythmbox.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Mozilla.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/script_settings.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/script_settings.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/script_settings.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/speech_generator.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/speech_generator.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/speech_generator.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/acroread.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/acroread.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/acroread.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/speech_generator.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/speech_generator.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/speech_generator.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/where_am_i.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/where_am_i.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution/where_am_i.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/speech_generator.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/speech_generator.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/speech_generator.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/where_am_i.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/where_am_i.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool/where_am_i.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gdmlogin.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-keyring-ask.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-mud.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-panel.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-screensaver-dialog.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-search-tool.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-system-monitor.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-system-monitor.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-system-monitor.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-terminal.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/speech_generator.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/speech_generator.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties/speech_generator.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome_segv2.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome_segv2.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome_segv2.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/liferea.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/metacity.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/nautilus.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/nautilus.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/nautilus.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/notification-daemon.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script_settings.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script_settings.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/script_settings.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/speech_generator.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/speech_generator.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/speech_generator.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/where_am_i.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/where_am_i.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin/where_am_i.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/braille_generator.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/braille_generator.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/braille_generator.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/speech_generator.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/speech_generator.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner/speech_generator.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/braille_generator.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/braille_generator.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/braille_generator.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/speech_generator.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/speech_generator.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox/speech_generator.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/braille_generator.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/braille_generator.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/braille_generator.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script_settings.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script_settings.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script_settings.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/speech_generator.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/speech_generator.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/speech_generator.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/where_am_i.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/where_am_i.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/where_am_i.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/yelp.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/GAIL.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/bookmarks.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/bookmarks.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/bookmarks.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/braille_generator.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/braille_generator.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/braille_generator.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script_settings.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script_settings.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script_settings.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/speech_generator.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/speech_generator.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/speech_generator.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/structural_navigation.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/structural_navigation.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/structural_navigation.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/where_am_i.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/where_am_i.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/where_am_i.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/braillegenerator.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/braillegenerator.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/braillegenerator.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/script.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/script.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/speechgenerator.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/speechgenerator.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/speechgenerator.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/where_am_I.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/where_am_I.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/where_am_I.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/VCL.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/VCL.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/VCL.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/__init__.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/__init__.pyo
 %%PYTHON_SITELIBDIR%%/orca/settings.py
 %%PYTHON_SITELIBDIR%%/orca/settings.pyc
 %%PYTHON_SITELIBDIR%%/orca/settings.pyo
@@ -226,6 +364,15 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/speechserver.py
 %%PYTHON_SITELIBDIR%%/orca/speechserver.pyc
 %%PYTHON_SITELIBDIR%%/orca/speechserver.pyo
+%%PYTHON_SITELIBDIR%%/orca/structural_navigation.py
+%%PYTHON_SITELIBDIR%%/orca/structural_navigation.pyc
+%%PYTHON_SITELIBDIR%%/orca/structural_navigation.pyo
+%%PYTHON_SITELIBDIR%%/orca/text_attribute_names.py
+%%PYTHON_SITELIBDIR%%/orca/text_attribute_names.pyc
+%%PYTHON_SITELIBDIR%%/orca/text_attribute_names.pyo
+%%PYTHON_SITELIBDIR%%/orca/tutorialgenerator.py
+%%PYTHON_SITELIBDIR%%/orca/tutorialgenerator.pyc
+%%PYTHON_SITELIBDIR%%/orca/tutorialgenerator.pyo
 %%PYTHON_SITELIBDIR%%/orca/where_am_I.py
 %%PYTHON_SITELIBDIR%%/orca/where_am_I.pyc
 %%PYTHON_SITELIBDIR%%/orca/where_am_I.pyo
@@ -264,6 +411,7 @@ share/locale/kn/LC_MESSAGES/orca.mo
 share/locale/ko/LC_MESSAGES/orca.mo
 share/locale/lt/LC_MESSAGES/orca.mo
 share/locale/lv/LC_MESSAGES/orca.mo
+share/locale/mai/LC_MESSAGES/orca.mo
 share/locale/mk/LC_MESSAGES/orca.mo
 share/locale/ml/LC_MESSAGES/orca.mo
 share/locale/mr/LC_MESSAGES/orca.mo
@@ -283,7 +431,7 @@ share/locale/si/LC_MESSAGES/orca.mo
 share/locale/sl/LC_MESSAGES/orca.mo
 share/locale/sq/LC_MESSAGES/orca.mo
 share/locale/sr/LC_MESSAGES/orca.mo
-share/locale/sr@Latn/LC_MESSAGES/orca.mo
+share/locale/sr@latin/LC_MESSAGES/orca.mo
 share/locale/sv/LC_MESSAGES/orca.mo
 share/locale/ta/LC_MESSAGES/orca.mo
 share/locale/te/LC_MESSAGES/orca.mo
@@ -301,12 +449,27 @@ share/locale/zh_TW/LC_MESSAGES/orca.mo
 @dirrm %%DATADIR%%/glade
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/rhythmbox
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/planner
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/pidgin
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gnome-window-properties
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gedit
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/gcalctool
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/evolution
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird
+@dirrm %%PYTHON_SITELIBDIR%%/orca/scripts/apps
 @dirrm %%PYTHON_SITELIBDIR%%/orca/scripts
 @dirrm %%PYTHON_SITELIBDIR%%/orca
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
 @dirrmtry share/locale/si/LC_MESSAGES
 @dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
@@ -315,6 +478,8 @@ share/locale/zh_TW/LC_MESSAGES/orca.mo
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES