[SCM] Synaptiks packaging repository, a touchpad configuration utility used in KDE branch, master, updated. debian/0.8.1-1-5-g3e9ffc0

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/synaptiks.git;a=commitdiff;h=3e9ffc0

The following commit has been merged in the master branch:
commit 3e9ffc0032678bf118e1ad26077c4b7368e13071
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Sep 16 10:49:11 2013 -0300

    Fix xinput detection.
---
 debian/changelog                     |    2 ++
 debian/patches/series                |    1 +
 debian/patches/xinput_version_detect |   17 +++++++++++++++++
 3 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7ffcae2..303dce4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ synaptiks (0.8.1-2) UNRELEASED; urgency=low
     from upstream and modified by Ubuntu. Fixes crashes by accessing features
     that were removed from synaptics 1.7 (Closes: #722058).
     Thanks Philip Muskovac from Ubuntu.
+  * Add xinput_version_detect patch to fix xinput detection. Thanks
+    Scott Kitterman for the patch.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sat, 19 May 2012 16:22:16 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 2a166c7..46c4ffb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+xinput_version_detect
 0001-Remove-several-features-that-will-no-longer-be-expos.patch
diff --git a/debian/patches/xinput_version_detect b/debian/patches/xinput_version_detect
new file mode 100644
index 0000000..89afaf8
--- /dev/null
+++ b/debian/patches/xinput_version_detect
@@ -0,0 +1,17 @@
+Description: Fix xinput version detection
+  Fix xinput version detection that renders kde-config-touchpad unusable
+Author: Scott Kitterman <scott at kitterman.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1039261
+Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+
+--- synaptiks-0.8.1.orig/synaptiks/x11/input.py
++++ synaptiks-0.8.1/synaptiks/x11/input.py
+@@ -143,7 +143,7 @@ def assert_xinput_version(display):
+ 
+     Raise :exc:`XInputVersionError`, if the version isn't sufficient.
+     """
+-    matched, actual_version = xinput.query_version(display, (2, 0))
++    matched, actual_version = xinput.query_version(display.from_name(), (2, 0))
+     if not matched:
+         raise XInputVersionError((2, 0), actual_version)
+ 

-- 
Synaptiks packaging repository, a touchpad configuration utility used in KDE