xserver-xorg-input-synaptics: Changes to 'debian-unstable'
ChangeLog | 20 ++++++++++++++++++++
configure.ac | 2 +-
debian/changelog | 7 +++++++
src/psmcomm.c | 4 ++--
4 files changed, 30 insertions(+), 3 deletions(-)
New commits:
commit 315794c3cd2e33795f5cd0096019c5ca7a740910
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Mar 5 16:26:07 2011 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 4fd7611..027a711 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-input-synaptics (1.4.0-1) UNRELEASED; urgency=low
+xserver-xorg-input-synaptics (1.4.0-1) unstable; urgency=low
* New upstream release:
+ Fix the FTBFS on GNU/kFreeBSD.
- -- Cyril Brulebois <kibi@debian.org> Sat, 05 Mar 2011 16:25:28 +0100
+ -- Cyril Brulebois <kibi@debian.org> Sat, 05 Mar 2011 16:26:01 +0100
xserver-xorg-input-synaptics (1.3.99.901-1) unstable; urgency=low
commit 86f0eac540b96671bb9c80eab182973d52f3c942
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Mar 5 16:25:58 2011 +0100
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index cebefe8..8ae4090 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+commit de0dfb76444ad4160468d00515876c91a9fa20bf
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Mar 4 12:36:24 2011 +1000
+
+ synaptics 1.4.0
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit fefb3b63c589b0758c02777e652f05e537ba663f
+Author: Julien Cristau <jcristau@debian.org>
+Date: Fri Feb 25 20:41:12 2011 +0100
+
+ Fix build on BSD
+
+ local was renamed to pInfo in 81ad2e389d11691d5c2687d83150e8e9033cfe76,
+ but a couple places were missed.
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
commit 8ec84d1850fe801fa9a123ae70e09821a4358389
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 21 12:57:21 2011 +1000
diff --git a/debian/changelog b/debian/changelog
index a57be82..4fd7611 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-synaptics (1.4.0-1) UNRELEASED; urgency=low
+
+ * New upstream release:
+ + Fix the FTBFS on GNU/kFreeBSD.
+
+ -- Cyril Brulebois <kibi@debian.org> Sat, 05 Mar 2011 16:25:28 +0100
+
xserver-xorg-input-synaptics (1.3.99.901-1) unstable; urgency=low
* New upstream release.
commit de0dfb76444ad4160468d00515876c91a9fa20bf
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 4 12:36:24 2011 +1000
synaptics 1.4.0
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index ea66935..c057ffb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-synaptics],
- [1.3.99.901],
+ [1.4.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-synaptics])
AC_CONFIG_SRCDIR([Makefile.am])
commit fefb3b63c589b0758c02777e652f05e537ba663f
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Feb 25 20:41:12 2011 +0100
Fix build on BSD
local was renamed to pInfo in 81ad2e389d11691d5c2687d83150e8e9033cfe76,
but a couple places were missed.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/src/psmcomm.c b/src/psmcomm.c
index 66e8d1e..741cd1d 100644
--- a/src/psmcomm.c
+++ b/src/psmcomm.c
@@ -147,7 +147,7 @@ PSMQueryHardware(InputInfoPtr pInfo)
synhw = (struct SynapticsHwInfo*)priv->proto_data;
/* is the synaptics touchpad active? */
- if (!PSMQueryIsSynaptics(local))
+ if (!PSMQueryIsSynaptics(pInfo))
return FALSE;
xf86Msg(X_PROBED, "%s synaptics touchpad found\n", pInfo->name);
@@ -167,7 +167,7 @@ PSMReadHwState(InputInfoPtr pInfo,
struct SynapticsProtocolOperations *proto_ops,
struct CommData *comm, struct SynapticsHwState *hwRet)
{
- return psaux_proto_operations.ReadHwState(local, proto_ops, comm, hwRet);
+ return psaux_proto_operations.ReadHwState(pInfo, proto_ops, comm, hwRet);
}
static Bool PSMAutoDevProbe(InputInfoPtr pInfo)
Reply to: