[Pkg-xfce-commits] r3974 - in desktop/branches/experimental/xfce4-settings/debian: . patches source

Fri Apr 30 05:47:43 UTC 2010

Author: corsac
Date: 2010-04-30 05:47:34 +0000 (Fri, 30 Apr 2010)
New Revision: 3974

Added:
   desktop/branches/experimental/xfce4-settings/debian/patches/
   desktop/branches/experimental/xfce4-settings/debian/patches/01_fix-pluggable-dialogs.patch
   desktop/branches/experimental/xfce4-settings/debian/patches/02-Port-to-libxklavier-5.0-API.patch
   desktop/branches/experimental/xfce4-settings/debian/patches/series
   desktop/branches/experimental/xfce4-settings/debian/source/
   desktop/branches/experimental/xfce4-settings/debian/source/format
Modified:
   desktop/branches/experimental/xfce4-settings/debian/changelog
   desktop/branches/experimental/xfce4-settings/debian/control
Log:
  - 01_fix-pluggable-dialogs added, fix pluggable dialogs.
  - 02-Port-to-libxklavier-5.0-API added, fix build against new
    libxklavier.
  - update standards version to 3.8.4.
* source/format added, switch to 3.0 (quilt).
* 

Modified: desktop/branches/experimental/xfce4-settings/debian/changelog
===================================================================

--- desktop/branches/experimental/xfce4-settings/debian/changelog	2010-04-28 20:42:52 UTC (rev 3973)
+++ desktop/branches/experimental/xfce4-settings/debian/changelog	2010-04-30 05:47:34 UTC (rev 3974)
@@ -3,12 +3,18 @@
   * New upstream development release.
   * debian/patches:
     - 01_xi2-support dropped.
+    - 01_fix-pluggable-dialogs added, fix pluggable dialogs.
+    - 02-Port-to-libxklavier-5.0-API added, fix build against new
+      libxklavier.
   * drop quilt support.
   * debian/control:
     - bump exo build-dep to exo-1 0.5.1.
     - switch libxfcegui4 build-dep to libxfce4ui. 
+    - update standards version to 3.8.4.
+  * source/format added, switch to 3.0 (quilt).
+  * 
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 09 Jan 2010 17:40:40 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 29 Apr 2010 22:26:34 +0200
 
 xfce4-settings (4.6.3-3) unstable; urgency=low
 

Modified: desktop/branches/experimental/xfce4-settings/debian/control
===================================================================
--- desktop/branches/experimental/xfce4-settings/debian/control	2010-04-28 20:42:52 UTC (rev 3973)
+++ desktop/branches/experimental/xfce4-settings/debian/control	2010-04-30 05:47:34 UTC (rev 3974)
@@ -5,9 +5,9 @@
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
 Build-Depends: debhelper (>= 7.0.50), libxfce4util-dev (>= 4.6.0),
  libxfce4ui-1-dev (>= 4.7.0), libexo-1-dev (>= 0.5.0), 
- libxfconf-0-dev, libwnck-dev, libxklavier-dev, libnotify-dev, 
+ libxfconf-0-dev, libwnck-dev, libxklavier-dev (>= 5.0), libnotify-dev, 
  intltool (>= 0.31)
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://www.xfce.org
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfconf
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfconf/

