ChangeLog | 34 ++++++++++++++++++++++++++++++++++
configure.ac | 2 +-
debian/changelog | 3 ++-
src/synaptics.c | 2 +-
4 files changed, 38 insertions(+), 3 deletions(-)
New commits:
commit bfbc6af99031e2263c36270fac43959edb2c91e1
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Fri Mar 26 09:24:04 2010 +0200
Update the changelogs.
diff --git a/ChangeLog b/ChangeLog
index a5af5a1..e65ab8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+commit a0d6e90b26044258473d8dae8a53c5adbe2681f1
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Fri Mar 26 15:13:40 2010 +1000
+
+ synaptics 1.2.2
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit ba0d227a6da35dd21ba48ded65cabff16ef423ce
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Wed Mar 17 13:52:43 2010 +1000
+
+ After closing the fd, reset it to -1.
+
+ A DeviceOff() followed by DeviceClose() (which calls DeviceOff()) would try
+ to close the fd twice, in addition to calling various hooks.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Reviewed-by: Julien Cristau <jcris...@debian.org>
+ (cherry picked from commit a07fe65031ffa7e8d88898d763bdbc88899fb1e4)
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 5c811a864e8927a8dfcf9bc25ffe0265b5ed8025
+Author: Adam Jackson <a...@redhat.com>
+Date: Fri Mar 12 08:32:22 2010 +1000
+
+ Don't clobber the timer we just created.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@redhat.com>
+ (cherry picked from commit 0fb151b2388ca665b9454b7b284181b4fa180194)
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
commit faf250d013b1850d3dbe08b050c71dfeb20a6490
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Fri Dec 11 13:46:50 2009 +1000
diff --git a/debian/changelog b/debian/changelog
index 483366f..91e57ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-xserver-xorg-input-synaptics (1.2.1-2) UNRELEASED; urgency=low
+xserver-xorg-input-synaptics (1.2.2-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
+ * New upstream release.
* Add xserver-xorg-input-synaptics-dev for the header and .pc files.
(LP: #340340)
* Run udevadm trigger on postinst, and depend on udev [linux-any].
commit a0d6e90b26044258473d8dae8a53c5adbe2681f1
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Fri Mar 26 15:13:40 2010 +1000
synaptics 1.2.2
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/configure.ac b/configure.ac
index 00181bc..dd2bef7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-synaptics],
- 1.2.1,
+ 1.2.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-synaptics)
commit ba0d227a6da35dd21ba48ded65cabff16ef423ce
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Wed Mar 17 13:52:43 2010 +1000
After closing the fd, reset it to -1.
A DeviceOff() followed by DeviceClose() (which calls DeviceOff()) would try
to close the fd twice, in addition to calling various hooks.
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
Reviewed-by: Julien Cristau <jcris...@debian.org>
(cherry picked from commit a07fe65031ffa7e8d88898d763bdbc88899fb1e4)
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/src/synaptics.c b/src/synaptics.c
index 6cbdcb8..9997674 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -801,6 +801,7 @@ DeviceOff(DeviceIntPtr dev)
priv->comm.buffer = NULL;
}
xf86CloseSerial(local->fd);
+ local->fd = -1;
}
dev->public.on = FALSE;
return Success;
commit 5c811a864e8927a8dfcf9bc25ffe0265b5ed8025
Author: Adam Jackson <a...@redhat.com>
Date: Fri Mar 12 08:32:22 2010 +1000
Don't clobber the timer we just created.
Signed-off-by: Peter Hutterer <peter.hutte...@redhat.com>
(cherry picked from commit 0fb151b2388ca665b9454b7b284181b4fa180194)
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/src/synaptics.c b/src/synaptics.c
index e9d1833..6cbdcb8 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -615,7 +615,6 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
xf86ErrorFVerb(6, "port opened successfully\n");
/* initialize variables */
- priv->timer = NULL;
priv->repeatButtons = 0;
priv->nextRepeat = 0;
priv->count_packet_finger = 0;
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1nv3u1-0003b9...@alioth.debian.org
