X Strike Force X.Org X11 SVN commit: r3376 - in trunk/debian/xorg/debian: . local
Author: dnusinow
Date: 2006-09-19 20:33:54 -0400 (Tue, 19 Sep 2006)
New Revision: 3376
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/local/dexconf
Log:
* Revert ZAxisMapping patch stolen from ubuntu. The server should default
to a more extensive mapping now anyway, so scroll thingies will work by
default without this.
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-09-19 16:08:55 UTC (rev 3375)
+++ trunk/debian/xorg/debian/changelog 2006-09-20 00:33:54 UTC (rev 3376)
@@ -36,8 +36,6 @@
- Added Finnish (Tapio Lehtonen). Closes: #387391
[ David Nusinow ]
- * Steal patch from Ubuntu by Fabio to unconditionally enable ZAxisMapping in
- dexconf
* Update xsfbs with patch from ubuntu to support ARCHITECTURE, LAPTOP,
RECONFIGURE, FIRSTINST, and UPGRADE variables for use in the xserver-xorg
config scripting
@@ -66,7 +64,7 @@
wouldn't match anything, because the epoch is not part of the upstream
version number. Thanks to Thomas Lange for diagnosing this bug!
- -- Branden Robinson <branden@debian.org> Tue, 19 Sep 2006 12:03:25 -0400
+ -- David Nusinow <dnusinow@debian.org> Tue, 19 Sep 2006 20:32:55 -0400
xorg (1:7.1.0~1) experimental; urgency=low
Modified: trunk/debian/xorg/debian/local/dexconf
===================================================================
--- trunk/debian/xorg/debian/local/dexconf 2006-09-19 16:08:55 UTC (rev 3375)
+++ trunk/debian/xorg/debian/local/dexconf 2006-09-20 00:33:54 UTC (rev 3376)
@@ -289,7 +289,6 @@
Option "CorePointer"
Option "Device" "/dev/input/mice"
Option "Protocol" "ExplorerPS/2"
- Option "ZAxisMapping" "4 5"
SECTION
if [ -n "$DO_EMULATE3BUTTONS" ]; then
printf "\tOption\t\t\"Emulate3Buttons\"\t\"true\"\n" >&4
Reply to: