[Pkg-xfce-commits] r3852 - desktop/trunk/xfce4-terminal/debian

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2010-02-08 21:38:55 +0000 (Mon, 08 Feb 2010)
New Revision: 3852

Modified:
   desktop/trunk/xfce4-terminal/debian/changelog
   desktop/trunk/xfce4-terminal/debian/xfce4-terminal.wrapper
Log:
debian/xfce4-terminal.wrapper: stole code from gnome-terminal to match
its behavior on '-x' and '-e'.                              closes: #548166

Modified: desktop/trunk/xfce4-terminal/debian/changelog
===================================================================
--- desktop/trunk/xfce4-terminal/debian/changelog	2010-02-08 21:36:11 UTC (rev 3851)
+++ desktop/trunk/xfce4-terminal/debian/changelog	2010-02-08 21:38:55 UTC (rev 3852)
@@ -1,5 +1,6 @@
 xfce4-terminal (0.4.4git-20100207-c4f18f1-1) UNRELEASED; urgency=low
 
+  [ Yves-Alexis Perez ]
   * New upstream snapshot.
   * debian/control:
     - update standards version to 3.8.4.
@@ -12,8 +13,12 @@
     - link wrapper manpage to the gzipped terminal one. 
     - drop chrpath which seems unneeded anymore. 
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 07 Feb 2010 23:39:11 +0100
+  [ Lionel Le Folgoc ]
+  * debian/xfce4-terminal.wrapper: stole code from gnome-terminal to match
+    its behavior on '-x' and '-e'.                              closes: #548166
 
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Mon, 08 Feb 2010 22:25:19 +0100
+
 xfce4-terminal (0.4.3-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/trunk/xfce4-terminal/debian/xfce4-terminal.wrapper
===================================================================
--- desktop/trunk/xfce4-terminal/debian/xfce4-terminal.wrapper	2010-02-08 21:36:11 UTC (rev 3851)
+++ desktop/trunk/xfce4-terminal/debian/xfce4-terminal.wrapper	2010-02-08 21:38:55 UTC (rev 3852)
@@ -47,8 +47,18 @@
     }
     elsif ($opt eq '-e')
     {
-	push(@args, '-x', @ARGV);
+	$arg = shift(@ARGV);
+    if (@ARGV)
+    {
+        push(@args, '-x', $arg, @ARGV);
+        last;
     }
+    else
+    {
+        push(@args, '-e', $arg);
+    }
+    last;
+    }
     elsif ($opt eq '-h' || $opt eq '--help')
     {
 	push(@args, '--help');