Bug#468681: gnome-orca: diff for NMU version 2.22.1-1.1

[Chris Lamb]

Hi,

The attached file is the diff for my gnome-orca 2.22.1-1.1 NMU. The
associated changelog entry is:

 gnome-orca (2.22.1-1.1) unstable; urgency=medium

   * Non-maintainer upload.
   * Add '04_bashisms.patch' to fix bashisms in 'orca' script
     (Closes: #468681)


Regards,

-- 
Chris Lamb, UK                                       [EMAIL PROTECTED]
                                                            GPG: 0x634F9A20

diff -Nru gnome-orca-2.22.1/debian/changelog gnome-orca-2.22.1/debian/changelog
--- gnome-orca-2.22.1/debian/changelog  2008-04-12 04:53:23.000000000 +0100
+++ gnome-orca-2.22.1/debian/changelog  2008-04-12 04:53:23.000000000 +0100
@@ -1,3 +1,11 @@
+gnome-orca (2.22.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add '04_bashisms.patch' to fix bashisms in 'orca' script
+    (Closes: #468681)
+
+ -- Chris Lamb <[EMAIL PROTECTED]>  Sat, 12 Apr 2008 04:52:10 +0100
+
 gnome-orca (2.22.1-1) unstable; urgency=low
 
   * Add debian/patches/04_solaris_specific_fixes.patch again.
diff -Nru /tmp/zmBwSqMgsl/gnome-orca-2.22.1/debian/patches/04_bashisms.patch 
/tmp/nJBeY9AkFV/gnome-orca-2.22.1/debian/patches/04_bashisms.patch
--- gnome-orca-2.22.1/debian/patches/04_bashisms.patch  1970-01-01 
01:00:00.000000000 +0100
+++ gnome-orca-2.22.1/debian/patches/04_bashisms.patch  2008-04-12 
04:53:23.000000000 +0100
@@ -0,0 +1,21 @@
+diff -urNad gnome-orca-2.22.0.orig/src/orca/orca.in 
gnome-orca-2.22.0/src/orca/orca.in
+--- gnome-orca-2.22.0.orig/src/orca/orca.in    2008-04-08 07:37:27.000000000 
+0100
++++ gnome-orca-2.22.0/src/orca/orca.in 2008-04-08 07:41:36.000000000 +0100
+@@ -258,7 +258,7 @@
+ then
+     main
+ else
+-    if [ `grep -c "\-q" <<< $ARGS` -gt 0 ]
++    if echo "$ARGS" | grep -- "-q" > /dev/null
+     then
+         cleanup
+     else
+@@ -270,7 +270,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

signature.asc
Description: PGP signature