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

mlang at users.alioth.debian.org mlang at users.alioth.debian.org
Mon Apr 21 22:31:03 UTC 2008 

Author: mlang
Date: Mon Apr 21 22:31:03 2008
New Revision: 15741

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

Added:
    desktop/experimental/gnome-orca/
      - copied from r15737, desktop/unstable/gnome-orca/
Modified:
    desktop/experimental/gnome-orca/debian/changelog
    desktop/experimental/gnome-orca/debian/control
    desktop/experimental/gnome-orca/debian/control.in
    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=15741&op=diff
==============================================================================
--- desktop/experimental/gnome-orca/debian/changelog (original)
+++ desktop/experimental/gnome-orca/debian/changelog Mon Apr 21 22:31:03 2008
@@ -1,3 +1,10 @@
+gnome-orca (2.23.1-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/patches/04_solaris_specific_fixes.patch: Update.
+
+ -- Mario Lang <mlang at debian.org>  Tue, 22 Apr 2008 00:29:41 +0200
+
 gnome-orca (2.22.1-2) unstable; urgency=low
 
   * Fix bashisms in orca startup script (Closes: Bug#468681).

Modified: desktop/experimental/gnome-orca/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-orca/debian/control?rev=15741&op=diff
==============================================================================
--- desktop/experimental/gnome-orca/debian/control (original)
+++ desktop/experimental/gnome-orca/debian/control Mon Apr 21 22:31:03 2008
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Mario Lang <mlang at debian.org>
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gnome-orca
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/experimental/gnome-orca
 Build-Depends: cdbs,
                debhelper (>= 5.0.38),
                at-spi,

Modified: desktop/experimental/gnome-orca/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-orca/debian/control.in?rev=15741&op=diff
==============================================================================
--- desktop/experimental/gnome-orca/debian/control.in (original)
+++ desktop/experimental/gnome-orca/debian/control.in Mon Apr 21 22:31:03 2008
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Mario Lang <mlang at debian.org>
 Uploaders: @GNOME_TEAM@
-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gnome-orca
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/experimental/gnome-orca
 Build-Depends: cdbs,
                debhelper (>= 5.0.38),
                at-spi,

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=15741&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 Apr 21 22:31:03 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.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
 @@ -30,7 +30,7 @@
  
  # Set the user's $PATH for this script.
@@ -12,26 +12,26 @@
  
  # If you set RUNONCE to "true", then this will just run Orca once and quit.
  #
-@@ -55,16 +55,8 @@
- # do not want a background process that periodically pings Orca to see
- # if it is responding.
+@@ -58,16 +58,10 @@
  #
--IFS=:
--WGETCMD=
+ IFS=:
+ DBUSSENDCMD=
 -WATCHDOG=0
--for dir in $PATH:/usr/sfw/bin:/usr/local/bin; do
--    test -x "$dir/wget" && {
--        WGETCMD="$dir/wget"
--        WATCHDOG=1
--        break
--    }
--done
 +WATCHDOG=1
-+WGETCMD=`which wget || WATCHDOG=0`
- 
- # 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 @@
+ if [ "x$DBUS_SESSION_BUS_ADDRESS" != "x" ]
+ then
+-    for dir in $PATH:/usr/sfw/bin:/usr/local/bin; do
+-        test -x "$dir/dbus-send" && {
+-            DBUSSENDCMD="$dir/dbus-send"
+-            WATCHDOG=1
+-            break
+-        }
+-    done
++    DBUSSENDCMD=`which dbus-send || WATCHDOG=0`
+ fi
+ # [[WDW - disabled the watchdog by default since it is problematic.]]
+ WATCHDOG=0
+@@ -266,7 +260,7 @@
  then
      main
  else
@@ -40,12 +40,12 @@
      then
          cleanup
      else
-@@ -270,7 +262,7 @@
+@@ -278,7 +272,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
+             runOrca "NO_CLEANUP" &
+             orca_pid=$!

Modified: desktop/experimental/gnome-orca/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-orca/debian/watch?rev=15741&op=diff
==============================================================================
--- desktop/experimental/gnome-orca/debian/watch (original)
+++ desktop/experimental/gnome-orca/debian/watch Mon Apr 21 22:31:03 2008
@@ -1,4 +1,4 @@
 version=3
-http://ftp.gnome.org/pub/GNOME/sources/orca/2.22/ \
+http://ftp.gnome.org/pub/GNOME/sources/orca/2.23/ \
         orca-(.*)\.tar\.gz \
         debian uupdate

More information about the pkg-gnome-commits mailing list