Added: desktop/branches/experimental/xfce4-settings/debian/patches/01_fix-pluggable-dialogs.patch
===================================================================
--- desktop/branches/experimental/xfce4-settings/debian/patches/01_fix-pluggable-dialogs.patch	                        (rev 0)
+++ desktop/branches/experimental/xfce4-settings/debian/patches/01_fix-pluggable-dialogs.patch	2010-04-30 05:47:34 UTC (rev 3974)
@@ -0,0 +1,26 @@
+commit 9f638c08207ace0ebc224b0d2d313748bf6c416d
+Author: Nick Schermer <nick at xfce.org>
+Date:   Thu Apr 29 21:48:03 2010 +0200
+
+    Fix pluggable dialogs (bug #6138).
+
+diff --git a/xfce4-settings-manager/xfce-settings-manager-dialog.c b/xfce4-settings-manager/xfce-settings-manager-dialog.c
+index 43d06c4..62920d8 100644
+--- a/xfce4-settings-manager/xfce-settings-manager-dialog.c
++++ b/xfce4-settings-manager/xfce-settings-manager-dialog.c
+@@ -587,7 +587,7 @@ xfce_settings_manager_dialog_item_activated(ExoIconView *iconview,
+ 
+         /* Try to spawn the dialog */
+         if(!xfce_spawn_command_line_on_screen(gtk_widget_get_screen(GTK_WIDGET(iconview)),
+-                                              exec, FALSE, snotify, &error))
++                                              command, FALSE, snotify, &error))
+         {
+             /* Spawning failed, go back to the overview */
+             xfce_settings_manager_dialog_recreate_socket(dialog);
+diff --git a/po/POTFILES.skip b/po/POTFILES.skip
+new file mode 100644
+index 0000000..0557097
+--- /dev/null
++++ b/po/POTFILES.skip
+@@ -0,0 +1 @@
++.pc/01_fix-pluggable-dialogs.patch/xfce4-settings-manager/xfce-settings-manager-dialog.c

Added: desktop/branches/experimental/xfce4-settings/debian/patches/02-Port-to-libxklavier-5.0-API.patch
===================================================================
--- desktop/branches/experimental/xfce4-settings/debian/patches/02-Port-to-libxklavier-5.0-API.patch	                        (rev 0)
+++ desktop/branches/experimental/xfce4-settings/debian/patches/02-Port-to-libxklavier-5.0-API.patch	2010-04-30 05:47:34 UTC (rev 3974)
@@ -0,0 +1,31 @@
+From 8e1ce14a33351f2664678f945c7050e42529c5d4 Mon Sep 17 00:00:00 2001
+From: Lionel Le Folgoc <mrpouit at ubuntu.com>
+Date: Mon, 25 Jan 2010 21:02:53 +0100
+Subject: [PATCH] Port to libxklavier 5.0 API.
+
+Patch slightly modified for Xubuntu to add POTFILES.skip.
+
+---
+ dialogs/keyboard-settings/xfce-keyboard-settings.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c b/dialogs/keyboard-settings/xfce-keyboard-settings.c
+index 631dc69..0e36375 100644
+--- a/dialogs/keyboard-settings/xfce-keyboard-settings.c
++++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c
+@@ -395,7 +395,7 @@ xfce_keyboard_settings_finalize (GObject *object)
+ 
+ #ifdef HAVE_LIBXKLAVIER
+   /* Stop xklavier engine */
+-  xkl_engine_stop_listen (settings->priv->xkl_engine);
++  xkl_engine_stop_listen (settings->priv->xkl_engine, XKLL_TRACK_KEYBOARD_STATE);
+ #endif /* HAVE_LIBXKLAVIER */
+ 
+   g_object_unref (G_OBJECT (settings->priv->provider));
+diff --git a/po/POTFILES.skip b/po/POTFILES.skip
+index 0557097..9187ca9 100644
+--- a/po/POTFILES.skip
++++ b/po/POTFILES.skip
+@@ -1 +1,2 @@
+ .pc/01_fix-pluggable-dialogs.patch/xfce4-settings-manager/xfce-settings-manager-dialog.c
++.pc/02-Port-to-libxklavier-5.0-API.patch/dialogs/keyboard-settings/xfce-keyboard-settings.c

Added: desktop/branches/experimental/xfce4-settings/debian/patches/series
===================================================================
--- desktop/branches/experimental/xfce4-settings/debian/patches/series	                        (rev 0)
+++ desktop/branches/experimental/xfce4-settings/debian/patches/series	2010-04-30 05:47:34 UTC (rev 3974)
@@ -0,0 +1,2 @@
+01_fix-pluggable-dialogs.patch
+02-Port-to-libxklavier-5.0-API.patch

Added: desktop/branches/experimental/xfce4-settings/debian/source/format
===================================================================
--- desktop/branches/experimental/xfce4-settings/debian/source/format	                        (rev 0)
+++ desktop/branches/experimental/xfce4-settings/debian/source/format	2010-04-30 05:47:34 UTC (rev 3974)
@@ -0,0 +1 @@
+3.0 (quilt)


