xorg: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog                      |    8 ++++++++
 debian/local/Failsafe/failsafeDexconf |   18 +++++-------------
 2 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 7bf33d0d6c916f4bc37331aef53efb78e2124a79
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date:   Thu Jan 10 14:24:09 2008 +0200

    failsafeDexconf: Update mouse section.

diff --git a/debian/changelog b/debian/changelog
index 7376ce3..ed360ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.3+10ubuntu3) UNRELEASED; urgency=low
+
+  * failsafeDexconf: Update mouse section.
+    - Don't try to use removed debconf keys.
+    - Make the section identical with the normal dexconf.
+
+ -- Timo Aaltonen <[EMAIL PROTECTED]>  Thu, 10 Jan 2008 14:05:21 +0200
+
 xorg (1:7.3+10ubuntu2) hardy; urgency=low
 
   * vars.{i386,amd64}: add vmmouse.
diff --git a/debian/local/Failsafe/failsafeDexconf 
b/debian/local/Failsafe/failsafeDexconf
index 31297c1..67cb81a 100755
--- a/debian/local/Failsafe/failsafeDexconf
+++ b/debian/local/Failsafe/failsafeDexconf
@@ -157,6 +157,11 @@ printf "EndSection\n\n" >> ${OUTFILE}
 
 DO_EMULATE3BUTTONS=
 
+fetch xserver-$SERVER/config/inputdevice/mouse/emulate3buttons
+if [ "$RET" = "true" ]; then
+  DO_EMULATE3BUTTONS=true
+fi
+
 MOUSE_DRIVER=mouse
 if which vmmouse_detect >/dev/null 2>&1; then
   if vmmouse_detect > /dev/null ; then
@@ -164,23 +169,10 @@ if which vmmouse_detect >/dev/null 2>&1; then
   fi
 fi
 
-fetch xserver-$SERVER/config/inputdevice/mouse/port
-MOUSE_PORT="$RET"
-fetch xserver-$SERVER/config/inputdevice/mouse/protocol
-MOUSE_PROTOCOL="$RET"
-fetch xserver-$SERVER/config/inputdevice/mouse/emulate3buttons
-if [ "$RET" = "true" ]; then
-  DO_EMULATE3BUTTONS=true
-fi
-
 cat <<SECTION >> ${OUTFILE}
 Section "InputDevice"
        Identifier      "Configured Mouse"
        Driver          "$MOUSE_DRIVER"
-       Option          "CorePointer"
-       Option          "Device"                "$MOUSE_PORT"
-       Option          "Protocol"              "$MOUSE_PROTOCOL"
-       Option          "ZAxisMapping"          "4 5"
 SECTION
 if [ -n "$DO_EMULATE3BUTTONS" ]; then
   printf "\tOption\t\t\"Emulate3Buttons\"\t\"true\"\n" >> ${OUTFILE}


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]