diff -Nru xserver-xorg-input-vmmouse-12.5.1/debian/changelog xserver-xorg-input-vmmouse-12.5.1/debian/changelog
--- xserver-xorg-input-vmmouse-12.5.1/debian/changelog	2008-11-03 18:29:00.000000000 -0800
+++ xserver-xorg-input-vmmouse-12.5.1/debian/changelog	2008-11-03 18:29:00.000000000 -0800
@@ -1,3 +1,13 @@
+xserver-xorg-input-vmmouse (1:12.5.1-1ubuntu5.1) intrepid-proposed; urgency=low
+
+  * hal-probe-vmmouse, fdi/11-x11-vmmouse.fdi: Add HAL fdi and callout
+    script to make -vmmouse hotplug work.  (LP: #285305)
+  * Hardcode definition for ABS_VALUATOR_AXES; the configure test is
+    irrelevant since we already depend on xserver >= 1.4 in
+    debian/control.  (LP: #248521)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Mon, 03 Nov 2008 18:15:01 -0800
+
 xserver-xorg-input-vmmouse (1:12.5.1-1ubuntu5) intrepid; urgency=low
 
   * vmmouse_abs_valuator_axis.diff:
diff -Nru /tmp/vB08VSEpmQ/xserver-xorg-input-vmmouse-12.5.1/debian/fdi/11-x11-vmmouse.fdi /tmp/jM9wzPwurW/xserver-xorg-input-vmmouse-12.5.1/debian/fdi/11-x11-vmmouse.fdi
--- xserver-xorg-input-vmmouse-12.5.1/debian/fdi/11-x11-vmmouse.fdi	1969-12-31 16:00:00.000000000 -0800
+++ xserver-xorg-input-vmmouse-12.5.1/debian/fdi/11-x11-vmmouse.fdi	2008-11-03 18:29:00.000000000 -0800
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<deviceinfo version="0.2">
+  <device>
+    <match key="info.capabilities" contains="input.mouse">
+      <match key="input.originating_device" contains="i8042_AUX_port">
+        <append key="info.callouts.add" type="strlist">hal-probe-vmmouse</append>
+      </match>
+    </match>
+  </device>
+</deviceinfo>
+
diff -Nru /tmp/vB08VSEpmQ/xserver-xorg-input-vmmouse-12.5.1/debian/hal-probe-vmmouse /tmp/jM9wzPwurW/xserver-xorg-input-vmmouse-12.5.1/debian/hal-probe-vmmouse
--- xserver-xorg-input-vmmouse-12.5.1/debian/hal-probe-vmmouse	1969-12-31 16:00:00.000000000 -0800
+++ xserver-xorg-input-vmmouse-12.5.1/debian/hal-probe-vmmouse	2008-11-03 18:29:00.000000000 -0800
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+[ -x /usr/bin/hal-set-property ] || exit 0
+[ -x /usr/bin/vmmouse_detect ] || exit 0
+
+/usr/bin/vmmouse_detect
+if [ $? -eq 0 ]; then
+   /usr/bin/hal-set-property --direct --udi "$UDI" --key input.x11_driver --string "vmmouse"
+fi
+
diff -Nru /tmp/vB08VSEpmQ/xserver-xorg-input-vmmouse-12.5.1/debian/patches/vmmouse_abs_valuator_axis.diff /tmp/jM9wzPwurW/xserver-xorg-input-vmmouse-12.5.1/debian/patches/vmmouse_abs_valuator_axis.diff
--- xserver-xorg-input-vmmouse-12.5.1/debian/patches/vmmouse_abs_valuator_axis.diff	2008-11-03 18:29:00.000000000 -0800
+++ xserver-xorg-input-vmmouse-12.5.1/debian/patches/vmmouse_abs_valuator_axis.diff	2008-11-03 18:29:00.000000000 -0800
@@ -1,47 +1,13 @@
-diff -Nurp patched/configure working/configure
---- patched/configure	2008-10-20 18:18:28.000000000 -0700
-+++ working/configure	2008-10-20 18:20:22.000000000 -0700
-@@ -21012,6 +21012,18 @@ cat >>confdefs.h <<\_ACEOF
- _ACEOF
- 
- fi
-+if test -n "$PKG_CONFIG" && \
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server > 1.4.0.90\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "xorg-server > 1.4.0.90") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define ABS_VALUATOR_AXES 1
-+_ACEOF
-+
-+fi
- 
- CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
- 
-diff -Nurp patched/configure.ac working/configure.ac
---- patched/configure.ac	2008-10-20 18:18:28.000000000 -0700
-+++ working/configure.ac	2008-10-20 18:20:15.000000000 -0700
-@@ -86,6 +86,9 @@ PKG_CHECK_EXISTS([xorg-server >= 1.3.99.
-                  [AC_DEFINE([CALL_CONVERSION_PROC], 1,
-                             [Call conversion_proc from within the driver, as
-                              Xserver doesn't])])
-+PKG_CHECK_EXISTS([xorg-server > 1.4.0.90],
-+		 [AC_DEFINE([ABS_VALUATOR_AXES], 1,
-+			    [Define absolute valuator axes])])
- 
- CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
- AC_SUBST([CFLAGS])
 diff -Nurp patched/src/vmmouse.c working/src/vmmouse.c
 --- patched/src/vmmouse.c	2008-10-20 18:18:28.000000000 -0700
 +++ working/src/vmmouse.c	2008-10-20 18:20:15.000000000 -0700
-@@ -95,7 +95,7 @@
+@@ -95,7 +95,8 @@
   */
  #define VMMOUSE_MAJOR_VERSION 12
  #define VMMOUSE_MINOR_VERSION 5
 -#define VMMOUSE_PATCHLEVEL 1
 +#define VMMOUSE_PATCHLEVEL 2
++#define ABS_VALUATOR_AXES 1
  #define VMMOUSE_DRIVER_VERSION \
     (VMMOUSE_MAJOR_VERSION * 65536 + VMMOUSE_MINOR_VERSION * 256 + VMMOUSE_PATCHLEVEL)
  #define VMMOUSE_DRIVER_VERSION_STRING \
diff -Nru /tmp/vB08VSEpmQ/xserver-xorg-input-vmmouse-12.5.1/debian/rules /tmp/jM9wzPwurW/xserver-xorg-input-vmmouse-12.5.1/debian/rules
--- xserver-xorg-input-vmmouse-12.5.1/debian/rules	2008-11-03 18:29:00.000000000 -0800
+++ xserver-xorg-input-vmmouse-12.5.1/debian/rules	2008-11-03 18:29:00.000000000 -0800
@@ -74,6 +74,7 @@
 	dh_installdocs README
 	dh_installchangelogs ChangeLog
 	dh_install --sourcedir=debian/tmp --list-missing --exclude=vmmouse_drv.la --exclude=usr/share/man/man4
+	install -D -m 755 debian/hal-probe-vmmouse debian/xserver-xorg-input-vmmouse/usr/lib/hal/hal-probe-vmmouse
 	dh_installman
 	dh_link
 	dh_strip
diff -Nru /tmp/vB08VSEpmQ/xserver-xorg-input-vmmouse-12.5.1/debian/xserver-xorg-input-vmmouse.install /tmp/jM9wzPwurW/xserver-xorg-input-vmmouse-12.5.1/debian/xserver-xorg-input-vmmouse.install
--- xserver-xorg-input-vmmouse-12.5.1/debian/xserver-xorg-input-vmmouse.install	2008-11-03 18:29:00.000000000 -0800
+++ xserver-xorg-input-vmmouse-12.5.1/debian/xserver-xorg-input-vmmouse.install	2008-11-03 18:29:00.000000000 -0800
@@ -1,2 +1,2 @@
 usr/lib/xorg/modules/input/*.so
-
+../fdi/* /usr/share/hal/fdi/policy/10osvendor/