[Pkg-xfce-commits] r5707 - in goodies/trunk/xfce4-xkb-plugin/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2011-04-29 06:03:02 +0000 (Fri, 29 Apr 2011)
New Revision: 5707

Removed:
   goodies/trunk/xfce4-xkb-plugin/debian/patches/02_fix-various-segfaults.patch
   goodies/trunk/xfce4-xkb-plugin/debian/patches/03_xklavier_5.0.patch
   goodies/trunk/xfce4-xkb-plugin/debian/patches/series
Modified:
   goodies/trunk/xfce4-xkb-plugin/debian/changelog
Log:
01_xklavier_4.0, 02_fix-various-segfaults and 03_xklavier_5.0 dropped, 
included upstream.

Modified: goodies/trunk/xfce4-xkb-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-xkb-plugin/debian/changelog	2011-04-29 06:01:57 UTC (rev 5706)
+++ goodies/trunk/xfce4-xkb-plugin/debian/changelog	2011-04-29 06:03:02 UTC (rev 5707)
@@ -2,9 +2,10 @@
 
   * New upstream release.
   * debian/patches:
-    - 01_xklavier_4.0 dropped, included upstream.
+    - 01_xklavier_4.0, 02_fix-various-segfaults and 03_xklavier_5.0 dropped, 
+      included upstream.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Fri, 29 Apr 2011 08:01:19 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 29 Apr 2011 08:02:30 +0200
 
 xfce4-xkb-plugin (0.5.3.3-4) unstable; urgency=low
 

Deleted: goodies/trunk/xfce4-xkb-plugin/debian/patches/02_fix-various-segfaults.patch
===================================================================
--- goodies/trunk/xfce4-xkb-plugin/debian/patches/02_fix-various-segfaults.patch	2011-04-29 06:01:57 UTC (rev 5706)
+++ goodies/trunk/xfce4-xkb-plugin/debian/patches/02_fix-various-segfaults.patch	2011-04-29 06:03:02 UTC (rev 5707)
@@ -1,40 +0,0 @@
-Description: fix various segfaults when adding/removing layouts
-From 2856ccfd12b7d9844538ea43a34e9f7af9e945a6 Mon Sep 17 00:00:00 2001
-From: Lionel Le Folgoc <mrpouit at ubuntu.com>
-Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6945
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=557452
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=567346
-Date: Mon, 8 Feb 2010 20:05:12 +0100
-Subject: [PATCH 1/2] Use g_strdup("") for options, instead of "", because it is later free'd (thus segfaults).
-
----
- panel-plugin/xkb-config.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-Index: xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c
-===================================================================
---- xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-config.c	2010-11-05 20:18:12.000000000 +0100
-+++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c	2010-11-05 20:18:15.000000000 +0100
-@@ -290,7 +290,7 @@ xkb_config_update_settings (t_xkb_settin
-         if (settings->kbd_config->toggle_option
-                 && strlen (settings->kbd_config->toggle_option) > 0)
-             options = g_strdup (settings->kbd_config->toggle_option);
--        else options = "";
-+        else options = g_strdup ("");
- 
-         if (settings->kbd_config->compose_key_position
-                 && strlen (settings->kbd_config->compose_key_position) > 0)
-@@ -312,11 +312,11 @@ xkb_config_update_settings (t_xkb_settin
-     {
-         prefix = g_strsplit(*opt, ":", 2);
-         if (settings->kbd_config->toggle_option == NULL
--                && prefix && strcmp(*prefix, "grp") == 0)
-+                && prefix && *prefix && strcmp(*prefix, "grp") == 0)
-         {
-             settings->kbd_config->toggle_option = g_strdup (*opt);
-         }
--        else if (prefix && strcmp(*prefix, "compose") == 0)
-+        else if (prefix && *prefix && strcmp(*prefix, "compose") == 0)
-         {
-             settings->kbd_config->compose_key_position = g_strdup (*opt);
-         }

Deleted: goodies/trunk/xfce4-xkb-plugin/debian/patches/03_xklavier_5.0.patch
===================================================================
--- goodies/trunk/xfce4-xkb-plugin/debian/patches/03_xklavier_5.0.patch	2011-04-29 06:01:57 UTC (rev 5706)
+++ goodies/trunk/xfce4-xkb-plugin/debian/patches/03_xklavier_5.0.patch	2011-04-29 06:03:02 UTC (rev 5707)
@@ -1,23 +0,0 @@
-From d7fb267dddda9e1b4f43e8e596ab00801a045d1f Mon Sep 17 00:00:00 2001
-From: Lionel Le Folgoc <mrpouit at ubuntu.com>
-Date: Mon, 25 Jan 2010 22:12:16 +0100
-Subject: [PATCH] Port to libxklavier 5.0 API.
-Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6944
-
----
- panel-plugin/xkb-config.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-Index: xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c
-===================================================================
---- xfce4-xkb-plugin-0.5.3.3.orig/panel-plugin/xkb-config.c	2010-11-05 20:18:15.000000000 +0100
-+++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c	2010-11-05 20:18:16.000000000 +0100
-@@ -214,7 +214,7 @@ xkb_config_finalize ()
- 
-     gdk_window_remove_filter (NULL, (GdkFilterFunc) handle_xevent, NULL);
- 
--    xkl_engine_stop_listen (config->engine);
-+    xkl_engine_stop_listen (config->engine, XKLL_TRACK_KEYBOARD_STATE);
- }
- 
- gint

Deleted: goodies/trunk/xfce4-xkb-plugin/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-xkb-plugin/debian/patches/series	2011-04-29 06:01:57 UTC (rev 5706)
+++ goodies/trunk/xfce4-xkb-plugin/debian/patches/series	2011-04-29 06:03:02 UTC (rev 5707)
@@ -1,2 +0,0 @@
-02_fix-various-segfaults.patch
-03_xklavier_5.0.patch