From ee90b46327cd2189809367b301b57a7ff8043175 Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Mon, 9 Nov 2009 23:21:09 +0100
Subject: maj libgnomekbd#2.28.0-1

---
 gnome/libgnomekbd/.footprint                            | 17 +++++++++--------
 gnome/libgnomekbd/.md5sum                               |  2 +-
 gnome/libgnomekbd/Pkgfile                               |  8 +++-----
 .../libgnomekbd/libgnomekbd-2.26.0-libklavier-4.0.patch | 11 -----------
 4 files changed, 13 insertions(+), 25 deletions(-)
 delete mode 100644 gnome/libgnomekbd/libgnomekbd-2.26.0-libklavier-4.0.patch

diff --git a/gnome/libgnomekbd/.footprint b/gnome/libgnomekbd/.footprint
index 78b44df03..0aaa1a418 100644
--- a/gnome/libgnomekbd/.footprint
+++ b/gnome/libgnomekbd/.footprint
@@ -17,14 +17,14 @@ drwxr-xr-x	root/root	usr/include/libgnomekbd/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libgnomekbd.a
 -rwxr-xr-x	root/root	usr/lib/libgnomekbd.la
-lrwxrwxrwx	root/root	usr/lib/libgnomekbd.so -> libgnomekbd.so.3.0.0
-lrwxrwxrwx	root/root	usr/lib/libgnomekbd.so.3 -> libgnomekbd.so.3.0.0
--rwxr-xr-x	root/root	usr/lib/libgnomekbd.so.3.0.0
+lrwxrwxrwx	root/root	usr/lib/libgnomekbd.so -> libgnomekbd.so.4.0.0
+lrwxrwxrwx	root/root	usr/lib/libgnomekbd.so.4 -> libgnomekbd.so.4.0.0
+-rwxr-xr-x	root/root	usr/lib/libgnomekbd.so.4.0.0
 -rw-r--r--	root/root	usr/lib/libgnomekbdui.a
 -rwxr-xr-x	root/root	usr/lib/libgnomekbdui.la
-lrwxrwxrwx	root/root	usr/lib/libgnomekbdui.so -> libgnomekbdui.so.3.0.0
-lrwxrwxrwx	root/root	usr/lib/libgnomekbdui.so.3 -> libgnomekbdui.so.3.0.0
--rwxr-xr-x	root/root	usr/lib/libgnomekbdui.so.3.0.0
+lrwxrwxrwx	root/root	usr/lib/libgnomekbdui.so -> libgnomekbdui.so.4.0.0
+lrwxrwxrwx	root/root	usr/lib/libgnomekbdui.so.4 -> libgnomekbdui.so.4.0.0
+-rwxr-xr-x	root/root	usr/lib/libgnomekbdui.so.4.0.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libgnomekbd.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libgnomekbdui.pc
@@ -32,8 +32,9 @@ drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/gkbd-indicator-plugins-capplet.desktop
 drwxr-xr-x	root/root	usr/share/libgnomekbd/
-drwxr-xr-x	root/root	usr/share/libgnomekbd/glade/
--rw-r--r--	root/root	usr/share/libgnomekbd/glade/gkbd-indicator-plugins.glade
+drwxr-xr-x	root/root	usr/share/libgnomekbd/ui/
+-rw-r--r--	root/root	usr/share/libgnomekbd/ui/gkbd-indicator-plugins.ui
+-rw-r--r--	root/root	usr/share/libgnomekbd/ui/gkbd-indicator-plugins_add.ui
 drwxr-xr-x	root/root	usr/share/locale/
 drwxr-xr-x	root/root	usr/share/locale/fr/
 drwxr-xr-x	root/root	usr/share/locale/fr/LC_MESSAGES/
diff --git a/gnome/libgnomekbd/.md5sum b/gnome/libgnomekbd/.md5sum
index d109cce03..47c4839e3 100644
--- a/gnome/libgnomekbd/.md5sum
+++ b/gnome/libgnomekbd/.md5sum
@@ -1,2 +1,2 @@
 c92a8c110aa09e6ed982ee4929351c12  libgnomekbd-2.26.0-libklavier-4.0.patch
-aee58c088c4fd980e1bf813ea813c156  libgnomekbd-2.26.0.tar.bz2
+b0989c4a2dbe2b5dd892d14195674f2b  libgnomekbd-2.28.0.tar.bz2
diff --git a/gnome/libgnomekbd/Pkgfile b/gnome/libgnomekbd/Pkgfile
index d23a36613..90117be6b 100644
--- a/gnome/libgnomekbd/Pkgfile
+++ b/gnome/libgnomekbd/Pkgfile
@@ -2,17 +2,15 @@
 # URL: http://www.gnome.org/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: libxklavier, libgnomeui
+# Depends on: libxklavier, libgnomeui, intltool
 
 name=libgnomekbd
-version=2.26.0
+version=2.28.0
 release=1
-source=(http://ftp.gnome.org/pub/gnome/sources/$name/2.26/$name-$version.tar.bz2\
- libgnomekbd-2.26.0-libklavier-4.0.patch)
+source=(http://ftp.gnome.org/pub/gnome/sources/$name/${version%.*}/$name-$version.tar.bz2)
 
 build() {
 	cd $name-$version
-	patch -Np1 -i ../libgnomekbd-2.26.0-libklavier-4.0.patch
 	./configure --prefix=$GNOME_PREFIX \
 		--sysconfdir=/etc
 	make
diff --git a/gnome/libgnomekbd/libgnomekbd-2.26.0-libklavier-4.0.patch b/gnome/libgnomekbd/libgnomekbd-2.26.0-libklavier-4.0.patch
deleted file mode 100644
index 6d9be43a9..000000000
--- a/gnome/libgnomekbd/libgnomekbd-2.26.0-libklavier-4.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgnomekbd-2.26.0/libgnomekbd/gkbd-indicator.c.orig	2009-10-21 08:38:10.000000000 +0000
-+++ libgnomekbd-2.26.0/libgnomekbd/gkbd-indicator.c	2009-10-21 08:39:24.000000000 +0000
-@@ -717,7 +717,7 @@
- 	globals.registry =
- 	    xkl_config_registry_get_instance (globals.engine);
- 
--	xkl_config_registry_load (globals.registry);
-+	xkl_config_registry_load (globals.registry,FALSE);
- 
- 	gconf_client = gconf_client_get_default ();
- 
-- 
cgit v1.2.3-70-g09d2