[Pkg-xfce-commits] r3916 - in desktop/trunk/xfce4-settings/debian: . patches

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2010-03-27 22:23:47 +0000 (Sat, 27 Mar 2010)
New Revision: 3916

Added:
   desktop/trunk/xfce4-settings/debian/patches/
   desktop/trunk/xfce4-settings/debian/patches/0001-Port-to-libxklavier-5.0-API.patch
   desktop/trunk/xfce4-settings/debian/patches/series
Modified:
   desktop/trunk/xfce4-settings/debian/changelog
   desktop/trunk/xfce4-settings/debian/control
   desktop/trunk/xfce4-settings/debian/rules
Log:
* debian/patches/0001-Port-to-libxklavier-5.0-API.patch added.
* debian/patches/series: enable this patch.
* debian/control: b-dep on quilt (>= 0.46-7), bump libxklavier-dev b-dep
  to >= 5.0.
* debian/rules: pass --with quilt.

Modified: desktop/trunk/xfce4-settings/debian/changelog
===================================================================
--- desktop/trunk/xfce4-settings/debian/changelog	2010-03-27 22:23:00 UTC (rev 3915)
+++ desktop/trunk/xfce4-settings/debian/changelog	2010-03-27 22:23:47 UTC (rev 3916)
@@ -1,3 +1,13 @@
+xfce4-settings (4.6.4-2) UNRELEASED; urgency=low
+
+  * debian/patches/0001-Port-to-libxklavier-5.0-API.patch added.
+  * debian/patches/series: enable this patch.
+  * debian/control: b-dep on quilt (>= 0.46-7), bump libxklavier-dev b-dep
+    to >= 5.0.
+  * debian/rules: pass --with quilt.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Sat, 27 Mar 2010 23:12:59 +0100
+
 xfce4-settings (4.6.4-1) unstable; urgency=low
 
   [ Lionel Le Folgoc ]

Modified: desktop/trunk/xfce4-settings/debian/control
===================================================================
--- desktop/trunk/xfce4-settings/debian/control	2010-03-27 22:23:00 UTC (rev 3915)
+++ desktop/trunk/xfce4-settings/debian/control	2010-03-27 22:23:47 UTC (rev 3916)
@@ -5,8 +5,8 @@
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
 Build-Depends: debhelper (>= 7.0.50), libxfce4util-dev (>= 4.6.0),
  libxfcegui4-dev (>= 4.6.0), libexo-0.3-dev (>= 0.3.100), libglade2-dev,
- libxfconf-0-dev, libwnck-dev, libxklavier-dev, libnotify-dev, 
- intltool (>= 0.31)
+ libxfconf-0-dev, libwnck-dev, libxklavier-dev (>= 5.0), libnotify-dev, 
+ intltool (>= 0.31), quilt (>= 0.46-7)
 Standards-Version: 3.8.3
 Homepage: http://www.xfce.org
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-settings

Added: desktop/trunk/xfce4-settings/debian/patches/0001-Port-to-libxklavier-5.0-API.patch
===================================================================
--- desktop/trunk/xfce4-settings/debian/patches/0001-Port-to-libxklavier-5.0-API.patch	                        (rev 0)
+++ desktop/trunk/xfce4-settings/debian/patches/0001-Port-to-libxklavier-5.0-API.patch	2010-03-27 22:23:47 UTC (rev 3916)
@@ -0,0 +1,34 @@
+From 8e1ce14a33351f2664678f945c7050e42529c5d4 Mon Sep 17 00:00:00 2001
+From: Lionel Le Folgoc <mrpouit at ubuntu.com>
+Date: Mon, 25 Jan 2010 21:02:53 +0100
+Subject: [PATCH] Port to libxklavier 5.0 API.
+
+Patch slightly modified for Xubuntu to add POTFILES.skip.
+
+---
+ dialogs/keyboard-settings/xfce-keyboard-settings.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c b/dialogs/keyboard-settings/xfce-keyboard-settings.c
+index 631dc69..0e36375 100644
+--- a/dialogs/keyboard-settings/xfce-keyboard-settings.c
++++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c
+@@ -395,7 +395,7 @@ xfce_keyboard_settings_finalize (GObject *object)
+ 
+ #ifdef HAVE_LIBXKLAVIER
+   /* Stop xklavier engine */
+-  xkl_engine_stop_listen (settings->priv->xkl_engine);
++  xkl_engine_stop_listen (settings->priv->xkl_engine, XKLL_TRACK_KEYBOARD_STATE);
+ #endif /* HAVE_LIBXKLAVIER */
+ 
+   g_object_unref (G_OBJECT (settings->priv->provider));
+diff --git a/po/POTFILES.skip b/po/POTFILES.skip
+new file mode 100644
+index 0000000..0e36375
+--- /dev/null
++++ b/po/POTFILES.skip
+@@ -0,0 +1,1 @@
++.pc/0001-Port-to-libxklavier-5.0-API.patch/dialogs/keyboard-settings/xfce-keyboard-settings.c
+-- 
+1.6.3.3
+

Added: desktop/trunk/xfce4-settings/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-settings/debian/patches/series	                        (rev 0)
+++ desktop/trunk/xfce4-settings/debian/patches/series	2010-03-27 22:23:47 UTC (rev 3916)
@@ -0,0 +1 @@
+0001-Port-to-libxklavier-5.0-API.patch

Modified: desktop/trunk/xfce4-settings/debian/rules
===================================================================
--- desktop/trunk/xfce4-settings/debian/rules	2010-03-27 22:23:00 UTC (rev 3915)
+++ desktop/trunk/xfce4-settings/debian/rules	2010-03-27 22:23:47 UTC (rev 3916)
@@ -9,4 +9,4 @@
 	dh_installman debian/*.1
 
 %:
-	dh $@
+	dh --with quilt $@