r15921 - in /desktop/experimental/gnome-orca/debian: changelog patches/04_solaris_specific_fixes.patch

[mlang at users.alioth.debian.org]

Author: mlang
Date: Mon May 12 18:58:16 2008
New Revision: 15921

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15921
Log:
* New upstream release.
* debian/patches/04_solaris_specific_fixes.patch: Updated.

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

Modified: desktop/experimental/gnome-orca/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-orca/debian/changelog?rev=15921&op=diff
==============================================================================
--- desktop/experimental/gnome-orca/debian/changelog (original)
+++ desktop/experimental/gnome-orca/debian/changelog Mon May 12 18:58:16 2008
@@ -1,3 +1,10 @@
+gnome-orca (2.23.2-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/patches/04_solaris_specific_fixes.patch: Updated.
+
+ -- Mario Lang <mlang at debian.org>  Mon, 12 May 2008 20:52:30 +0200
+
 gnome-orca (2.23.1-1) experimental; urgency=low
 
   * New upstream release.

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=15921&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 Mon May 12 18:58:16 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.23.1/src/orca/orca.in.orig	2008-04-20 22:39:16.000000000 +0200
-+++ gnome-orca-2.23.1/src/orca/orca.in	2008-04-22 00:19:43.000000000 +0200
+--- 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
 @@ -30,7 +30,7 @@
  
  # Set the user's $PATH for this script.
@@ -40,12 +40,15 @@
      then
          cleanup
      else
-@@ -278,7 +272,7 @@
+@@ -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|\-t|\-n|\-u|\-e|\-d" <<< $ARGS` -eq 0 ]
-+        if ! echo "$ARGS" | egrep -- "\-s|\-g|\-t|\-n|\-u|\-e|\-d" > /dev/null
+-        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
-             runOrca "NO_CLEANUP" &
-             orca_pid=$!
+-            if [ `egrep -c "\-t" <<< $ARGS` -eq 0 ]
++            if ! echo "$ARGS" | grep -- "-t" >/dev/null
+             then
+                 runOrca "NO_CLEANUP"
+             else