ChangeLog | 41 +++++++++++++++++++++++++++++++++++++++++
configure.ac | 3 ---
debian/changelog | 8 ++++++++
shared/Makefile.am | 2 +-
src/Makefile.am | 2 +-
src/vmmouse.c | 1 +
tools/.gitignore | 1 +
tools/69-xorg-vmmouse.rules.in | 2 +-
tools/Makefile.am | 2 +-
9 files changed, 55 insertions(+), 7 deletions(-)
New commits:
commit e30fbd725c2000e79ae3213f672d119e5cc66b44
Author: Robert Hooker <sarv...@ubuntu.com>
Date: Fri Jun 4 03:27:03 2010 -0400
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index b9d5c0e..5b32f23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,44 @@
+commit 833698b3b9857fda176c91a0dbb128275a174624
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Sun Apr 25 19:36:19 2010 -0400
+
+ config: git ignore recently added 69-xorg-vmmouse.rules
+
+ Was added in 1d1c0514158abb66388ee4eb44764d201203a863
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 1d1c0514158abb66388ee4eb44764d201203a863
+Author: Jakob Bornecrantz <ja...@vmware.com>
+Date: Mon Apr 19 15:29:41 2010 +0100
+
+ Only match against event[0-9] in udev rules
+
+ It looks like the udev rule was matched against two devices which caused
+ the driver to be loaded twice. We shouldn't match against the other
+ device because it will very seldom send bogus events. Some of the bug
+ this caused was buttons getting stuck.
+
+commit b22d830a4e1c609a709e71c306a3b3a8ff8a6078
+Author: Julien Cristau <jcris...@debian.org>
+Date: Sat Apr 17 01:39:23 2010 +0200
+
+ Don't clobber CFLAGS
+
+ CFLAGS is a user variable, don't set it from configure.
+
+commit 1cba87aab183eb3846757a0ee0828e3eb119a6e6
+Author: Julien Cristau <jcris...@debian.org>
+Date: Sat Apr 17 01:30:15 2010 +0200
+
+ Include exevents.h for XIGetKnownProperty
+
+ Fixes this compiler warning:
+ vmmouse.c: In function ‘VMMouseDeviceControl’:
+ vmmouse.c:734: warning: implicit declaration of function
‘XIGetKnownProperty’
+
+ Signed-off-by: Julien Cristau <jcris...@debian.org>
+
commit 01f03ca8fbca96957d6c2718f4279e31cb406c2f
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Fri Apr 9 08:30:26 2010 +1000
diff --git a/debian/changelog b/debian/changelog
index 1d1838d..152b519 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-input-vmmouse (1:12.6.9-2) UNRELEASED; urgency=low
+
+ * Pull from upstream master branch up to commit 833698b3b98
+ - Fixed an issue where vmmouse was matched against the non-event device
+ as well causing it to load multiple times and get stuck.
+
+ -- Robert Hooker <sarv...@ubuntu.com> Fri, 04 Jun 2010 03:05:36 -0400
+
xserver-xorg-input-vmmouse (1:12.6.9-1) unstable; urgency=low
[ Julien Cristau ]
commit 833698b3b9857fda176c91a0dbb128275a174624
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Sun Apr 25 19:36:19 2010 -0400
config: git ignore recently added 69-xorg-vmmouse.rules
Was added in 1d1c0514158abb66388ee4eb44764d201203a863
Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
diff --git a/tools/.gitignore b/tools/.gitignore
index 96849a3..b402509 100644
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -1,3 +1,4 @@
# Add & Override for this directory and it's subdirectories
hal-probe-vmmouse
vmmouse_detect
+69-xorg-vmmouse.rules
commit 1d1c0514158abb66388ee4eb44764d201203a863
Author: Jakob Bornecrantz <ja...@vmware.com>
Date: Mon Apr 19 15:29:41 2010 +0100
Only match against event[0-9] in udev rules
It looks like the udev rule was matched against two devices which caused
the driver to be loaded twice. We shouldn't match against the other
device because it will very seldom send bogus events. Some of the bug
this caused was buttons getting stuck.
diff --git a/tools/69-xorg-vmmouse.rules.in b/tools/69-xorg-vmmouse.rules.in
index 0d7f028..602afb6 100644
--- a/tools/69-xorg-vmmouse.rules.in
+++ b/tools/69-xorg-vmmouse.rules.in
@@ -1 +1 @@
-ACTION=="add|change", ENV{ID_INPUT_MOUSE}=="?*", ATTRS{description}=="i8042
AUX port", PROGRAM="__BIN_PREFIX__/vmmouse_detect", ENV{ID_INPUT.tags}="vmmouse"
+ACTION=="add|change", ENV{ID_INPUT_MOUSE}=="?*", ATTRS{description}=="i8042
AUX port", KERNEL=="event[0-9]*", PROGRAM="__BIN_PREFIX__/vmmouse_detect",
ENV{ID_INPUT.tags}="vmmouse"
commit b22d830a4e1c609a709e71c306a3b3a8ff8a6078
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Apr 17 01:39:23 2010 +0200
Don't clobber CFLAGS
CFLAGS is a user variable, don't set it from configure.
diff --git a/configure.ac b/configure.ac
index 472c705..6c29dc2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,9 +138,6 @@ PKG_CHECK_EXISTS([xorg-server >= 1.6.0],
[AC_DEFINE([NO_MOUSE_MODULE], 1,
[Do not include built-in mouse module fallback])])
-CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
-AC_SUBST([CFLAGS])
-
# Checks for libraries.
# Checks for header files.
diff --git a/shared/Makefile.am b/shared/Makefile.am
index 33c5862..c1b6ca9 100644
--- a/shared/Makefile.am
+++ b/shared/Makefile.am
@@ -23,5 +23,5 @@ l...@driver_name@_la_SOURCES = @driver_n...@_defs.h \
@driver_n...@_client.c @driver_n...@_client.h \
@driver_n...@_proto.c @driver_n...@_proto.h
-
+AM_CPPFLAGS = $(XORG_CFLAGS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 6848537..7e6ea36 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,7 @@
@driver_n...@_drv_la_libadd = $(top_builddir)/shared/l...@driver_name@.la
@driver_n...@_drv_ladir = @inputdir@
-INCLUDES = -I$(top_srcdir)/shared
+AM_CPPFLAGS = -I$(top_srcdir)/shared $(XORG_CFLAGS)
@driver_n...@_drv_la_sources = @driver_n...@.c xf86OSmouse.h
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 8c40369..581ad65 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -20,7 +20,7 @@
bin_PROGRAMS = @driver_n...@_detect
-INCLUDES = -I$(top_srcdir)/shared
+AM_CPPFLAGS = -I$(top_srcdir)/shared $(XORG_CFLAGS)
@driver_n...@_detect_sources = vmmouse_detect.c
@driver_n...@_detect_ldadd = $(top_builddir)/shared/l...@driver_name@.la
commit 1cba87aab183eb3846757a0ee0828e3eb119a6e6
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Apr 17 01:30:15 2010 +0200
Include exevents.h for XIGetKnownProperty
Fixes this compiler warning:
vmmouse.c: In function ‘VMMouseDeviceControl’:
vmmouse.c:734: warning: implicit declaration of function
‘XIGetKnownProperty’
Signed-off-by: Julien Cristau <jcris...@debian.org>
diff --git a/src/vmmouse.c b/src/vmmouse.c
index 0394fb8..1b08eff 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -70,6 +70,7 @@
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
#include <xserver-properties.h>
+#include "exevents.h"
#endif
#include "xisb.h"
--
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/e1okrtd-0002mn...@alioth.debian.org
