[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force XFree86 SVN commit: r2272 - in trunk/debian: . local



Author: branden
Date: 2005-05-29 12:36:10 -0500 (Sun, 29 May 2005)
New Revision: 2272

Modified:
   trunk/debian/CHANGESETS
   trunk/debian/changelog
   trunk/debian/local/dexconf
Log:
Invert sense of tests invoking has_multiplexed_mouse; the comments were
right, but the logic was exactly backwards.  This should fix warp-speed
and left-handed configuration mouse device problems introduced (or simply
not fixed for USB and PS/2 mouse users of Linux 2.6) in -13.  Thanks to
Steve Langasek for eyeballing the code and catching my thinko.
(Closes: #384111)


Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS	2005-05-26 17:29:24 UTC (rev 2271)
+++ trunk/debian/CHANGESETS	2005-05-29 17:36:10 UTC (rev 2272)
@@ -43,4 +43,12 @@
 (Closes: #308783)
     2270, 2271
 
+Invert sense of tests invoking has_multiplexed_mouse; the comments were
+right, but the logic was exactly backwards.  This should fix warp-speed
+and left-handed configuration mouse device problems introduced (or simply
+not fixed for USB and PS/2 mouse users of Linux 2.6) in -13.  Thanks to
+Steve Langasek for eyeballing the code and catching my thinko.
+(Closes: #384111)
+    2272
+
 vim:set ai et sts=4 sw=4 tw=80:

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-05-26 17:29:24 UTC (rev 2271)
+++ trunk/debian/changelog	2005-05-29 17:36:10 UTC (rev 2272)
@@ -30,8 +30,15 @@
     <URL: https://bugs.freedesktop.org/show_bug.cgi?id=830 >.  The DPMS fix
     also adds a header self-inclusion guard to dpms.h.
 
- -- Branden Robinson <branden@debian.org>  Wed, 25 May 2005 02:57:44 -0500
+  * Invert sense of tests invoking has_multiplexed_mouse; the comments were
+    right, but the logic was exactly backwards.  This should fix warp-speed
+    and left-handed configuration mouse device problems introduced (or simply
+    not fixed for USB and PS/2 mouse users of Linux 2.6) in -13.  Thanks to
+    Steve Langasek for eyeballing the code and catching my thinko.
+    (Closes: #384111)
 
+ -- Branden Robinson <branden@debian.org>  Sun, 29 May 2005 12:31:57 -0500
+
 xfree86 (4.3.0.dfsg.1-13) unstable; urgency=high
 
   Urgency set to high due to fix for security flaw CAN-2005-0605 (see below).

Modified: trunk/debian/local/dexconf
===================================================================
--- trunk/debian/local/dexconf	2005-05-26 17:29:24 UTC (rev 2271)
+++ trunk/debian/local/dexconf	2005-05-29 17:36:10 UTC (rev 2272)
@@ -355,7 +355,7 @@
 # we probably also need an init script to rewrite XF86Config-4 on system boot
 # for people who switch back and forth between these kernels, or some people
 # will get "doubled" mouse events.  Sigh.
-if has_multiplexed_mouse; then
+if ! has_multiplexed_mouse; then
   cat >&4 <<SECTION
 Section "InputDevice"
 	Identifier	"Generic Mouse"
@@ -458,7 +458,7 @@
 	InputDevice	"Generic Keyboard"
 	InputDevice	"Configured Mouse"
 SECTION
-if has_multiplexed_mouse; then
+if ! has_multiplexed_mouse; then
   printf "\tInputDevice\t\"Generic Mouse\"\n" >&4
 fi
 printf "EndSection\n" >&4



Reply to: