[Pkg-xfce-commits] r3292 - in desktop/trunk/xfce4-panel/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2009-06-09 20:31:12 +0000 (Tue, 09 Jun 2009)
New Revision: 3292

Added:
   desktop/trunk/xfce4-panel/debian/patches/
   desktop/trunk/xfce4-panel/debian/patches/01_use-exo-open-for-terminal.patch
   desktop/trunk/xfce4-panel/debian/patches/series
Modified:
   desktop/trunk/xfce4-panel/debian/changelog
   desktop/trunk/xfce4-panel/debian/control
   desktop/trunk/xfce4-panel/debian/rules
Log:
* debian/patches:
  - 1_use-exo-open-for-terminal added, use exo-open for launchers when
    using “run in terminal” option.
* debian/control:
  - add build-dep on quilt.
* debian/rules:
  - use quilt rules.

Modified: desktop/trunk/xfce4-panel/debian/changelog
===================================================================
--- desktop/trunk/xfce4-panel/debian/changelog	2009-06-09 20:30:58 UTC (rev 3291)
+++ desktop/trunk/xfce4-panel/debian/changelog	2009-06-09 20:31:12 UTC (rev 3292)
@@ -1,3 +1,15 @@
+xfce4-panel (4.6.1-2) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 1_use-exo-open-for-terminal added, use exo-open for launchers when
+      using “run in terminal” option.
+  * debian/control:
+    - add build-dep on quilt.
+  * debian/rules:
+    - use quilt rules.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 09 Jun 2009 21:29:53 +0200
+
 xfce4-panel (4.6.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/trunk/xfce4-panel/debian/control
===================================================================
--- desktop/trunk/xfce4-panel/debian/control	2009-06-09 20:30:58 UTC (rev 3291)
+++ desktop/trunk/xfce4-panel/debian/control	2009-06-09 20:31:12 UTC (rev 3292)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 7), libgtk2.0-dev (>= 2.10.6), bison,
  libxft-dev, libxml2-dev, chrpath, libxfce4util-dev (>= 4.6.0),
  libxfcegui4-dev (>= 4.6.0), libexo-0.3-dev (>= 0.3.100), libwnck-dev,
- libxml-parser-perl, intltool
+ libxml-parser-perl, intltool, quilt
 Standards-Version: 3.8.1
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-panel/

Added: desktop/trunk/xfce4-panel/debian/patches/01_use-exo-open-for-terminal.patch
===================================================================
--- desktop/trunk/xfce4-panel/debian/patches/01_use-exo-open-for-terminal.patch	                        (rev 0)
+++ desktop/trunk/xfce4-panel/debian/patches/01_use-exo-open-for-terminal.patch	2009-06-09 20:31:12 UTC (rev 3292)
@@ -0,0 +1,51 @@
+commit c93aab2fd9fee523593a44a0d79c42832485125e
+Author: nick <nick at a0aa69c2-05f4-0310-b83c-d5d913b14636>
+Date:   Mon May 11 19:44:41 2009 +0000
+
+    Simply append exo-open when running in a terminal. This works properly with the recent fixes in exo-open.
+    
+    
+    git-svn-id: http://svn.xfce.org/svn/xfce/xfce4-panel/trunk@29943 a0aa69c2-05f4-0310-b83c-d5d913b14636
+
+diff --git a/plugins/launcher/launcher-exec.c b/plugins/launcher/launcher-exec.c
+index 5dcdda3..b62e0c1 100644
+--- a/plugins/launcher/launcher-exec.c
++++ b/plugins/launcher/launcher-exec.c
+@@ -264,6 +264,9 @@ launcher_exec_parse_argv (LauncherEntry   *entry,
+     GSList       *li;
+     gchar       **argv = NULL;
+ 
++    if (entry->terminal)
++        g_string_append (command_line, "exo-open --launch TerminalEmulator ");
++
+     /* build the full command */
+     for (p = entry->exec; *p != '\0'; ++p)
+     {
+@@ -377,25 +380,9 @@ launcher_exec_parse_argv (LauncherEntry   *entry,
+ 
+     DBG ("Execute: %s", command_line->str);
+ 
+-    /* create the argv */
++    /* use glib to parge the argv */
+     if (G_LIKELY (command_line->str != NULL))
+-    {
+-        if (entry->terminal == FALSE)
+-        {
+-            /* use glib to parge the argv */
+-            g_shell_parse_argv (command_line->str, NULL, &argv, error);
+-        }
+-        else
+-        {
+-            /* we parse our own argv here so exo-open will handle all attributes without problems */
+-            argv = g_new (gchar *, 5);
+-            argv[0] = g_strdup ("exo-open");
+-            argv[1] = g_strdup ("--launch");
+-            argv[2] = g_strdup ("TerminalEmulator");
+-            argv[3] = g_strdup (command_line->str);
+-            argv[4] = NULL;
+-        }
+-    }
++        g_shell_parse_argv (command_line->str, NULL, &argv, error);
+ 
+     /* cleanup */
+     g_string_free (command_line, TRUE);

Added: desktop/trunk/xfce4-panel/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-panel/debian/patches/series	                        (rev 0)
+++ desktop/trunk/xfce4-panel/debian/patches/series	2009-06-09 20:31:12 UTC (rev 3292)
@@ -0,0 +1 @@
+01_use-exo-open-for-terminal.patch

Modified: desktop/trunk/xfce4-panel/debian/rules
===================================================================
--- desktop/trunk/xfce4-panel/debian/rules	2009-06-09 20:30:58 UTC (rev 3291)
+++ desktop/trunk/xfce4-panel/debian/rules	2009-06-09 20:31:12 UTC (rev 3292)
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+include /usr/share/quilt/quilt.make
+
+
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
@@ -17,14 +20,14 @@
 	dh_testdir
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-final --libexecdir=\$${prefix}/lib
 
-build: build-stamp
+build: patch build-stamp
 build-stamp: config.status
 	
 	dh_testdir
 	$(MAKE)
 	touch build-stamp
 
-clean:
+clean: unpatch
 	
 	dh_testdir
 	dh_testroot