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

[mlang at users.alioth.debian.org]

Author: mlang
Date: Wed May 28 14:46:05 2008
New Revision: 16092

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

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=16092&op=diff
==============================================================================
--- desktop/unstable/gnome-orca/debian/changelog (original)
+++ desktop/unstable/gnome-orca/debian/changelog Wed May 28 14:46:05 2008
@@ -1,3 +1,10 @@
+gnome-orca (2.22.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches/04_solaris_specific_fixes.patch: Updated.
+
+ -- Mario Lang <mlang at debian.org>  Wed, 28 May 2008 16:41:57 +0200
+
 gnome-orca (2.22.1-2) unstable; urgency=low
 
   * Fix bashisms in orca startup script (Closes: Bug#468681).

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=16092&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 Wed May 28 14:46:05 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.
 
---- 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
+--- gnome-orca-2.22.2/src/orca/orca.in.orig	2008-04-24 21:54:44.000000000 +0200
++++ gnome-orca-2.22.2/src/orca/orca.in	2008-05-28 16:39:07.000000000 +0200
 @@ -30,7 +30,7 @@
  
  # Set the user's $PATH for this script.
@@ -40,12 +40,15 @@
      then
          cleanup
      else
-@@ -270,7 +262,7 @@
+@@ -270,9 +262,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"
-         else
+-            if [ `egrep -c "\-t" <<< $ARGS` -eq 0 ]
++            if ! echo "$ARGS" | grep -- "-t" >/dev/null
+             then
+                 runOrca "NO_CLEANUP"
+             else