debian/changelog | 8 ++++++++
debian/local/Failsafe/failsafeDexconf | 9 +--------
debian/local/dexconf | 9 +--------
3 files changed, 10 insertions(+), 16 deletions(-)
New commits:
commit 07c522a342384989940bace8ca4349f5fb5f6617
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date: Thu Mar 13 18:17:17 2008 +0200
dexconf, failsafeDexconf: Default to using vmmouse
which is able to fall back to mouse if the system is not a virtual
machine. Detecting it otherwise proved to be unreliable.
(LP: #197337)
diff --git a/debian/changelog b/debian/changelog
index 3f60692..700c8f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.3+10ubuntu7) hardy; urgency=low
+
+ * dexconf, failsafeDexconf: Default to using vmmouse, which is able to
+ fall back to mouse if the system is not a virtual machine. Detecting
+ it otherwise proved to be unreliable. (LP: #197337)
+
+ -- Timo Aaltonen <[EMAIL PROTECTED]> Thu, 13 Mar 2008 18:16:50 +0200
+
xorg (1:7.3+10ubuntu6) hardy; urgency=low
* dexconf: Write a section for synaptics and ServerLayout again, since
diff --git a/debian/local/Failsafe/failsafeDexconf
b/debian/local/Failsafe/failsafeDexconf
index 5dff847..a7d0db5 100755
--- a/debian/local/Failsafe/failsafeDexconf
+++ b/debian/local/Failsafe/failsafeDexconf
@@ -124,17 +124,10 @@ 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
- MOUSE_DRIVER=vmmouse
- fi
-fi
-
cat <<SECTION >> ${OUTFILE}
Section "InputDevice"
Identifier "Configured Mouse"
- Driver "$MOUSE_DRIVER"
+ Driver "vmmouse"
SECTION
if [ -n "$DO_EMULATE3BUTTONS" ]; then
printf "\tOption\t\t\"Emulate3Buttons\"\t\"true\"\n" >> ${OUTFILE}
diff --git a/debian/local/dexconf b/debian/local/dexconf
index 4627cb2..9e7ddce 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -221,18 +221,11 @@ 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
- MOUSE_DRIVER=vmmouse
- fi
-fi
-
exec 4>"$DEXCONFTMPDIR/InputDeviceMouse"
cat >&4 <<SECTION
Section "InputDevice"
Identifier "Configured Mouse"
- Driver "$MOUSE_DRIVER"
+ Driver "vmmouse"
SECTION
if [ -n "$DO_EMULATE3BUTTONS" ]; then
printf "\tOption\t\t\"Emulate3Buttons\"\t\"true\"\n" >&4
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
