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

[Yves-Alexis Perez]

Author: corsac
Date: 2009-06-25 18:50:09 +0000 (Thu, 25 Jun 2009)
New Revision: 3339

Added:
   desktop/trunk/xfce4-panel/debian/patches/02_fix-session-restart-command.patch
Modified:
   desktop/trunk/xfce4-panel/debian/changelog
   desktop/trunk/xfce4-panel/debian/control
   desktop/trunk/xfce4-panel/debian/patches/series
Log:
* debian/patches/
  - 02_fix-session-restart-command added, fix panel command saved in
    session to not use -r arg.
* debian/control:
  - bump standards version to 3.8.2.

Modified: desktop/trunk/xfce4-panel/debian/changelog
===================================================================
--- desktop/trunk/xfce4-panel/debian/changelog	2009-06-24 06:42:46 UTC (rev 3338)
+++ desktop/trunk/xfce4-panel/debian/changelog	2009-06-25 18:50:09 UTC (rev 3339)
@@ -1,3 +1,13 @@
+xfce4-panel (4.6.1-3) UNRELEASED; urgency=low
+
+  * debian/patches/
+    - 02_fix-session-restart-command added, fix panel command saved in
+      session to not use -r arg.
+  * debian/control:
+    - bump standards version to 3.8.2.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 25 Jun 2009 20:24:35 +0200
+
 xfce4-panel (4.6.1-2) unstable; urgency=low
 
   * debian/patches:

Modified: desktop/trunk/xfce4-panel/debian/control
===================================================================
--- desktop/trunk/xfce4-panel/debian/control	2009-06-24 06:42:46 UTC (rev 3338)
+++ desktop/trunk/xfce4-panel/debian/control	2009-06-25 18:50:09 UTC (rev 3339)
@@ -7,7 +7,7 @@
  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, quilt
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-panel/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-panel/

Added: desktop/trunk/xfce4-panel/debian/patches/02_fix-session-restart-command.patch
===================================================================
--- desktop/trunk/xfce4-panel/debian/patches/02_fix-session-restart-command.patch	                        (rev 0)
+++ desktop/trunk/xfce4-panel/debian/patches/02_fix-session-restart-command.patch	2009-06-25 18:50:09 UTC (rev 3339)
@@ -0,0 +1,17 @@
+Index: a/panel/panel-app.c
+===================================================================
+--- a/panel/panel-app.c	(revision 29939)
++++ a/panel/panel-app.c	(working copy)
+@@ -710,10 +710,9 @@
+                  TRUE);
+ 
+     /* session management */
+-    restart_command    = g_new (gchar *, 3);
++    restart_command    = g_new (gchar *, 2);
+     restart_command[0] = g_strdup ("xfce4-panel");
+-    restart_command[1] = g_strdup ("-r");
+-    restart_command[2] = NULL;
++    restart_command[1] = NULL;
+ 
+     panel_app.session_client = 
+         client_session_new_full (NULL, 

Modified: desktop/trunk/xfce4-panel/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-panel/debian/patches/series	2009-06-24 06:42:46 UTC (rev 3338)
+++ desktop/trunk/xfce4-panel/debian/patches/series	2009-06-25 18:50:09 UTC (rev 3339)
@@ -1 +1,2 @@
 01_use-exo-open-for-terminal.patch
+02_fix-session-restart-command.patch