X Strike Force X.Org X11 SVN commit: r2777 - in branches/7.1/driver/xserver-xorg-input-mouse/debian: . patches
Author: dparsons
Date: 2006-08-12 11:03:45 -0400 (Sat, 12 Aug 2006)
New Revision: 2777
Added:
branches/7.1/driver/xserver-xorg-input-mouse/debian/xserver-xorg-input-mouse.manpages
Removed:
branches/7.1/driver/xserver-xorg-input-mouse/debian/patches/01_stolen_fron_HEAD_spurious_mouse_events.diff
Modified:
branches/7.1/driver/xserver-xorg-input-mouse/debian/changelog
branches/7.1/driver/xserver-xorg-input-mouse/debian/compat
branches/7.1/driver/xserver-xorg-input-mouse/debian/control
branches/7.1/driver/xserver-xorg-input-mouse/debian/patches/series
branches/7.1/driver/xserver-xorg-input-mouse/debian/rules
branches/7.1/driver/xserver-xorg-input-mouse/debian/xserver-xorg-input-mouse.install
Log:
Upload xf86-input-mouse-1.1.1 to experimental:
* New upstream release (X11R7.1, xf86-input-mouse-1.1.1).
- applies patch 01_stolen_fron_HEAD_spurious_mouse_events.diff.
* Use debhelper v5.
* Use dh_installman to install man page.
* Exclude .la (and manpages) from dh_install.
Modified: branches/7.1/driver/xserver-xorg-input-mouse/debian/changelog
===================================================================
--- branches/7.1/driver/xserver-xorg-input-mouse/debian/changelog 2006-08-12 14:24:02 UTC (rev 2776)
+++ branches/7.1/driver/xserver-xorg-input-mouse/debian/changelog 2006-08-12 15:03:45 UTC (rev 2777)
@@ -1,3 +1,13 @@
+xserver-xorg-input-mouse (1:1.1.1-1) experimental; urgency=low
+
+ * New upstream release (X11R7.1, xf86-input-mouse-1.1.1).
+ - applies patch 01_stolen_fron_HEAD_spurious_mouse_events.diff.
+ * Use debhelper v5.
+ * Use dh_installman to install man page.
+ * Exclude .la (and manpages) from dh_install.
+
+ -- Drew Parsons <dparsons@debian.org> Sun, 13 Aug 2006 00:51:02 +1000
+
xserver-xorg-input-mouse (1:1.0.4-4) UNRELEASED; urgency=low
* Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
Modified: branches/7.1/driver/xserver-xorg-input-mouse/debian/compat
===================================================================
--- branches/7.1/driver/xserver-xorg-input-mouse/debian/compat 2006-08-12 14:24:02 UTC (rev 2776)
+++ branches/7.1/driver/xserver-xorg-input-mouse/debian/compat 2006-08-12 15:03:45 UTC (rev 2777)
@@ -1 +1 @@
-4
+5
Modified: branches/7.1/driver/xserver-xorg-input-mouse/debian/control
===================================================================
--- branches/7.1/driver/xserver-xorg-input-mouse/debian/control 2006-08-12 14:24:02 UTC (rev 2776)
+++ branches/7.1/driver/xserver-xorg-input-mouse/debian/control 2006-08-12 15:03:45 UTC (rev 2777)
@@ -2,8 +2,8 @@
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
-Build-Depends: debhelper (>= 4.0.0), pkg-config, xserver-xorg-dev (>> 1:0.99.3), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, quilt
+Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>, Drew Parsons <dparsons@debian.org>
+Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>> 1:0.99.3), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, quilt
Standards-Version: 3.7.2
Package: xserver-xorg-input-mouse
Deleted: branches/7.1/driver/xserver-xorg-input-mouse/debian/patches/01_stolen_fron_HEAD_spurious_mouse_events.diff
===================================================================
--- branches/7.1/driver/xserver-xorg-input-mouse/debian/patches/01_stolen_fron_HEAD_spurious_mouse_events.diff 2006-08-12 14:24:02 UTC (rev 2776)
+++ branches/7.1/driver/xserver-xorg-input-mouse/debian/patches/01_stolen_fron_HEAD_spurious_mouse_events.diff 2006-08-12 15:03:45 UTC (rev 2777)
@@ -1,113 +0,0 @@
-Patch from Alan Hourihane grabbed from CVS:
-http://webcvs.freedesktop.org/xorg/driver/xf86-input-mouse/src/mouse.c?r1=1.27&r2=1.28
-
-(MousePostEvent):
- Overhaul of wheel processing. Does work correctly with multibit
- zaxis events now.
-
-Index: src/mouse.c
-===================================================================
---- src/mouse.c.orig 2006-05-12 14:02:32.465634116 +0200
-+++ src/mouse.c 2006-05-12 14:02:40.558186716 +0200
-@@ -2323,7 +2323,7 @@
- int dx, int dy, int dz, int dw)
- {
- MouseDevPtr pMse;
-- int zbutton = 0;
-+ int zbutton = 0, wbutton = 0, zbuttoncount = 0, wbuttoncount = 0;
- int i, b, buttons = 0;
-
- pMse = pInfo->private;
-@@ -2344,6 +2344,7 @@
- /* XXX Could this go in the conversion_proc? */
- switch (pMse->negativeZ) {
- case MSE_NOZMAP: /* do nothing */
-+ dz = 0;
- break;
- case MSE_MAPTOX:
- if (dz != 0) {
-@@ -2358,20 +2359,46 @@
- }
- break;
- default: /* buttons */
-- buttons &= ~(pMse->negativeZ | pMse->positiveZ
-- | pMse->negativeW | pMse->positiveW);
-- if (dw < 0 || dz < -1)
-- zbutton = pMse->negativeW;
-- else if (dz < 0)
-+ buttons &= ~(pMse->negativeZ | pMse->positiveZ);
-+ if (dz < 0) {
- zbutton = pMse->negativeZ;
-- else if (dw > 0 || dz > 1)
-- zbutton = pMse->positiveW;
-- else if (dz > 0)
-+ zbuttoncount = -dz;
-+ } else if (dz > 0) {
- zbutton = pMse->positiveZ;
-- buttons |= zbutton;
-+ zbuttoncount = dz;
-+ }
- dz = 0;
- break;
- }
-+ switch (pMse->negativeW) {
-+ case MSE_NOZMAP: /* do nothing */
-+ dw = 0;
-+ break;
-+ case MSE_MAPTOX:
-+ if (dw != 0) {
-+ dx = dw;
-+ dw = 0;
-+ }
-+ break;
-+ case MSE_MAPTOY:
-+ if (dw != 0) {
-+ dy = dw;
-+ dw = 0;
-+ }
-+ break;
-+ default: /* buttons */
-+ buttons &= ~(pMse->negativeW | pMse->positiveW);
-+ if (dw < 0) {
-+ wbutton = pMse->negativeW;
-+ wbuttoncount = -dw;
-+ } else if (dw > 0) {
-+ wbutton = pMse->positiveW;
-+ wbuttoncount = dw;
-+ }
-+ dw = 0;
-+ break;
-+ }
-+
-
- /* Apply angle offset */
- if (pMse->angleOffset != 0) {
-@@ -2388,16 +2415,19 @@
- dx = dy;
- dy = tmp;
- }
-- MouseDoPostEvent(pInfo, buttons, dx, dy);
-
-- /*
-- * If dz has been mapped to a button `down' event, we need to cook up
-- * a corresponding button `up' event.
-- */
-- if (zbutton) {
-- buttons &= ~zbutton;
-- MouseDoPostEvent(pInfo, buttons, 0, 0);
-- }
-+ /* If mouse wheel movement has to be mapped on a button, we need to
-+ * loop for button press and release events. */
-+ do {
-+ MouseDoPostEvent(pInfo, buttons | zbutton | wbutton, dx, dy);
-+ dx = dy = 0;
-+ if (zbutton || wbutton)
-+ MouseDoPostEvent(pInfo, buttons, 0, 0);
-+ if (--zbuttoncount <= 0)
-+ zbutton = 0;
-+ if (--wbuttoncount <= 0)
-+ wbutton = 0;
-+ } while (zbutton || wbutton);
-
- pMse->lastButtons = truebuttons;
- }
Modified: branches/7.1/driver/xserver-xorg-input-mouse/debian/patches/series
===================================================================
--- branches/7.1/driver/xserver-xorg-input-mouse/debian/patches/series 2006-08-12 14:24:02 UTC (rev 2776)
+++ branches/7.1/driver/xserver-xorg-input-mouse/debian/patches/series 2006-08-12 15:03:45 UTC (rev 2777)
@@ -1 +0,0 @@
-01_stolen_fron_HEAD_spurious_mouse_events.diff -p0
Modified: branches/7.1/driver/xserver-xorg-input-mouse/debian/rules
===================================================================
--- branches/7.1/driver/xserver-xorg-input-mouse/debian/rules 2006-08-12 14:24:02 UTC (rev 2776)
+++ branches/7.1/driver/xserver-xorg-input-mouse/debian/rules 2006-08-12 15:03:45 UTC (rev 2777)
@@ -72,7 +72,8 @@
dh_installdocs README
dh_installchangelogs
- dh_install --sourcedir=debian/tmp --list-missing
+ dh_install --sourcedir=debian/tmp --list-missing --exclude=mouse_drv.la --exclude=usr/share/man/man4
+ dh_installman
dh_link
dh_strip
dh_compress
Modified: branches/7.1/driver/xserver-xorg-input-mouse/debian/xserver-xorg-input-mouse.install
===================================================================
--- branches/7.1/driver/xserver-xorg-input-mouse/debian/xserver-xorg-input-mouse.install 2006-08-12 14:24:02 UTC (rev 2776)
+++ branches/7.1/driver/xserver-xorg-input-mouse/debian/xserver-xorg-input-mouse.install 2006-08-12 15:03:45 UTC (rev 2777)
@@ -1,2 +1,2 @@
usr/lib/xorg/modules/input/*.so
-usr/share/man
+
Added: branches/7.1/driver/xserver-xorg-input-mouse/debian/xserver-xorg-input-mouse.manpages
===================================================================
--- branches/7.1/driver/xserver-xorg-input-mouse/debian/xserver-xorg-input-mouse.manpages 2006-08-12 14:24:02 UTC (rev 2776)
+++ branches/7.1/driver/xserver-xorg-input-mouse/debian/xserver-xorg-input-mouse.manpages 2006-08-12 15:03:45 UTC (rev 2777)
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man4/*
Reply to: