[Pkg-xfce-commits] r5315 - in goodies/trunk/xfce4-xkb-plugin: . debian debian/patches
Yves-Alexis Perez
corsac at alioth.debian.org
Sun Apr 3 12:28:32 UTC 2011
Author: corsac
Date: 2011-04-03 12:28:25 +0000 (Sun, 03 Apr 2011)
New Revision: 5315
Added:
goodies/trunk/xfce4-xkb-plugin/debian/patches/series
goodies/trunk/xfce4-xkb-plugin/debian/source/
Modified:
goodies/trunk/xfce4-xkb-plugin/
goodies/trunk/xfce4-xkb-plugin/debian/changelog
goodies/trunk/xfce4-xkb-plugin/debian/control
goodies/trunk/xfce4-xkb-plugin/debian/patches/01_xklavier_4.0.patch
goodies/trunk/xfce4-xkb-plugin/debian/patches/02_fix-various-segfaults.patch
goodies/trunk/xfce4-xkb-plugin/debian/patches/03_xklavier_5.0.patch
goodies/trunk/xfce4-xkb-plugin/debian/rules
Log:
merge experimental branch into trunk
Property changes on: goodies/trunk/xfce4-xkb-plugin
___________________________________________________________________
Added: svn:mergeinfo
+ /goodies/branches/experimental/xfce4-xkb-plugin:4344-5314
/goodies/tags/xfce4-xkb-plugin/0.5.3.3-3:3937-4343
Modified: goodies/trunk/xfce4-xkb-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-xkb-plugin/debian/changelog 2011-04-03 12:26:48 UTC (rev 5314)
+++ goodies/trunk/xfce4-xkb-plugin/debian/changelog 2011-04-03 12:28:25 UTC (rev 5315)
@@ -1,3 +1,16 @@
+xfce4-xkb-plugin (0.5.3.3-4) UNRELEASED; urgency=low
+
+ * debian/control:
+ - update standards version to 3.9.1.
+ - add build-dep on hardeninc-includes.
+ * Switch to 3.0 (quilt) source format.
+ * debian/rules:
+ - pick {C,LD}FLAGS from dpkg-buildflags.
+ - add -O1, -z,defs and --as-needed to LDFLAGS.
+ - add hardening flags to {C,LD}FLAGS.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Fri, 05 Nov 2010 20:37:50 +0100
+
xfce4-xkb-plugin (0.5.3.3-3) unstable; urgency=low
* debian/patches/03_xklavier_5.0.patch: port to the libxklavier 5.0 API.
Modified: goodies/trunk/xfce4-xkb-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-xkb-plugin/debian/control 2011-04-03 12:26:48 UTC (rev 5314)
+++ goodies/trunk/xfce4-xkb-plugin/debian/control 2011-04-03 12:28:25 UTC (rev 5315)
@@ -6,8 +6,9 @@
Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
Build-Depends: autotools-dev, cdbs, debhelper (>= 7), libgtk2.0-dev,
libxfcegui4-dev, xfce4-panel-dev (>= 4.4.1), libxml-parser-perl,
- libxklavier-dev (>= 5.0), librsvg2-dev, libwnck-dev, intltool
-Standards-Version: 3.8.4
+ libxklavier-dev (>= 5.0), librsvg2-dev, libwnck-dev, intltool,
+ hardening-includes
+Standards-Version: 3.9.1
Homepage: http://goodies.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-xkb-plugin/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-xkb-plugin/
Modified: goodies/trunk/xfce4-xkb-plugin/debian/patches/01_xklavier_4.0.patch
===================================================================
--- goodies/trunk/xfce4-xkb-plugin/debian/patches/01_xklavier_4.0.patch 2011-04-03 12:26:48 UTC (rev 5314)
+++ goodies/trunk/xfce4-xkb-plugin/debian/patches/01_xklavier_4.0.patch 2011-04-03 12:28:25 UTC (rev 5315)
@@ -1,7 +1,11 @@
-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 @@
+Description: port to libxklavier 4.0 API
+From: Emilio Pozuelo Monfort
+Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6944
+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 +14,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/trunk/xfce4-xkb-plugin/debian/patches/02_fix-various-segfaults.patch
===================================================================
--- goodies/trunk/xfce4-xkb-plugin/debian/patches/02_fix-various-segfaults.patch 2011-04-03 12:26:48 UTC (rev 5314)
+++ goodies/trunk/xfce4-xkb-plugin/debian/patches/02_fix-various-segfaults.patch 2011-04-03 12:28:25 UTC (rev 5315)
@@ -1,5 +1,9 @@
+Description: fix various segfaults when adding/removing layouts
From 2856ccfd12b7d9844538ea43a34e9f7af9e945a6 Mon Sep 17 00:00:00 2001
From: Lionel Le Folgoc <mrpouit at ubuntu.com>
+Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6945
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=557452
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=567346
Date: Mon, 8 Feb 2010 20:05:12 +0100
Subject: [PATCH 1/2] Use g_strdup("") for options, instead of "", because it is later free'd (thus segfaults).
@@ -7,11 +11,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 +24,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 +38,3 @@
{
settings->kbd_config->compose_key_position = g_strdup (*opt);
}
---
-1.6.3.3
-
Modified: goodies/trunk/xfce4-xkb-plugin/debian/patches/03_xklavier_5.0.patch
===================================================================
--- goodies/trunk/xfce4-xkb-plugin/debian/patches/03_xklavier_5.0.patch 2011-04-03 12:26:48 UTC (rev 5314)
+++ goodies/trunk/xfce4-xkb-plugin/debian/patches/03_xklavier_5.0.patch 2011-04-03 12:28:25 UTC (rev 5315)
@@ -2,15 +2,16 @@
From: Lionel Le Folgoc <mrpouit at ubuntu.com>
Date: Mon, 25 Jan 2010 22:12:16 +0100
Subject: [PATCH] Port to libxklavier 5.0 API.
+Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6944
---
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 +21,3 @@
}
gint
---
-1.6.3.3
-
Copied: goodies/trunk/xfce4-xkb-plugin/debian/patches/series (from rev 5314, goodies/branches/experimental/xfce4-xkb-plugin/debian/patches/series)
===================================================================
--- goodies/trunk/xfce4-xkb-plugin/debian/patches/series (rev 0)
+++ goodies/trunk/xfce4-xkb-plugin/debian/patches/series 2011-04-03 12:28:25 UTC (rev 5315)
@@ -0,0 +1,3 @@
+01_xklavier_4.0.patch
+02_fix-various-segfaults.patch
+03_xklavier_5.0.patch
Modified: goodies/trunk/xfce4-xkb-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-xkb-plugin/debian/rules 2011-04-03 12:26:48 UTC (rev 5314)
+++ goodies/trunk/xfce4-xkb-plugin/debian/rules 2011-04-03 12:28:25 UTC (rev 5315)
@@ -1,8 +1,16 @@
#!/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
+include /usr/share/hardening-includes/hardening.make
+
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
+CFLAGS+=$(HARDENING_CFLAGS)
+
+export CFLAGS LDFLAGS
+
binary-post-install/xfce4-weather-plugin::
-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.a
-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.la
More information about the Pkg-xfce-commits
mailing list