xserver-xorg-input-vmmouse: Changes to 'debian-experimental'
.gitignore | 73 ++++++-
ChangeLog | 239 ++++++++++++++++++++++++++
INSTALL | 231 -------------------------
Makefile.am | 14 +
configure.ac | 67 ++++---
debian/README.source | 2
debian/changelog | 59 ++++++
debian/control | 14 -
debian/patches/01-enable-detect-in-kvm.diff | 28 +++
debian/patches/series | 1
debian/rules | 11 -
debian/xserver-xorg-input-vmmouse.install | 6
debian/xserver-xorg-input-vmmouse.postinst.in | 18 +
debian/xsfbs/xsfbs.mk | 31 ++-
man/Makefile.am | 55 ++---
man/vmmouse_detect.1 | 58 ------
man/vmmouse_detect.man | 58 ++++++
shared/Makefile.am | 4
src/Makefile.am | 2
src/vmmouse.c | 16 -
tools/.gitignore | 4
tools/50-vmmouse.conf | 7
tools/69-xorg-vmmouse.rules.in | 1
tools/Makefile.am | 26 ++
tools/hal-probe-vmmouse.in | 1
25 files changed, 631 insertions(+), 395 deletions(-)
New commits:
commit 380b93dbc1586d1c2e45ead3bca8b3893d432f18
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Oct 13 01:22:39 2010 +0200
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index f526d5e..6805a8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-input-vmmouse (1:12.6.9-3) UNRELEASED; urgency=low
+xserver-xorg-input-vmmouse (1:12.6.9-3) experimental; urgency=low
* Build against Xserver 1.9.1 rc1.
- -- Cyril Brulebois <kibi@debian.org> Wed, 13 Oct 2010 01:22:18 +0200
+ -- Cyril Brulebois <kibi@debian.org> Wed, 13 Oct 2010 01:22:34 +0200
xserver-xorg-input-vmmouse (1:12.6.9-2) unstable; urgency=low
commit 46080a51ee5b3cd6dbfeae8f35cd276ec3210f35
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Oct 13 01:22:30 2010 +0200
Build against Xserver 1.9.1 rc1.
diff --git a/debian/changelog b/debian/changelog
index f2a8161..f526d5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-vmmouse (1:12.6.9-3) UNRELEASED; urgency=low
+
+ * Build against Xserver 1.9.1 rc1.
+
+ -- Cyril Brulebois <kibi@debian.org> Wed, 13 Oct 2010 01:22:18 +0200
+
xserver-xorg-input-vmmouse (1:12.6.9-2) unstable; urgency=low
[ Robert Hooker ]
diff --git a/debian/control b/debian/control
index c093147..bf0866d 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusinow@debian.org>, Drew Parsons <dparsons@debian.or
Build-Depends:
debhelper (>= 5),
pkg-config,
- xserver-xorg-dev (>= 2:1.7.6.901),
+ xserver-xorg-dev (>= 2:1.9.0.901),
x11proto-input-dev,
x11proto-core-dev,
x11proto-randr-dev,
commit dd73565540732584f71850844435cf79f6432d70
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Jun 4 10:26:00 2010 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 3e02d89..f2a8161 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-vmmouse (1:12.6.9-2) UNRELEASED; urgency=low
+xserver-xorg-input-vmmouse (1:12.6.9-2) unstable; urgency=low
[ Robert Hooker ]
* Pull from upstream master branch up to commit 833698b3b98
@@ -10,7 +10,7 @@ xserver-xorg-input-vmmouse (1:12.6.9-2) UNRELEASED; urgency=low
* Move vmmouse_detect from /usr/bin to /bin, since the udev rule needs it.
* Stop shipping hal-probe-vmmouse.
- -- Robert Hooker <sarvatt@ubuntu.com> Fri, 04 Jun 2010 03:05:36 -0400
+ -- Julien Cristau <jcristau@debian.org> Fri, 04 Jun 2010 10:25:57 +0200
xserver-xorg-input-vmmouse (1:12.6.9-1) unstable; urgency=low
commit 7529f52dc978956447f43f5b188c93afd5b73557
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Jun 4 10:25:18 2010 +0200
Stop shipping hal-probe-vmmouse.
diff --git a/debian/changelog b/debian/changelog
index 520fb32..3e02d89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xserver-xorg-input-vmmouse (1:12.6.9-2) UNRELEASED; urgency=low
[ Julien Cristau ]
* Move vmmouse_detect from /usr/bin to /bin, since the udev rule needs it.
+ * Stop shipping hal-probe-vmmouse.
-- Robert Hooker <sarvatt@ubuntu.com> Fri, 04 Jun 2010 03:05:36 -0400
diff --git a/debian/xserver-xorg-input-vmmouse.install b/debian/xserver-xorg-input-vmmouse.install
index 6e48297..e3e4e58 100644
--- a/debian/xserver-xorg-input-vmmouse.install
+++ b/debian/xserver-xorg-input-vmmouse.install
@@ -1,6 +1,5 @@
usr/lib/xorg/modules/input/*.so
bin/vmmouse_detect
-usr/lib/hal/hal-probe-vmmouse
usr/share/man
usr/share/X11/xorg.conf.d
lib/udev/rules.d
commit 610b1d6c40bf97294346a5380c0ac8c99a7f16c0
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Jun 4 10:24:32 2010 +0200
Move vmmouse_detect from /usr/bin to /bin, since the udev rule needs it.
diff --git a/debian/changelog b/debian/changelog
index 760c683..520fb32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
xserver-xorg-input-vmmouse (1:12.6.9-2) UNRELEASED; urgency=low
+ [ Robert Hooker ]
* 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.
* Version build-dependency on xutils-dev as it requires util-macros 1.4.
+ [ Julien Cristau ]
+ * Move vmmouse_detect from /usr/bin to /bin, since the udev rule needs it.
+
-- Robert Hooker <sarvatt@ubuntu.com> Fri, 04 Jun 2010 03:05:36 -0400
xserver-xorg-input-vmmouse (1:12.6.9-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 8f9b639..3c860be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,6 +43,7 @@ build-stamp: configure
test -d build || mkdir build
cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
+ --bindir=/bin \
--infodir=\$${prefix}/share/info $(confflags) \
CFLAGS="$(CFLAGS)"
cd build && $(MAKE)
diff --git a/debian/xserver-xorg-input-vmmouse.install b/debian/xserver-xorg-input-vmmouse.install
index afa6194..6e48297 100644
--- a/debian/xserver-xorg-input-vmmouse.install
+++ b/debian/xserver-xorg-input-vmmouse.install
@@ -1,5 +1,5 @@
usr/lib/xorg/modules/input/*.so
-usr/bin/vmmouse_detect
+bin/vmmouse_detect
usr/lib/hal/hal-probe-vmmouse
usr/share/man
usr/share/X11/xorg.conf.d
commit d2cae9ed5b77193c250e449da96df7257116bdae
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Fri Jun 4 04:02:07 2010 -0400
Version build-dependency on xutils-dev as it requires util-macros 1.4 provided in 1:7.5+1.
diff --git a/debian/changelog b/debian/changelog
index 152b519..760c683 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ 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.
+ * Version build-dependency on xutils-dev as it requires util-macros 1.4.
-- Robert Hooker <sarvatt@ubuntu.com> Fri, 04 Jun 2010 03:05:36 -0400
diff --git a/debian/control b/debian/control
index 36789f8..c093147 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
dpkg-dev (>= 1.14.17),
automake,
libtool,
- xutils-dev
+ xutils-dev (>= 1:7.5+1)
Standards-Version: 3.8.4
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-vmmouse
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-vmmouse.git
commit e30fbd725c2000e79ae3213f672d119e5cc66b44
Author: Robert Hooker <sarvatt@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 <memsize@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 <memsize@videotron.ca>
+
+commit 1d1c0514158abb66388ee4eb44764d201203a863
+Author: Jakob Bornecrantz <jakob@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 <jcristau@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 <jcristau@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 <jcristau@debian.org>
+
commit 01f03ca8fbca96957d6c2718f4279e31cb406c2f
Author: Peter Hutterer <peter.hutterer@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 <sarvatt@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 a615c68a93d100b75fad27aabfa6018e8338dc8e
Author: Mikhail Gusarov <dottedmag@debian.org>
Date: Fri May 7 18:58:56 2010 +0700
Remove duplicate xorg.fd.o URL and confusing mailing list URL from debian/control
diff --git a/debian/control b/debian/control
index eaebb75..36789f8 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,5 @@ Description: X.Org X server -- VMMouse input driver to use with VMWare
.
More information about X.Org can be found at:
<URL:http://www.X.org>
- <URL:http://xorg.freedesktop.org>
- <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
.
This package is built from the X.org xf86-input-vmmouse driver module.
commit 833698b3b9857fda176c91a0dbb128275a174624
Author: Gaetan Nadon <memsize@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 <memsize@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 <jakob@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 dc847c03f22fe54018b88d88ffbda797449a9b72
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Apr 17 21:50:35 2010 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 7201b37..1d1838d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-vmmouse (1:12.6.9-1) UNRELEASED; urgency=low
+xserver-xorg-input-vmmouse (1:12.6.9-1) unstable; urgency=low
[ Julien Cristau ]
* New upstream release
@@ -11,7 +11,7 @@ xserver-xorg-input-vmmouse (1:12.6.9-1) UNRELEASED; urgency=low
* Add myself to Uploaders.
* Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
- -- Julien Cristau <jcristau@debian.org> Sat, 17 Apr 2010 01:11:13 +0200
+ -- Cyril Brulebois <kibi@debian.org> Sat, 17 Apr 2010 21:50:29 +0200
xserver-xorg-input-vmmouse (1:12.6.5-4) unstable; urgency=low
commit 0e51224cdac404884ae5341ccb9eaf51a9b3d36a
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Apr 17 21:49:51 2010 +0200
Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
diff --git a/debian/changelog b/debian/changelog
index 39f1af1..7201b37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xserver-xorg-input-vmmouse (1:12.6.9-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* Add myself to Uploaders.
+ * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
-- Julien Cristau <jcristau@debian.org> Sat, 17 Apr 2010 01:11:13 +0200
diff --git a/debian/control b/debian/control
index 1ef54d0..eaebb75 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
automake,
libtool,
xutils-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-vmmouse
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-vmmouse.git
commit 4900de403f64c4f7b5dd176c81e5b945f77d1adb
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Apr 17 21:49:36 2010 +0200
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 0b0173f..39f1af1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
xserver-xorg-input-vmmouse (1:12.6.9-1) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* New upstream release
- Adds InputClass support
* Drop our local udev rules and xorg.conf.d snippet, they're upstream now.
* Bump build-dependency on xserver-xorg-dev for /usr/share/X11/xorg.conf.d.
* Use new xsfbs and ${xinpdriver:Depends}.
+ [ Cyril Brulebois ]
+ * Add myself to Uploaders.
+
-- Julien Cristau <jcristau@debian.org> Sat, 17 Apr 2010 01:11:13 +0200
xserver-xorg-input-vmmouse (1:12.6.5-4) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 541d897..1ef54d0 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-input-vmmouse
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Drew Parsons <dparsons@debian.org>, Brice Goglin <bgoglin@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Drew Parsons <dparsons@debian.org>, Brice Goglin <bgoglin@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5),
pkg-config,
commit b22d830a4e1c609a709e71c306a3b3a8ff8a6078
Author: Julien Cristau <jcristau@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 @@ lib@DRIVER_NAME@_la_SOURCES = @DRIVER_NAME@_defs.h \
@DRIVER_NAME@_client.c @DRIVER_NAME@_client.h \
@DRIVER_NAME@_proto.c @DRIVER_NAME@_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_NAME@_drv_la_LIBADD = $(top_builddir)/shared/lib@DRIVER_NAME@.la
@DRIVER_NAME@_drv_ladir = @inputdir@
-INCLUDES = -I$(top_srcdir)/shared
+AM_CPPFLAGS = -I$(top_srcdir)/shared $(XORG_CFLAGS)
@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.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_NAME@_detect
-INCLUDES = -I$(top_srcdir)/shared
+AM_CPPFLAGS = -I$(top_srcdir)/shared $(XORG_CFLAGS)
@DRIVER_NAME@_detect_SOURCES = vmmouse_detect.c
@DRIVER_NAME@_detect_LDADD = $(top_builddir)/shared/lib@DRIVER_NAME@.la
commit 1cba87aab183eb3846757a0ee0828e3eb119a6e6
Author: Julien Cristau <jcristau@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 <jcristau@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"
commit b803ab224b6b3165a3fcc7c49d81f0e51d01fa77
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 17 01:27:26 2010 +0200
Add missing include in 01-enable-detect-in-kvm.diff
diff --git a/debian/patches/01-enable-detect-in-kvm.diff b/debian/patches/01-enable-detect-in-kvm.diff
index 9f9cc39..45c2e41 100644
--- a/debian/patches/01-enable-detect-in-kvm.diff
+++ b/debian/patches/01-enable-detect-in-kvm.diff
@@ -2,10 +2,19 @@ Description: add iopl() back so vmmouse_detect will work in kvm again.
Origin: upstream, reverses http://cgit.freedesktop.org/xorg/driver/xf86-input-vmmouse/commit/?id=bcdec3d0cd4434770cd841c33c030e0d7203881f
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=525039
-diff -Nur xserver-xorg-input-vmmouse-12.6.5/tools/vmmouse_detect.c xserver-xorg-input-vmmouse-12.6.5.new/tools/vmmouse_detect.c
---- xserver-xorg-input-vmmouse-12.6.5/tools/vmmouse_detect.c 2009-05-11 12:59:48.000000000 -0400
-+++ xserver-xorg-input-vmmouse-12.6.5.new/tools/vmmouse_detect.c 2010-03-05 09:53:21.000000000 -0500
-@@ -53,6 +53,11 @@
+Index: xserver-xorg-input-vmmouse/tools/vmmouse_detect.c
+===================================================================
+--- xserver-xorg-input-vmmouse.orig/tools/vmmouse_detect.c
++++ xserver-xorg-input-vmmouse/tools/vmmouse_detect.c
+@@ -28,6 +28,7 @@
+
+ #include <stdlib.h>
+ #include <signal.h>
++#include <sys/io.h>
+ #include "vmmouse_client.h"
+
+ #ifdef HAVE_CONFIG_H
+@@ -53,6 +54,11 @@
signal(SIGSEGV, segvCB);
#if defined __i386__ || defined __x86_64__
commit bb27f6bfc187122f403a05a5443d873ede5213d5
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 17 01:24:37 2010 +0200
Actually install the udev rules and xorg.conf.d snippet in the package
diff --git a/debian/xserver-xorg-input-vmmouse.install b/debian/xserver-xorg-input-vmmouse.install
index 1d8fa70..afa6194 100644
--- a/debian/xserver-xorg-input-vmmouse.install
+++ b/debian/xserver-xorg-input-vmmouse.install
@@ -2,3 +2,5 @@ usr/lib/xorg/modules/input/*.so
usr/bin/vmmouse_detect
usr/lib/hal/hal-probe-vmmouse
usr/share/man
+usr/share/X11/xorg.conf.d
+lib/udev/rules.d
commit e656fdd951c487ea25c0b4158e6e7b0bcd47c28c
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 17 01:18:29 2010 +0200
Use new xsfbs and ${xinpdriver:Depends}.
diff --git a/debian/changelog b/debian/changelog
index e5ca50d..0b0173f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-input-vmmouse (1:12.6.9-1) UNRELEASED; urgency=low
- Adds InputClass support
* Drop our local udev rules and xorg.conf.d snippet, they're upstream now.
* Bump build-dependency on xserver-xorg-dev for /usr/share/X11/xorg.conf.d.
+ * Use new xsfbs and ${xinpdriver:Depends}.
-- Julien Cristau <jcristau@debian.org> Sat, 17 Apr 2010 01:11:13 +0200
diff --git a/debian/control b/debian/control
index 3cdecc6..541d897 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-vmmouse
Package: xserver-xorg-input-vmmouse
Architecture: i386 amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends},
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xinpdriver:Depends},
xserver-xorg-input-mouse,
udev
Provides: ${xinpdriver:Provides}
commit cf9169723c794c1cf59ba73f4f19f03c0ef25690
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 17 01:14:28 2010 +0200
Bump build-dependency on xserver-xorg-dev for /usr/share/X11/xorg.conf.d.
diff --git a/debian/changelog b/debian/changelog
index bb73d7f..e5ca50d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-input-vmmouse (1:12.6.9-1) UNRELEASED; urgency=low
* New upstream release
- Adds InputClass support
* Drop our local udev rules and xorg.conf.d snippet, they're upstream now.
+ * Bump build-dependency on xserver-xorg-dev for /usr/share/X11/xorg.conf.d.
-- Julien Cristau <jcristau@debian.org> Sat, 17 Apr 2010 01:11:13 +0200
diff --git a/debian/control b/debian/control
index 86b6c04..3cdecc6 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusinow@debian.org>, Drew Parsons <dparsons@debian.or
Build-Depends:
debhelper (>= 5),
pkg-config,
- xserver-xorg-dev (>= 2:1.7),
+ xserver-xorg-dev (>= 2:1.7.6.901),
x11proto-input-dev,
x11proto-core-dev,
x11proto-randr-dev,
commit ad5ed1eee9b5c65251ed577abf765cc98ba24d04
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 17 01:13:29 2010 +0200
Drop our local udev rules and xorg.conf.d snippet, they're upstream now.
diff --git a/debian/changelog b/debian/changelog
index 2ba82b5..bb73d7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-input-vmmouse (1:12.6.9-1) UNRELEASED; urgency=low
* New upstream release
- Adds InputClass support
+ * Drop our local udev rules and xorg.conf.d snippet, they're upstream now.
-- Julien Cristau <jcristau@debian.org> Sat, 17 Apr 2010 01:11:13 +0200
diff --git a/debian/local/10-vmmouse.conf b/debian/local/10-vmmouse.conf
deleted file mode 100644
index 879b604..0000000
--- a/debian/local/10-vmmouse.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-Section "InputClass"
- Identifier "vmmouse catchall"
- MatchTag "vmmouse"
- Driver "vmmouse"
-EndSection
-
diff --git a/debian/local/69-xorg-vmmouse.rules b/debian/local/69-xorg-vmmouse.rules
deleted file mode 100644
index 7b1bd00..0000000
--- a/debian/local/69-xorg-vmmouse.rules
+++ /dev/null
@@ -1 +0,0 @@
-ACTION=="add|change", ENV{ID_INPUT_MOUSE}=="?*", ATTRS{description}=="i8042 AUX port", PROGRAM="/usr/bin/vmmouse_detect", ENV{ID_INPUT.tags}="vmmouse"
diff --git a/debian/rules b/debian/rules
index 17534d9..8f9b639 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,10 +80,6 @@ binary-arch: build install serverabi
dh_installdocs README
dh_installchangelogs ChangeLog
dh_install --sourcedir=debian/tmp --list-missing --exclude=vmmouse_drv.la
- install -d debian/xserver-xorg-input-vmmouse/lib/udev/rules.d
- install -m 644 debian/local/69-xorg-vmmouse.rules debian/xserver-xorg-input-vmmouse/lib/udev/rules.d
- install -d debian/xserver-xorg-input-vmmouse/usr/lib/X11/xorg.conf.d
- install -m 644 debian/local/10-vmmouse.conf debian/xserver-xorg-input-vmmouse/usr/lib/X11/xorg.conf.d
dh_installman
dh_link
dh_strip
commit 9787a4960200a0e7524de41bb09cbb188e4e2bd5
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 17 01:11:48 2010 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index d8e7ac3..b9d5c0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,113 @@
+commit 01f03ca8fbca96957d6c2718f4279e31cb406c2f
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Apr 9 08:30:26 2010 +1000
+
+ Bump for 12.6.9 release.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 7b2ff5322b298ed8458c7442a16b8c0a14bcc5dc
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Apr 9 07:57:17 2010 +1000
+
+ man: move vmmouse_detect back to section 1
+
+ Was moved to section 4 in commit 36c2cd8ec6d3bf7191a98a04a876e8d7b6f64d5d,
+ "man: build vmmouse_detect man page".
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 21f53010d204c681e1a82b176841c2d4af8f61d8
+Author: Michel Dänzer <daenzer@vmware.com>
+Date: Thu Apr 8 16:18:07 2010 +0200
+
+ Bump for 12.6.8 release.
+
+commit 80f671233e583ae085986bce12057fc45da444aa
+Author: Michel Dänzer <daenzer@vmware.com>
+Date: Thu Apr 1 18:35:38 2010 +0200
+
+ Add InputClass support.
+
+ The InputClass can match the tag "vmmouse". A sample xorg.conf.d snippet is
+ provided to try and make sure the driver will be loaded automatically in a
+ compatible VM also if the X server uses udev instead of HAL.
+
+ The configure script tries to determine if and where it makes sense to install
+ the udev rule and xorg.conf.d snippet but allows overriding both.
+
+ Thanks to Timo Aaltonen for the udev rules file and Dan Nicholson and Simon
+ Thum for review and suggestions for improvement.
+
+commit b9c3bc94ee86a72216e9738aaecede80cc1c043c
+Author: Michel Dänzer <daenzer@vmware.com>
+Date: Thu Apr 8 16:09:51 2010 +0200
+
+ Improve make rule for hal-probe-vmmouse.
+
+ Make sure changes to hal-probe-vmmouse.in get picked up automatically and
+ simplify the way it's passed to sed.
+
+ Thanks to Dan Nicholson for the suggestion.
+
+commit 36c2cd8ec6d3bf7191a98a04a876e8d7b6f64d5d
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Mar 26 20:44:23 2010 -0400
+
+ man: build vmmouse_detect man page
+
+ The generated file was checked-in and was wrong.
+ The file suffix is now computed based on the platform
+ The macro substitution has been restored
+
+ Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 27813c665b0eed0b3d8b4db5fcb555f20fe60c4a
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sat Mar 20 13:21:12 2010 -0400
+
+ make: remove unrequired INCLUDES = -I$(srcdir)
+
+ Already covered by DEFAULT_INCLUDES
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+ Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 40ba06b1389ab68482b3aa3ed69292011c09f9dd
+Author: Jakob Bornecrantz <jakob@vmware.com>
+Date: Thu Mar 18 16:23:27 2010 +0100
+
+ Bump for 12.6.7 release.
+
+commit fae10ac6c613f6de847e152d615e6da421147139
+Author: Julien Cristau <jcristau@debian.org>
+Date: Fri Feb 26 17:30:08 2010 +0100
+
+ vmmouse: don't hardcode the module version in the source
+
+ XORG_RELEASE_VERSION gives us that info from configure.ac, let's use it.
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit f3ef776415820c7da1728d1fe27dd56dc24e935f
+Author: Julien Cristau <jcristau@debian.org>
+Date: Wed Feb 10 02:16:43 2010 +0100
+
+ Bump to 12.6.6
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit ae58da22e6f4798498a1e9a0b1b6c6c0f19e2532
+Author: Julien Cristau <jcristau@debian.org>
+Date: Wed Feb 10 02:15:38 2010 +0100
+
+ Require xorg-macros 1.4 for XORG_INSTALL
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
commit aca67eca8bbb1368a2f36614b0e78b98947f134f
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Jan 15 15:15:54 2010 -0800
diff --git a/debian/changelog b/debian/changelog
index 20ae0a8..2ba82b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-vmmouse (1:12.6.9-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ - Adds InputClass support
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 17 Apr 2010 01:11:13 +0200
+
xserver-xorg-input-vmmouse (1:12.6.5-4) unstable; urgency=low
* Add 10-vmmouse.conf.
commit b045afbd8277ad0c44e29d7c45802053c4335ccd
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Apr 16 22:14:46 2010 +0200
Update serverabi rule for xserver 1.7.6.901
Add new variables ${xviddriver:Depends} and ${xinpdriver:Depends} for
drivers. The ${xserver:Depends} variable is deprecated.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 351fea5..77c4a39 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -253,25 +253,33 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
# debian/*.prerm
>$@
-SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
+# Compute dependencies for drivers
+#
+VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null)
+INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null)
+
+# these two can be removed post-squeeze
VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
-SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
+
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
endif
.PHONY: serverabi
serverabi: install
-ifeq ($(SERVERMINVERS),)
- @echo error: xserver-xorg-dev needs to be installed
+ifeq ($(VIDEODEP),)
+ @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed'
@exit 1
else
- echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars
+ echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars
+ echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars
+ # the following is there for compatibility...
echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
+ echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PACKAGE).substvars
endif
# vim:set noet ai sts=8 sw=8 tw=0:
commit 8bd2e9b523da35493db1bd781d4ef6bfbbeb2eff
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Apr 13 14:06:33 2010 +0200
xsfbs.mk: don't use a directory as a make target
The timestamp on the directory gets updated each time a file is added in
it, which causes useless rebuilds.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 5e16b10..351fea5 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -110,14 +110,15 @@ $(STAMP_DIR)/stampdir:
.PHONY: prepare
stampdir_targets+=prepare
prepare: $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts
+$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts
>$@
-.PHONY: log
-stampdir_targets+=log
-log: $(STAMP_DIR)/log
-$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir
+.PHONY: logdir
+stampdir_targets+=logdir
+logdir: $(STAMP_DIR)/logdir
+$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir
mkdir -p $(STAMP_DIR)/log
+ >$@
# Apply all patches to the upstream source.
.PHONY: patch
@@ -145,7 +146,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
# Revert all patches to the upstream source.
.PHONY: unpatch
-unpatch: $(STAMP_DIR)/log
+unpatch: $(STAMP_DIR)/logdir
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if $(QUILT) applied >/dev/null 2>/dev/null; then \
commit 01f03ca8fbca96957d6c2718f4279e31cb406c2f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Apr 9 08:30:26 2010 +1000
Bump for 12.6.9 release.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 8bd1926..472c705 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-vmmouse],
- 12.6.8,
+ 12.6.9,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-vmmouse)
commit 7b2ff5322b298ed8458c7442a16b8c0a14bcc5dc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Apr 9 07:57:17 2010 +1000
man: move vmmouse_detect back to section 1
Was moved to section 4 in commit 36c2cd8ec6d3bf7191a98a04a876e8d7b6f64d5d,
"man: build vmmouse_detect man page".
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/man/Makefile.am b/man/Makefile.am
index 142eb1d..d59d374 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -23,13 +23,17 @@
drivermandir = $(DRIVER_MAN_DIR)
-driverman_PRE = @DRIVER_NAME@.man @DRIVER_NAME@_detect.man
+driverman_PRE = @DRIVER_NAME@.man
driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
-EXTRA_DIST = @DRIVER_NAME@.man @DRIVER_NAME@_detect.man
+appmandir = $(APP_MAN_DIR)
+appman_PRE = @DRIVER_NAME@_detect.man
+appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-CLEANFILES = $(driverman_DATA)
+EXTRA_DIST = @DRIVER_NAME@.man $(appman_PRE)
+
+CLEANFILES = $(driverman_DATA) $(appman_DATA)
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
@@ -51,3 +55,5 @@ SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
Reply to: