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

[Yves-Alexis Perez]

Author: corsac
Date: 2011-04-29 06:01:57 +0000 (Fri, 29 Apr 2011)
New Revision: 5706

Removed:
   goodies/trunk/xfce4-xkb-plugin/debian/patches/01_xklavier_4.0.patch
Modified:
   goodies/trunk/xfce4-xkb-plugin/debian/changelog
   goodies/trunk/xfce4-xkb-plugin/debian/patches/series
Log:
* debian/patches:
  - 01_xklavier_4.0 dropped, included upstream.

Modified: goodies/trunk/xfce4-xkb-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-xkb-plugin/debian/changelog	2011-04-29 05:59:46 UTC (rev 5705)
+++ goodies/trunk/xfce4-xkb-plugin/debian/changelog	2011-04-29 06:01:57 UTC (rev 5706)
@@ -1,8 +1,10 @@
 xfce4-xkb-plugin (0.5.4.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * debian/patches:
+    - 01_xklavier_4.0 dropped, included upstream.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Fri, 29 Apr 2011 07:59:23 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 29 Apr 2011 08:01:19 +0200
 
 xfce4-xkb-plugin (0.5.3.3-4) unstable; urgency=low
 

Deleted: goodies/trunk/xfce4-xkb-plugin/debian/patches/01_xklavier_4.0.patch
===================================================================
--- goodies/trunk/xfce4-xkb-plugin/debian/patches/01_xklavier_4.0.patch	2011-04-29 05:59:46 UTC (rev 5705)
+++ goodies/trunk/xfce4-xkb-plugin/debian/patches/01_xklavier_4.0.patch	2011-04-29 06:01:57 UTC (rev 5706)
@@ -1,25 +0,0 @@
-Description: port to libxklavier 4.0 API
-From: Emilio Pozuelo Monfort
-Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6944 
-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	2009-03-06 14:16:03.000000000 +0100
-+++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c	2010-11-05 20:18:12.000000000 +0100
-@@ -150,7 +150,7 @@ xkb_config_initialize_xkb_options (t_xkb
-     config->application_map = g_hash_table_new (g_direct_hash, NULL);
- 
-     registry = xkl_config_registry_get_instance (config->engine);
--    xkl_config_registry_load (registry);
-+    xkl_config_registry_load (registry, FALSE);
-     
-     config_item = xkl_config_item_new ();
- 
-@@ -547,7 +547,7 @@ xkb_config_get_xkl_registry ()
-     if (!config) return NULL;
- 
-     registry = xkl_config_registry_get_instance (config->engine);
--    xkl_config_registry_load (registry);
-+    xkl_config_registry_load (registry, FALSE);
- 
-     return registry;
- }

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