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

[mlang at users.alioth.debian.org]

Author: mlang
Date: Tue Apr  8 18:40:59 2008
New Revision: 15590

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15590
Log:
Fix bashisms in orca startup script (Closes: Bug#468681).

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

Modified: desktop/unstable/gnome-orca/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-orca/debian/changelog?rev=15590&op=diff
==============================================================================
--- desktop/unstable/gnome-orca/debian/changelog (original)
+++ desktop/unstable/gnome-orca/debian/changelog Tue Apr  8 18:40:59 2008
@@ -1,3 +1,9 @@
+gnome-orca (2.22.1-2) UNRELEASED; urgency=low
+
+  * Fix bashisms in orca startup script (Closes: Bug#468681).
+
+ -- Mario Lang <mlang at debian.org>  Tue, 08 Apr 2008 20:39:06 +0200
+
 gnome-orca (2.22.1-1) unstable; urgency=low
 
   * Add debian/patches/04_solaris_specific_fixes.patch again.

Modified: 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=15590&op=diff
==============================================================================
--- desktop/unstable/gnome-orca/debian/patches/04_solaris_specific_fixes.patch (original)
+++ desktop/unstable/gnome-orca/debian/patches/04_solaris_specific_fixes.patch Tue Apr  8 18:40:59 2008
@@ -1,8 +1,8 @@
 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
+--- orca-2.22.1/src/orca/orca.in.orig	2008-03-08 13:27:37.000000000 +0100
++++ orca-2.22.1/src/orca/orca.in	2008-04-08 20:33:58.000000000 +0200
 @@ -30,7 +30,7 @@
  
  # Set the user's $PATH for this script.
@@ -31,3 +31,21 @@
  
  # Cleans up any orca-related processes that might be running,
  # restricting it to those processes owned by the user. These include
+@@ -258,7 +250,7 @@
+ then
+     main
+ else
+-    if [ `grep -c "\-q" <<< $ARGS` -gt 0 ]
++    if echo "$ARGS" | grep -- "-q" > /dev/null
+     then
+         cleanup
+     else
+@@ -270,7 +262,7 @@
+         # erroneously types an illegal command line argument, the
+         # help text is emitted and the other orca is not killed.
+         #
+-        if [ `egrep -c "\-s|\-g|\-t|\-n|\-u|\-e|\-d" <<< $ARGS` -eq 0 ]
++        if ! echo "$ARGS" | egrep -- "\-s|\-g|\-t|\-n|\-u|\-e|\-d" > /dev/null
+         then
+             runOrca "NO_CLEANUP"
+         else