r9663 - in /desktop/unstable/gnome-orca/debian: control.in patches/04_solaris_specific_fixes.dpatch rules

[kartikm-guest at users.alioth.debian.org]

Author: kartikm-guest
Date: Tue Apr 10 11:37:36 2007
New Revision: 9663

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=9663
Log:
Replaces: gnome-orca (<< 2.17.4-2) now, Putting patch-stamp at proper location ie build-stamp: configure-stamp patch-stamp, Truncating 04_solaris_specific_fixes.dpatch patch to only set -e hack

Modified:
    desktop/unstable/gnome-orca/debian/control.in
    desktop/unstable/gnome-orca/debian/patches/04_solaris_specific_fixes.dpatch
    desktop/unstable/gnome-orca/debian/rules

Modified: desktop/unstable/gnome-orca/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-orca/debian/control.in?rev=9663&op=diff
==============================================================================
--- desktop/unstable/gnome-orca/debian/control.in (original)
+++ desktop/unstable/gnome-orca/debian/control.in Tue Apr 10 11:37:36 2007
@@ -28,7 +28,7 @@
 Architecture: all
 Section: gnome
 Priority: optional
-Replaces: gnome-orca (<= 2.17.4-1)
+Replaces: gnome-orca (<< 2.17.4-2)
 Description: Scriptable screen reader (common files)
  Orca defines a set of default behaviors (reactions to application events) and
  key bindings (reaction to user key presses). These default behaviors and key

Modified: desktop/unstable/gnome-orca/debian/patches/04_solaris_specific_fixes.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-orca/debian/patches/04_solaris_specific_fixes.dpatch?rev=9663&op=diff
==============================================================================
--- desktop/unstable/gnome-orca/debian/patches/04_solaris_specific_fixes.dpatch (original)
+++ desktop/unstable/gnome-orca/debian/patches/04_solaris_specific_fixes.dpatch Tue Apr 10 11:37:36 2007
@@ -22,25 +22,4 @@
  
  # If you set RUNONCE to "true", then this will just run Orca once and quit.
  #
-@@ -54,17 +57,10 @@
- # find wget in the path.  Note also that you can force WATCHDOG=0 if you
- # do not want a background process that periodically pings Orca to see
- # if it is responding.
--#
-+# Simply the way to findout wget!
- IFS=:
--WGETCMD=
--WATCHDOG=0
--for dir in $PATH:/usr/sfw/bin:/usr/local/bin; do
--    test -x "$dir/wget" && {
--        WGETCMD="$dir/wget"
--        WATCHDOG=1
--        break
--    }
--done
-+WGETCMD=`which wget`
-+WATCHDOG=1
- 
- # Cleans up any orca-related processes that might be running,
- # restricting it to those processes owned by the user. These include
 

Modified: desktop/unstable/gnome-orca/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-orca/debian/rules?rev=9663&op=diff
==============================================================================
--- desktop/unstable/gnome-orca/debian/rules (original)
+++ desktop/unstable/gnome-orca/debian/rules Tue Apr 10 11:37:36 2007
@@ -17,14 +17,14 @@
 endif
 
 configure: configure-stamp
-configure-stamp: patch-stamp
+configure-stamp:
 	dh_testdir
 	./configure --prefix=/usr --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var
 	touch $@
 
 build: build-stamp
 
-build-stamp: configure-stamp
+build-stamp: configure-stamp patch-stamp
 	dh_testdir
 	$(MAKE)
 	touch $@