[Pkg-xfce-commits] r4472 - in goodies/branches/experimental/xfce4-xkb-plugin/debian: . patches source
Yves-Alexis Perez
corsac at alioth.debian.org
Fri Nov 5 07:31:21 UTC 2010
Author: corsac
Date: 2010-11-05 19:31:17 +0000 (Fri, 05 Nov 2010)
New Revision: 4472
Added:
goodies/branches/experimental/xfce4-xkb-plugin/debian/patches/series
goodies/branches/experimental/xfce4-xkb-plugin/debian/source/
goodies/branches/experimental/xfce4-xkb-plugin/debian/source/format
Modified:
goodies/branches/experimental/xfce4-xkb-plugin/debian/changelog
goodies/branches/experimental/xfce4-xkb-plugin/debian/patches/01_xklavier_4.0.patch
goodies/branches/experimental/xfce4-xkb-plugin/debian/patches/02_fix-various-segfaults.patch
goodies/branches/experimental/xfce4-xkb-plugin/debian/patches/03_xklavier_5.0.patch
goodies/branches/experimental/xfce4-xkb-plugin/debian/rules
Log:
Switch to 3.0 (quilt) source format.
Modified: goodies/branches/experimental/xfce4-xkb-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-xkb-plugin/debian/changelog 2010-11-05 18:58:20 UTC (rev 4471)
+++ goodies/branches/experimental/xfce4-xkb-plugin/debian/changelog 2010-11-05 19:31:17 UTC (rev 4472)
@@ -2,8 +2,9 @@
* debian/control:
- update standards version to 3.9.1.
+ * Switch to 3.0 (quilt) source format.
- -- Yves-Alexis Perez <corsac at debian.org> Fri, 05 Nov 2010 19:58:07 +0100
+ -- Yves-Alexis Perez <corsac at debian.org> Fri, 05 Nov 2010 19:58:51 +0100
xfce4-xkb-plugin (0.5.3.3-3) unstable; urgency=low
Modified: goodies/branches/experimental/xfce4-xkb-plugin/debian/patches/01_xklavier_4.0.patch
===================================================================
--- goodies/branches/experimental/xfce4-xkb-plugin/debian/patches/01_xklavier_4.0.patch 2010-11-05 18:58:20 UTC (rev 4471)
+++ goodies/branches/experimental/xfce4-xkb-plugin/debian/patches/01_xklavier_4.0.patch 2010-11-05 19:31:17 UTC (rev 4472)
@@ -1,7 +1,8 @@
-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 @@
+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);
@@ -10,7 +11,7 @@
config_item = xkl_config_item_new ();
-@@ -543,7 +543,7 @@
+@@ -547,7 +547,7 @@ xkb_config_get_xkl_registry ()
if (!config) return NULL;
registry = xkl_config_registry_get_instance (config->engine);
Modified: goodies/branches/experimental/xfce4-xkb-plugin/debian/patches/02_fix-various-segfaults.patch
===================================================================
--- goodies/branches/experimental/xfce4-xkb-plugin/debian/patches/02_fix-various-segfaults.patch 2010-11-05 18:58:20 UTC (rev 4471)
+++ goodies/branches/experimental/xfce4-xkb-plugin/debian/patches/02_fix-various-segfaults.patch 2010-11-05 19:31:17 UTC (rev 4472)
@@ -7,11 +7,11 @@
panel-plugin/xkb-config.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
-diff --git a/panel-plugin/xkb-config.c b/panel-plugin/xkb-config.c
-index bff77dd..020e915 100644
---- a/panel-plugin/xkb-config.c
-+++ b/panel-plugin/xkb-config.c
-@@ -290,7 +290,7 @@ xkb_config_update_settings (t_xkb_settings *settings)
+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 2010-11-05 20:18:12.000000000 +0100
++++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c 2010-11-05 20:18:15.000000000 +0100
+@@ -290,7 +290,7 @@ xkb_config_update_settings (t_xkb_settin
if (settings->kbd_config->toggle_option
&& strlen (settings->kbd_config->toggle_option) > 0)
options = g_strdup (settings->kbd_config->toggle_option);
@@ -20,24 +20,7 @@
if (settings->kbd_config->compose_key_position
&& strlen (settings->kbd_config->compose_key_position) > 0)
---
-1.6.3.3
-
-
-From 04022389eee43503381f88f4f14ea76ec4941464 Mon Sep 17 00:00:00 2001
-From: Lionel Le Folgoc <mrpouit at ubuntu.com>
-Date: Mon, 8 Feb 2010 20:28:37 +0100
-Subject: [PATCH 2/2] Fix another segfault.
-
----
- panel-plugin/xkb-config.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/panel-plugin/xkb-config.c b/panel-plugin/xkb-config.c
-index 020e915..8546b31 100644
---- a/panel-plugin/xkb-config.c
-+++ b/panel-plugin/xkb-config.c
-@@ -312,11 +312,11 @@ xkb_config_update_settings (t_xkb_settings *settings)
+@@ -312,11 +312,11 @@ xkb_config_update_settings (t_xkb_settin
{
prefix = g_strsplit(*opt, ":", 2);
if (settings->kbd_config->toggle_option == NULL
@@ -51,6 +34,3 @@
{
settings->kbd_config->compose_key_position = g_strdup (*opt);
}
---
-1.6.3.3
-
Modified: goodies/branches/experimental/xfce4-xkb-plugin/debian/patches/03_xklavier_5.0.patch
===================================================================
--- goodies/branches/experimental/xfce4-xkb-plugin/debian/patches/03_xklavier_5.0.patch 2010-11-05 18:58:20 UTC (rev 4471)
+++ goodies/branches/experimental/xfce4-xkb-plugin/debian/patches/03_xklavier_5.0.patch 2010-11-05 19:31:17 UTC (rev 4472)
@@ -7,10 +7,10 @@
panel-plugin/xkb-config.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
-diff --git a/panel-plugin/xkb-config.c b/panel-plugin/xkb-config.c
-index 352fdf1..bff77dd 100644
---- a/panel-plugin/xkb-config.c
-+++ b/panel-plugin/xkb-config.c
+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 2010-11-05 20:18:15.000000000 +0100
++++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c 2010-11-05 20:18:16.000000000 +0100
@@ -214,7 +214,7 @@ xkb_config_finalize ()
gdk_window_remove_filter (NULL, (GdkFilterFunc) handle_xevent, NULL);
@@ -20,6 +20,3 @@
}
gint
---
-1.6.3.3
-
Added: goodies/branches/experimental/xfce4-xkb-plugin/debian/patches/series
===================================================================
--- goodies/branches/experimental/xfce4-xkb-plugin/debian/patches/series (rev 0)
+++ goodies/branches/experimental/xfce4-xkb-plugin/debian/patches/series 2010-11-05 19:31:17 UTC (rev 4472)
@@ -0,0 +1,3 @@
+01_xklavier_4.0.patch
+02_fix-various-segfaults.patch
+03_xklavier_5.0.patch
Modified: goodies/branches/experimental/xfce4-xkb-plugin/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-xkb-plugin/debian/rules 2010-11-05 18:58:20 UTC (rev 4471)
+++ goodies/branches/experimental/xfce4-xkb-plugin/debian/rules 2010-11-05 19:31:17 UTC (rev 4472)
@@ -1,6 +1,5 @@
#!/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::
Added: goodies/branches/experimental/xfce4-xkb-plugin/debian/source/format
===================================================================
--- goodies/branches/experimental/xfce4-xkb-plugin/debian/source/format (rev 0)
+++ goodies/branches/experimental/xfce4-xkb-plugin/debian/source/format 2010-11-05 19:31:17 UTC (rev 4472)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Pkg-xfce-commits
mailing list