[Pkg-xfce-commits] r1961 - in desktop/trunk/xfce4-utils/debian: . patches

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-04-29 06:41:23 +0000 (Tue, 29 Apr 2008)
New Revision: 1961

Added:
   desktop/trunk/xfce4-utils/debian/patches/03_xfterm4-bug.patch
Modified:
   desktop/trunk/xfce4-utils/debian/changelog
   desktop/trunk/xfce4-utils/debian/patches/series
Log:
debian/patches: 03_xfterm4-bug added, fix bug when trying to run console
application.                                                closes: #439269

Modified: desktop/trunk/xfce4-utils/debian/changelog
===================================================================
--- desktop/trunk/xfce4-utils/debian/changelog	2008-04-29 06:34:03 UTC (rev 1960)
+++ desktop/trunk/xfce4-utils/debian/changelog	2008-04-29 06:41:23 UTC (rev 1961)
@@ -1,3 +1,10 @@
+xfce4-utils (4.4.2-7) UNRELEASED; urgency=low
+
+  * debian/patches: 03_xfterm4-bug added, fix bug when trying to run console
+    application.                                                closes: #439269
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 29 Apr 2008 08:29:16 +0200
+
 xfce4-utils (4.4.2-6) unstable; urgency=low
 
   * debian/control: move dbus to dbus-x11 to make sure dbus-launch is present

Added: desktop/trunk/xfce4-utils/debian/patches/03_xfterm4-bug.patch
===================================================================
--- desktop/trunk/xfce4-utils/debian/patches/03_xfterm4-bug.patch	                        (rev 0)
+++ desktop/trunk/xfce4-utils/debian/patches/03_xfterm4-bug.patch	2008-04-29 06:41:23 UTC (rev 1961)
@@ -0,0 +1,44 @@
+--- a/scripts/xfterm4	2007-11-25 17:45:31.000000000 +0000
++++ b/scripts/xfterm4	2007-11-25 17:45:41.000000000 +0000
+@@ -1,24 +1,15 @@
+ #!/bin/sh
+ 
+ if [ "$1" = "-e" ]; then
+-	if [ -n "$2" ]; then
+-		shift
+-		ESTRING="$@"
+-	else
+-		shift
+-	fi
++	shift
+ fi	
+ 
+ if [ -d "$*" ]; then
+ 	cd "$*"
+-elif [ -x "$*" ]; then
+-	cd `dirname "$*"`
+-	ESTRING="`which pauseme`"
+-	MSTRING="$*"
+-elif [ -f "$*" ]; then
++elif [ -f "$*" -a ! -x "$*" ]; then
+ 	ESTRING="`which less`"
+ 	MSTRING="$*"
+-elif [ "`echo $* | grep "http:/"`" -o "`echo $* | grep "ftp:"`" ]; then
++elif [ "`echo $* | grep "http:/"`" -o "`echo $* | grep "ftp:"`" -a ! -x "$*" ]; then
+ 	# This requires lynx or links. If you don't have it, don't drop URLs.
+ 	if which lynx >/dev/null 2>&1; then
+ 		ESTRING="`which lynx`"
+@@ -26,6 +17,13 @@
+ 		ESTRING="`which links`"
+ 	fi
+ 	MSTRING="$*"
++else
++	if which pauseme >/dev/null 2>&1; then
++		ESTRING="`which pauseme`"
++		MSTRING="$*"
++	else
++		ESTRING="$@"
++	fi
+ fi
+ 
+ if [ x"$ESTRING" = x"" ]; then

Modified: desktop/trunk/xfce4-utils/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-utils/debian/patches/series	2008-04-29 06:34:03 UTC (rev 1960)
+++ desktop/trunk/xfce4-utils/debian/patches/series	2008-04-29 06:41:23 UTC (rev 1961)
@@ -1,2 +1,3 @@
 01_xflock4-test-running-screensaver.patch
 02_use-Xsessions.options-for-ssh-agent-handling.patch
+03_xfterm4-bug.patch