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

[Yves-Alexis Perez]

Author: corsac
Date: 2009-10-10 14:04:53 +0000 (Sat, 10 Oct 2009)
New Revision: 3565

Added:
   goodies/trunk/xfce4-xkb-plugin/debian/patches/
   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/control
   goodies/trunk/xfce4-xkb-plugin/debian/rules
Log:
* debian/control:
  - Build depend on libxklavier >= 4.0.
* debian/rules:
  - Include simple-patchsys.mk.
* debian/patches/01_xklavier_4.0.patch:
  - Port to the libxklavier 4.0 API.

Modified: goodies/trunk/xfce4-xkb-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-xkb-plugin/debian/changelog	2009-10-10 14:04:48 UTC (rev 3564)
+++ goodies/trunk/xfce4-xkb-plugin/debian/changelog	2009-10-10 14:04:53 UTC (rev 3565)
@@ -6,6 +6,14 @@
   [ Yves-Alexis Perez ]
   * debian/watch edited to track Xfce archive reorganisation.
 
+  [Emilio Pozuelo Monfort]
+  * debian/control:
+    - Build depend on libxklavier >= 4.0.
+  * debian/rules:
+    - Include simple-patchsys.mk.
+  * debian/patches/01_xklavier_4.0.patch:
+    - Port to the libxklavier 4.0 API.
+
  -- Yves-Alexis Perez <corsac at debian.org>  Mon, 03 Aug 2009 18:34:15 +0200
 
 xfce4-xkb-plugin (0.5.3.2-1) unstable; urgency=low

Modified: goodies/trunk/xfce4-xkb-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-xkb-plugin/debian/control	2009-10-10 14:04:48 UTC (rev 3564)
+++ goodies/trunk/xfce4-xkb-plugin/debian/control	2009-10-10 14:04:53 UTC (rev 3565)
@@ -5,7 +5,7 @@
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,  Yves-Alexis Perez <corsac at debian.org>
 Build-Depends: autotools-dev, cdbs, debhelper (>= 4.1), libgtk2.0-dev,
   libxfcegui4-dev, xfce4-panel-dev (>= 4.4.1), libxml-parser-perl,
-  libxklavier12-dev, librsvg2-dev, libwnck-dev, intltool
+  libxklavier-dev (>= 4.0), librsvg2-dev, libwnck-dev, intltool
 Standards-Version: 3.8.0
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-xkb-plugin/

Added: goodies/trunk/xfce4-xkb-plugin/debian/patches/01_xklavier_4.0.patch
===================================================================
--- goodies/trunk/xfce4-xkb-plugin/debian/patches/01_xklavier_4.0.patch	                        (rev 0)
+++ goodies/trunk/xfce4-xkb-plugin/debian/patches/01_xklavier_4.0.patch	2009-10-10 14:04:53 UTC (rev 3565)
@@ -0,0 +1,21 @@
+diff -Nur -x '*.orig' -x '*~' xfce4-xkb-plugin-0.5.3.2/panel-plugin/xkb-config.c xfce4-xkb-plugin-0.5.3.2.new/panel-plugin/xkb-config.c
+--- xfce4-xkb-plugin-0.5.3.2/panel-plugin/xkb-config.c	2009-02-03 23:34:18.000000000 +0100
++++ xfce4-xkb-plugin-0.5.3.2.new/panel-plugin/xkb-config.c	2009-10-10 15:47:08.000000000 +0200
+@@ -150,7 +150,7 @@
+     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 ();
+ 
+@@ -543,7 +543,7 @@
+     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/rules
===================================================================
--- goodies/trunk/xfce4-xkb-plugin/debian/rules	2009-10-10 14:04:48 UTC (rev 3564)
+++ goodies/trunk/xfce4-xkb-plugin/debian/rules	2009-10-10 14:04:53 UTC (rev 3565)
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
 binary-post-install/xfce4-weather-plugin::