[SCM] ladish/master: Fix in-terminal commands execution (Closes: #626481).

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c081f3741e7df0085472cf2a0ae8993884dcb3ff
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu May 12 12:47:36 2011 +0200

    Fix in-terminal commands execution (Closes: #626481).
    
    - Ladish tries to start commands as $terminal -e "$command $argument"
      but x-terminal-emulator generally expects an executable + arguments,
      not a command string. Plus, this tells the terminal emulator which
      shell to use, rather than letting it decide on its own.
      Patch provided by Dan Muresan.

diff --git a/debian/patches/1004-in_terminal_execution.patch b/debian/patches/1004-in_terminal_execution.patch
new file mode 100644
index 0000000..0f2c456
--- /dev/null
+++ b/debian/patches/1004-in_terminal_execution.patch
@@ -0,0 +1,19 @@
+Author: Dan A. Muresan <danmbox at gmail.com>
+Subject: Fix in-terminal execution for non-xterm
+Bug: http://ladish.org/ticket/179
+Bug-Debian: http://bugs.debian.org/626481
+---
+ daemon/loader.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- ladish.orig/daemon/loader.c
++++ ladish/daemon/loader.c
+@@ -317,7 +317,7 @@ loader_exec_program(
+     argv[i++] = "-e";
+   }
+ 
+-  if (!run_in_terminal || strchr(commandline, '$') != NULL)
++  if (!run_in_terminal || 1) != NULL) /* -e expects an executable not a shell command */
+   {
+     if (!conf_get(LADISH_CONF_KEY_DAEMON_SHELL, argv + i))
+     {
diff --git a/debian/patches/series b/debian/patches/series
index 50c3c3b..e6709b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-disable_stacktrace.patch
 0002-desktop_file.patch
 0003-save_as_dialog_avoid_multiplied_emits.patch
+1004-in_terminal_execution.patch

-- 
ladish packaging