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

[Yves-Alexis Perez]

Author: corsac
Date: 2010-09-05 13:41:10 +0000 (Sun, 05 Sep 2010)
New Revision: 4255

Removed:
   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
Modified:
   desktop/branches/experimental/xfce4-settings/debian/changelog
Log:
02-Port-to-libxklavier-5.0-API dropped, included upstream.

Modified: desktop/branches/experimental/xfce4-settings/debian/changelog
===================================================================
--- desktop/branches/experimental/xfce4-settings/debian/changelog	2010-09-05 13:39:48 UTC (rev 4254)
+++ desktop/branches/experimental/xfce4-settings/debian/changelog	2010-09-05 13:41:10 UTC (rev 4255)
@@ -1,9 +1,9 @@
-xfce4-settings (4.7.1-1) UNRELEASED; urgency=low
+xfce4-settings (4.7.2-1) UNRELEASED; urgency=low
 
   [ Yves-Alexis Perez ]
   * New upstream development release.
   * debian/patches:
-    - 01_fix-pluggable-dialogs added, fix pluggable dialogs.
+    - 02-Port-to-libxklavier-5.0-API dropped, included upstream.
   * debian/control:
     - bump exo build-dep to exo-1 0.5.1.
     - switch libxfcegui4 build-dep to libxfce4ui.
@@ -16,7 +16,7 @@
     - call dpkg-buildflags
     - link with --as-needed.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Thu, 29 Apr 2010 22:26:34 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 05 Sep 2010 15:35:02 +0200
 
 xfce4-settings (4.6.4-2) unstable; urgency=low
 

Deleted: desktop/branches/experimental/xfce4-settings/debian/patches/01_fix-pluggable-dialogs.patch
===================================================================
--- desktop/branches/experimental/xfce4-settings/debian/patches/01_fix-pluggable-dialogs.patch	2010-09-05 13:39:48 UTC (rev 4254)
+++ desktop/branches/experimental/xfce4-settings/debian/patches/01_fix-pluggable-dialogs.patch	2010-09-05 13:41:10 UTC (rev 4255)
@@ -1,26 +0,0 @@
-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

Deleted: 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	2010-09-05 13:39:48 UTC (rev 4254)
+++ desktop/branches/experimental/xfce4-settings/debian/patches/02-Port-to-libxklavier-5.0-API.patch	2010-09-05 13:41:10 UTC (rev 4255)
@@ -1,31 +0,0 @@
-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

Deleted: desktop/branches/experimental/xfce4-settings/debian/patches/series
===================================================================
--- desktop/branches/experimental/xfce4-settings/debian/patches/series	2010-09-05 13:39:48 UTC (rev 4254)
+++ desktop/branches/experimental/xfce4-settings/debian/patches/series	2010-09-05 13:41:10 UTC (rev 4255)
@@ -1,2 +0,0 @@
-01_fix-pluggable-dialogs.patch
-02-Port-to-libxklavier-5.0-API.patch