debian/changelog | 11 +++++++++++
debian/control | 6 +++---
debian/local/Failsafe/failsafeDexconf | 14 +++++++++++++-
debian/local/dexconf | 14 +++++++++++++-
4 files changed, 40 insertions(+), 5 deletions(-)
New commits:
commit 2c2b964a4935c502fb54c640f15a8fc568d70ff1
Author: Timo Aaltonen <[EMAIL PROTECTED]>
Date: Mon Apr 14 17:40:30 2008 +0300
Fix vmmouse handling and an upgrade problem
* control: Add an epoch to the "x11-common Replaces xrgb" version.
(LP: #212672)
* dexconf, failsafeDexconf: Revert back to using "mouse" by default, and
use vmmouse_detect to determine if the system is a virtual machine and
if yes, use vmmouse and set the device path. (LP: #216667, #216276)
* control: xserver-xorg needs to Depend on mdetect instead of Recommends.
diff --git a/debian/changelog b/debian/changelog
index 22cdba7..c1cc6df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xorg (1:7.3+10ubuntu9) hardy; urgency=low
+
+ * control: Add an epoch to the "x11-common Replaces xrgb" version.
+ (LP: #212672)
+ * dexconf, failsafeDexconf: Revert back to using "mouse" by default, and
+ use vmmouse_detect to determine if the system is a virtual machine and
+ if yes, use vmmouse and set the device path. (LP: #216667, #216276)
+ * control: xserver-xorg needs to Depend on mdetect instead of Recommends.
+
+ -- Timo Aaltonen <[EMAIL PROTECTED]> Mon, 14 Apr 2008 16:35:12 +0300
+
xorg (1:7.3+10ubuntu8) hardy; urgency=low
* dexconf: Add CorePointer to the default mouse section, otherwise
diff --git a/debian/control b/debian/control
index f64ff0f..a194654 100644
--- a/debian/control
+++ b/debian/control
@@ -65,7 +65,7 @@ Conflicts: xfree86-common, xorg-common, xserver-common,
x-common,
ucbmpeg-play (<< 2.3p-13), netscape-base-4, communicator-smotif-477, epan,
navigator-smotif-477, stella (<< 2.2-1), xfractint (<< 20.3.01-1), xgobi,
xpostitplus, xisp, vide (<= 1.21-3)
-Replaces: xfree86-common, xorg-common, xserver-common, x-common, xinit (<=
1.0.2-0ubuntu3), xrgb (<= 1.0.0-0ubuntu2)
+Replaces: xfree86-common, xorg-common, xserver-common, x-common, xinit (<=
1.0.2-0ubuntu3), xrgb (<= 1:1.0.0-0ubuntu2)
Description: X Window System (X.Org) infrastructure
x11-common contains the filesystem infrastructure required for further
installation of the X Window System in any configuration; it does not
@@ -83,8 +83,8 @@ Architecture: all
Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common
Replaces: xserver-common
Pre-Depends: x11-common (>= 1:7.3+3)
-Depends: xserver-xorg-core (>= 2:1.4-3), xserver-xorg-video-all |
xserver-xorg-video-2, xserver-xorg-input-all | xserver-xorg-input-2,
${misc:Depends}, xkb-data | xkb-data-legacy, x11-xkb-utils
-Recommends: libgl1-mesa-dri, udev, ${F:XServer-Xorg-Detect-Depends},
displayconfig-gtk, mdetect, laptop-detect
+Depends: xserver-xorg-core (>= 2:1.4-3), xserver-xorg-video-all |
xserver-xorg-video-2, xserver-xorg-input-all | xserver-xorg-input-2,
${misc:Depends}, xkb-data | xkb-data-legacy, x11-xkb-utils, mdetect
+Recommends: libgl1-mesa-dri, udev, ${F:XServer-Xorg-Detect-Depends},
displayconfig-gtk, laptop-detect
Description: the X.Org X server
This package depends on the full suite of the server and drivers for the
X.Org X server, as well as providing a configuration infrastructure to manage
diff --git a/debian/local/Failsafe/failsafeDexconf
b/debian/local/Failsafe/failsafeDexconf
index a7d0db5..6b08ec5 100755
--- a/debian/local/Failsafe/failsafeDexconf
+++ b/debian/local/Failsafe/failsafeDexconf
@@ -124,14 +124,26 @@ if [ "$RET" = "true" ]; then
DO_EMULATE3BUTTONS=true
fi
+MOUSE_DRIVER=mouse
+IS_VIRT=
+if which vmmouse_detect >/dev/null 2>&1; then
+ if vmmouse_detect > /dev/null ; then
+ MOUSE_DRIVER=vmmouse
+ IS_VIRT=true
+ fi
+fi
+
cat <<SECTION >> ${OUTFILE}
Section "InputDevice"
Identifier "Configured Mouse"
- Driver "vmmouse"
+ Driver "$MOUSE_DRIVER"
SECTION
if [ -n "$DO_EMULATE3BUTTONS" ]; then
printf "\tOption\t\t\"Emulate3Buttons\"\t\"true\"\n" >> ${OUTFILE}
fi
+if [ -n "$IS_VIRT" ]; then
+ printf "\tOption\t\t\"Device\"\t\"/dev/input/mice\"\n" >> ${OUTFILE}
+fi
printf "EndSection\n\n" >> ${OUTFILE}
if [ -n "$LAPTOP" ]; then
diff --git a/debian/local/dexconf b/debian/local/dexconf
index c9a3ae8..d4ce6dc 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -221,16 +221,28 @@ if [ "$RET" = "true" ]; then
DO_EMULATE3BUTTONS=true
fi
+MOUSE_DRIVER=mouse
+IS_VIRT=
+if which vmmouse_detect >/dev/null 2>&1; then
+ if vmmouse_detect > /dev/null ; then
+ MOUSE_DRIVER=vmmouse
+ IS_VIRT=true
+ fi
+fi
+
exec 4>"$DEXCONFTMPDIR/InputDeviceMouse"
cat >&4 <<SECTION
Section "InputDevice"
Identifier "Configured Mouse"
- Driver "vmmouse"
+ Driver "$MOUSE_DRIVER"
Option "CorePointer"
SECTION
if [ -n "$DO_EMULATE3BUTTONS" ]; then
printf "\tOption\t\t\"Emulate3Buttons\"\t\"true\"\n" >&4
fi
+if [ -n "$IS_VIRT" ]; then
+ printf "\tOption\t\t\"Device\"\t\"/dev/input/mice\"\n" >> ${OUTFILE}
+fi
printf "EndSection\n" >&4
if [ -n "$LAPTOP" ]; then
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
