r17301 - in /desktop/experimental/gnome-orca/debian: changelog patches/01_no_default_desktop_item.patch patches/04_solaris_specific_fixes.patch patches/05_remove_pythonpath.patch

mlang at users.alioth.debian.org mlang at users.alioth.debian.org
Tue Oct 21 10:29:47 UTC 2008 

Author: mlang
Date: Tue Oct 21 10:29:46 2008
New Revision: 17301

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17301
Log:
* New upstream release.
* debian/patches/01_no_default_desktop_item.patch: Updated.
* debian/patches/04_solaris_specific_fixes.patch: Updated for new
  startup script in 2.24.1.
* debian/patches/05_remove_pythonpath.patch: Updated.

Modified:
    desktop/experimental/gnome-orca/debian/changelog
    desktop/experimental/gnome-orca/debian/patches/01_no_default_desktop_item.patch
    desktop/experimental/gnome-orca/debian/patches/04_solaris_specific_fixes.patch
    desktop/experimental/gnome-orca/debian/patches/05_remove_pythonpath.patch

Modified: desktop/experimental/gnome-orca/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-orca/debian/changelog?rev=17301&op=diff
==============================================================================
--- desktop/experimental/gnome-orca/debian/changelog (original)
+++ desktop/experimental/gnome-orca/debian/changelog Tue Oct 21 10:29:46 2008
@@ -1,8 +1,13 @@
-gnome-orca (2.24.0-2) UNRELEASED; urgency=low
+gnome-orca (2.24.1-1) experimental; urgency=low
 
   * debian/watch: Updated to point to 2.24.
-
- -- Mario Lang <mlang at debian.org>  Tue, 07 Oct 2008 20:47:37 +0200
+  * New upstream release.
+  * debian/patches/01_no_default_desktop_item.patch: Updated.
+  * debian/patches/04_solaris_specific_fixes.patch: Updated for new
+    startup script in 2.24.1.
+  * debian/patches/05_remove_pythonpath.patch: Updated.
+
+ -- Mario Lang <mlang at debian.org>  Tue, 21 Oct 2008 12:24:36 +0200
 
 gnome-orca (2.24.0-1) experimental; urgency=low
 

Modified: desktop/experimental/gnome-orca/debian/patches/01_no_default_desktop_item.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-orca/debian/patches/01_no_default_desktop_item.patch?rev=17301&op=diff
==============================================================================
--- desktop/experimental/gnome-orca/debian/patches/01_no_default_desktop_item.patch (original)
+++ desktop/experimental/gnome-orca/debian/patches/01_no_default_desktop_item.patch Tue Oct 21 10:29:46 2008
@@ -10,7 +10,7 @@
 @@ -8,6 +8,7 @@
  Type=Application
  StartupNotify=true
- Categories=GNOME;GTK;Accessibility;
+ Categories=GTK;GNOME;Utility;Accessibility;
 +NoDisplay=true
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=orca

Modified: desktop/experimental/gnome-orca/debian/patches/04_solaris_specific_fixes.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-orca/debian/patches/04_solaris_specific_fixes.patch?rev=17301&op=diff
==============================================================================
--- desktop/experimental/gnome-orca/debian/patches/04_solaris_specific_fixes.patch (original)
+++ desktop/experimental/gnome-orca/debian/patches/04_solaris_specific_fixes.patch Tue Oct 21 10:29:46 2008
@@ -1,8 +1,15 @@
-The orca startup shell script seems to contain some *isms.
-Remove solaris specific PATH components, use set -e, and other cleanups.
+The orca startup shell script contains some *isms.
+Remove solaris specific PATH components, use /bin/sh instead of /bin/bash
+and other cleanups.
 
---- gnome-orca-2.23.2/src/orca/orca.in.orig	2008-05-11 01:59:34.000000000 +0200
-+++ gnome-orca-2.23.2/src/orca/orca.in	2008-05-12 20:48:05.000000000 +0200
+--- orca-2.24.1/src/orca/orca.in.orig	2008-10-15 00:49:59.000000000 +0200
++++ orca-2.24.1/src/orca/orca.in	2008-10-21 12:01:22.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # Orca
+ #
 @@ -30,7 +30,7 @@
  
  # Set the user's $PATH for this script.
@@ -10,45 +17,23 @@
 -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.
+ # Save the arguments away.
  #
-@@ -58,16 +58,10 @@
- #
- IFS=:
- DBUSSENDCMD=
--WATCHDOG=0
-+WATCHDOG=1
- if [ "x$DBUS_SESSION_BUS_ADDRESS" != "x" ]
- then
--    for dir in $PATH:/usr/sfw/bin:/usr/local/bin; do
--        test -x "$dir/dbus-send" && {
--            DBUSSENDCMD="$dir/dbus-send"
--            WATCHDOG=1
--            break
--        }
--    done
-+    DBUSSENDCMD=`which dbus-send || WATCHDOG=0`
+@@ -137,7 +137,7 @@
+     fi
  fi
- # [[WDW - disabled the watchdog by default since it is problematic.]]
- WATCHDOG=0
-@@ -266,7 +260,7 @@
- then
-     main
- else
--    if [ `grep -c "\-q" <<< $ARGS` -gt 0 ]
-+    if echo "$ARGS" | grep -- "-q" > /dev/null
-     then
-         cleanup
+ 
+-if [ `grep -c "\-q" <<< $ARGS` -gt 0 ] ; then
++if echo "$ARGS" | grep -- "-q" > /dev/null; 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
-@@ -278,9 +272,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 "\-s|\-g|\-n|\-u|\-e|\-d" >/dev/null 
-         then
--            if [ `egrep -c "\-t" <<< $ARGS` -eq 0 ]
-+            if ! echo "$ARGS" | grep -- "-t" >/dev/null
-             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

Modified: desktop/experimental/gnome-orca/debian/patches/05_remove_pythonpath.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-orca/debian/patches/05_remove_pythonpath.patch?rev=17301&op=diff
==============================================================================
--- desktop/experimental/gnome-orca/debian/patches/05_remove_pythonpath.patch (original)
+++ desktop/experimental/gnome-orca/debian/patches/05_remove_pythonpath.patch Tue Oct 21 10:29:46 2008
@@ -1,12 +1,12 @@
---- orca-2.22.1/src/orca/orca.in.orig	2008-04-20 15:11:36.000000000 +0200
-+++ orca-2.22.1/src/orca/orca.in	2008-04-20 15:12:59.000000000 +0200
-@@ -86,9 +86,6 @@
-     then
-         cleanup
-     fi
+--- src/orca/orca.in.orig	2008-10-21 12:22:23.000000000 +0200
++++ src/orca/orca.in	2008-10-21 12:23:26.000000000 +0200
+@@ -101,9 +101,6 @@
+ #
+ runOrca()
+ {
 -    exec_prefix=@prefix@
 -    PYTHONPATH=${PYTHONPATH}:@pyexecdir@
 -    export PYTHONPATH
- 
-     # We'll save and restore the Caps_Lock as a modifier just in case
-     # the user is using the Caps_Lock as the Orca modifier key.  We
+     saveXmodmap
+     exec @PYTHON@ -c "import orca.orca; orca.orca.main()" "$ARGS"
+     restoreXmodmap

More information about the pkg-gnome-commits mailing list