xfce4-xkb-plugin: Update to 0.5.4.0

6 files changed, 9 insertions, 27 deletions

diff --git a/xfce-plugins/xfce4-xkb-plugin/DETAILS b/xfce-plugins/xfce4-xkb-plugin/DETAILS
index bdd78b0ccf..46dd102bbd 100755
--- a/xfce-plugins/xfce4-xkb-plugin/DETAILS
+++ b/xfce-plugins/xfce4-xkb-plugin/DETAILS
@@ -1,8 +1,8 @@
            SPELL=xfce4-xkb-plugin
-         VERSION=0.5.3.3
-          SOURCE=$SPELL-$VERSION.tar.gz
+         VERSION=0.5.4.0
+          SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://goodies.xfce.org/releases/$SPELL/$SOURCE
+   SOURCE_URL[0]=http://archive.xfce.org/src/panel-plugins/$SPELL/${VERSION%.*.*}/$SOURCE
         WEB_SITE=http://xfce-goodies.berlios.de
       SOURCE_GPG="gurus.gpg:$SOURCE.sig"
       LICENSE[0]=BSD
diff --git a/xfce-plugins/xfce4-xkb-plugin/HISTORY b/xfce-plugins/xfce4-xkb-plugin/HISTORY
index 0fd5b86b93..f8fa2060fa 100644
--- a/xfce-plugins/xfce4-xkb-plugin/HISTORY
+++ b/xfce-plugins/xfce4-xkb-plugin/HISTORY
@@ -1,3 +1,9 @@
+2010-04-23 Ismael Luceno <ismael@sourcemage.org>
+	* DETAILS: Updated to version 0.5.4.0
+	  fixed SOURCE_URL[0]
+	* xfce4-xkb-plugin-0.5.3.3-libxklavier.patch: Removed, already applied
+	  upstream
+
 2009-09-27 George Sherwood <gsherwood@sourcemage.org>
 	* PRE_BUILD: Added to apply Gentoo patch
 	* xfce4-xkb-plugin-0.5.3.3-libxklavier.patch: Gentoo patch to
diff --git a/xfce-plugins/xfce4-xkb-plugin/PRE_BUILD b/xfce-plugins/xfce4-xkb-plugin/PRE_BUILD
deleted file mode 100755
index 0fec640b39..0000000000
--- a/xfce-plugins/xfce4-xkb-plugin/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch
diff --git a/xfce-plugins/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch b/xfce-plugins/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch
deleted file mode 100644
index eb123f2783..0000000000
--- a/xfce-plugins/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur panel-plugin/xkb-config.c panel-plugin/xkb-config.c
---- panel-plugin/xkb-config.c	2009-03-06 15:16:03.000000000 +0200
-+++ panel-plugin/xkb-config.c	2009-07-20 18:40:34.000000000 +0300
-@@ -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 ();
- 
-@@ -547,7 +547,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;
- }
diff --git a/xfce-plugins/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3.tar.gz.sig b/xfce-plugins/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3.tar.gz.sig
deleted file mode 100644
index 1bab5b86fc..0000000000
--- a/xfce-plugins/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3.tar.gz.sig
+++ /dev/null
diff --git a/xfce-plugins/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.4.0.tar.bz2.sig b/xfce-plugins/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.4.0.tar.bz2.sig
new file mode 100644
index 0000000000..9031e80f56
--- /dev/null
+++ b/xfce-plugins/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.4.0.tar.bz2.sig