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

[mlang at users.alioth.debian.org]

Author: mlang
Date: Thu Jul  9 08:36:24 2009
New Revision: 20617

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

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

Modified: desktop/experimental/gnome-orca/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-orca/debian/changelog?rev=20617&op=diff
==============================================================================
--- desktop/experimental/gnome-orca/debian/changelog (original)
+++ desktop/experimental/gnome-orca/debian/changelog Thu Jul  9 08:36:24 2009
@@ -1,3 +1,11 @@
+gnome-orca (2.27.3-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/patches/04_solaris_specific_fixes.patch: Mostly merged
+    upstream.
+
+ -- Mario Lang <mlang at debian.org>  Thu, 09 Jul 2009 10:35:46 +0200
+
 gnome-orca (2.27.2-2) experimental; urgency=low
 
   * Fix "gnome-orca_2.27.2-1(hppa/experimental): FTBFS: intltool-update:

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=20617&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 Thu Jul  9 08:36:24 2009
@@ -1,39 +1,13 @@
-The orca startup shell script contains some *isms.
-Remove solaris specific PATH components, use /bin/sh instead of /bin/bash
-and other cleanups.
+Remove solaris specific PATH components.
 
 --- orca-2.24.1/src/orca/orca.in.orig	2008-10-15 00:49:59.000000000 +0200
 +++ orca-2.24.1/src/orca/orca.in	2008-10-21 12:01:22.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # Orca
- #
 @@ -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"
++export PATH="${PATH}:/usr/bin:/usr/sbin:/bin"
  
  # Save the arguments away.
  #
-@@ -137,7 +137,7 @@
-     fi
- fi
- 
--if [ `grep -c "\-q" <<< $ARGS` -gt 0 ] ; then
-+if echo "$ARGS" | grep -- "-q" > /dev/null; then
-     # If the user has done -q or --quit, that means to tell any
-     # existing orca process to quit.  So, we just do a cleanup.
-     #
-@@ -154,7 +154,7 @@
-     if [ "x$ARGS" = "x" ] ; then
-         CLEANUP=1
-     else
--        CLEANUP=`egrep -c "\-s|\-t|\-n|\-u|\-e|\-d" <<< $ARGS`
-+        CLEANUP=`echo "$ARGS" | egrep -c "\-s|\-t|\-n|\-u|\-e|\-d"`
-     fi
- 
-     # Clean up before running orca to get anything that might

Modified: desktop/experimental/gnome-orca/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-orca/debian/watch?rev=20617&op=diff
==============================================================================
--- desktop/experimental/gnome-orca/debian/watch (original)
+++ desktop/experimental/gnome-orca/debian/watch Thu Jul  9 08:36:24 2009
@@ -1,4 +1,4 @@
 version=3
-http://ftp.gnome.org/pub/GNOME/sources/orca/2.26/ \
+http://ftp.gnome.org/pub/GNOME/sources/orca/2.27/ \
         orca-(.*)\.tar\.gz \
         debian uupdate