[Pkg-xfce-commits] r3564 - in goodies/trunk/xfkc/debian: . patches

[Yves-Alexis Perez]

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

Added:
   goodies/trunk/xfkc/debian/patches/02_xklavier_4.0.patch
Modified:
   goodies/trunk/xfkc/debian/changelog
   goodies/trunk/xfkc/debian/control
   goodies/trunk/xfkc/debian/watch
Log:
* debian/control:
  - Build depend on libxklavier-dev >= 4.0.
* debian/patches/02_xklavier_4.0.patch:
  - Port xfkc to the libxklavier 4.0 API.
* debian/watch updated to point to correct location.

Modified: goodies/trunk/xfkc/debian/changelog
===================================================================
--- goodies/trunk/xfkc/debian/changelog	2009-10-09 17:08:28 UTC (rev 3563)
+++ goodies/trunk/xfkc/debian/changelog	2009-10-10 14:04:48 UTC (rev 3564)
@@ -1,9 +1,19 @@
 xfkc (0.2-3) UNRELEASED; urgency=low
 
+  [ Evgeni Golov ]
   * Fix Vcs-* fields, they were missing 'trunk' in the path.
 
- -- Evgeni Golov <evgeni at debian.org>  Thu, 11 Jun 2009 10:14:21 +0200
+  [Emilio Pozuelo Monfort]
+  * debian/control:
+    - Build depend on libxklavier-dev >= 4.0.
+  * debian/patches/02_xklavier_4.0.patch:
+    - Port xfkc to the libxklavier 4.0 API.
 
+  [ Yves-Alexis Perez ]
+  * debian/watch updated to point to correct location.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 10 Oct 2009 16:04:20 +0200
+
 xfkc (0.2-2) unstable; urgency=low
 
   [ Stefan Ott ]

Modified: goodies/trunk/xfkc/debian/control
===================================================================
--- goodies/trunk/xfkc/debian/control	2009-10-09 17:08:28 UTC (rev 3563)
+++ goodies/trunk/xfkc/debian/control	2009-10-10 14:04:48 UTC (rev 3564)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Stefan Ott <stefan at ott.net>
-Build-Depends: cdbs, debhelper (>= 4.1), libgtk2.0-dev, libxfcegui4-dev, libxfce4util-dev, libxklavier12-dev (>= 3.0), libxml-parser-perl
+Build-Depends: cdbs, debhelper (>= 4.1), libgtk2.0-dev, libxfcegui4-dev, libxfce4util-dev, libxklavier-dev (>= 4.0), libxml-parser-perl
 Standards-Version: 3.8.0
 Homepage: http://gauvain.tuxfamily.org/code/xfkc.html
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfkc/

Added: goodies/trunk/xfkc/debian/patches/02_xklavier_4.0.patch
===================================================================
--- goodies/trunk/xfkc/debian/patches/02_xklavier_4.0.patch	                        (rev 0)
+++ goodies/trunk/xfkc/debian/patches/02_xklavier_4.0.patch	2009-10-10 14:04:48 UTC (rev 3564)
@@ -0,0 +1,12 @@
+diff -Nur -x '*.orig' -x '*~' xfkc-0.2/src/xfkc.c xfkc-0.2.new/src/xfkc.c
+--- xfkc-0.2/src/xfkc.c	2007-04-09 13:19:03.000000000 +0200
++++ xfkc-0.2.new/src/xfkc.c	2009-10-10 12:26:31.000000000 +0200
+@@ -99,7 +99,7 @@
+ 	
+ 	user_rec_config = xkl_config_rec_new ();
+ 	registry = xkl_config_registry_get_instance (engine);
+-	xkl_config_registry_load (registry);
++	xkl_config_registry_load (registry, FALSE);
+ 
+ 	config_file = xfce_resource_save_location(XFCE_RESOURCE_CONFIG, XFKC_RC_FILE, TRUE);
+ 	rc_file = xfce_rc_simple_open(config_file, TRUE);

Modified: goodies/trunk/xfkc/debian/watch
===================================================================
--- goodies/trunk/xfkc/debian/watch	2009-10-09 17:08:28 UTC (rev 3563)
+++ goodies/trunk/xfkc/debian/watch	2009-10-10 14:04:48 UTC (rev 3564)
@@ -1,2 +1,2 @@
 version=3
-http://gauvain.tuxfamily.org/code/archive/xfkc/ xfkc-(.*).tar.gz
+http://gauvain.pocentek.net/code/xfkc/ xfkc-(.*).tar.gz