r15360 - in /desktop/unstable/gnome-orca/debian: changelog patches/04_solaris_specific_fixes.patch

[mlang at users.alioth.debian.org]

Author: mlang
Date: Fri Mar 21 17:25:22 2008
New Revision: 15360

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15360
Log:
* Add debian/patches/04_solaris_specific_fixes.patch again.

Added:
    desktop/unstable/gnome-orca/debian/patches/04_solaris_specific_fixes.patch
Modified:
    desktop/unstable/gnome-orca/debian/changelog

Modified: desktop/unstable/gnome-orca/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-orca/debian/changelog?rev=15360&op=diff
==============================================================================
--- desktop/unstable/gnome-orca/debian/changelog (original)
+++ desktop/unstable/gnome-orca/debian/changelog Fri Mar 21 17:25:22 2008
@@ -1,3 +1,9 @@
+gnome-orca (2.22.0-2) UNRELEASED; urgency=low
+
+  * Add debian/patches/04_solaris_specific_fixes.patch again.
+
+ -- Mario Lang <mlang at debian.org>  Fri, 21 Mar 2008 18:24:32 +0100
+
 gnome-orca (2.22.0-1) unstable; urgency=low
 
   * New upstream release.

Added: desktop/unstable/gnome-orca/debian/patches/04_solaris_specific_fixes.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-orca/debian/patches/04_solaris_specific_fixes.patch?rev=15360&op=file
==============================================================================
--- desktop/unstable/gnome-orca/debian/patches/04_solaris_specific_fixes.patch (added)
+++ desktop/unstable/gnome-orca/debian/patches/04_solaris_specific_fixes.patch Fri Mar 21 17:25:22 2008
@@ -1,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