diff -Nru xserver-xorg-input-mouse-1.5.0+git20100609.ad78ef7a/ChangeLog xserver-xorg-input-mouse-1.5.0+git20100706.b714882b/ChangeLog
--- xserver-xorg-input-mouse-1.5.0+git20100609.ad78ef7a/ChangeLog	2010-06-09 20:21:42.000000000 +0100
+++ xserver-xorg-input-mouse-1.5.0+git20100706.b714882b/ChangeLog	2010-07-06 01:09:42.000000000 +0100
@@ -1,3 +1,33 @@
+commit 3ba1147a1fb36fe7796edeb368ada414b1aac19c
+Author: Robert Hooker <sarvatt@ubuntu.com>
+Date:   Tue Jul 6 08:54:06 2010 +0845
+
+    Add debian tree from origin/debian-unstable
+
+commit b714882b0245a2d6078d8778156e88813761f2c4
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Thu May 27 18:57:33 2010 -0400
+
+    config: use AC_PROG_INSTALL now supplied by XORG_DEFAULT_OPTIONS
+    
+    The existing statement can now be removed from the configuration file.
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 1188152feee345b7a0f39513cd9d7b8bab938338
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Thu May 27 09:32:59 2010 -0400
+
+    config: upgrade to util-macros 1.8 for additional man page support
+    
+    Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+    The value of MAN_SUBST is the same for all X.Org packages.
+    
+    Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+    The existing statement can now be removed from the configuration file.
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
 commit ad78ef7a9488f7235032e106839224fc43f20e5f
 Author: Gaetan Nadon <memsize@videotron.ca>
 Date:   Thu May 13 16:09:03 2010 -0400
diff -Nru xserver-xorg-input-mouse-1.5.0+git20100609.ad78ef7a/configure.ac xserver-xorg-input-mouse-1.5.0+git20100706.b714882b/configure.ac
--- xserver-xorg-input-mouse-1.5.0+git20100609.ad78ef7a/configure.ac	2010-06-09 20:21:04.000000000 +0100
+++ xserver-xorg-input-mouse-1.5.0+git20100706.b714882b/configure.ac	2010-07-06 01:09:06.000000000 +0100
@@ -40,15 +40,11 @@
 
 # Initialize X.Org macros
 m4_ifndef([XORG_MACROS_VERSION],
-          [m4_fatal([must install xorg-macros 1.4 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.4)
+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
 XORG_DEFAULT_OPTIONS
 XORG_WITH_LINT
 
-# Checks for programs.
-AC_PROG_INSTALL
-AC_PROG_SED
-
 # Obtain compiler/linker options from server and required extensions
 PKG_CHECK_MODULES(XORG, [xorg-server >= 1.5.99.901] xproto inputproto)
 
diff -Nru xserver-xorg-input-mouse-1.5.0+git20100609.ad78ef7a/debian/changelog xserver-xorg-input-mouse-1.5.0+git20100706.b714882b/debian/changelog
--- xserver-xorg-input-mouse-1.5.0+git20100609.ad78ef7a/debian/changelog	2010-07-06 01:12:29.000000000 +0100
+++ xserver-xorg-input-mouse-1.5.0+git20100706.b714882b/debian/changelog	2010-07-06 01:12:29.000000000 +0100
@@ -1,10 +1,10 @@
-xserver-xorg-input-mouse (1:1.5.0+git20100609.ad78ef7a-0ubuntu0sarvatt) maverick; urgency=low
+xserver-xorg-input-mouse (1:1.5.0+git20100706.b714882b-0ubuntu0sarvatt) maverick; urgency=low
 
-  * Checkout from git 20100609 (master branch) up to commit
-    ad78ef7a9488f7235032e106839224fc43f20e5f
+  * Checkout from git 20100706 (master branch) up to commit
+    b714882b0245a2d6078d8778156e88813761f2c4
   * Only added debian/ tree from origin/debian-unstable
 
- -- Robert Hooker <sarvatt@ubuntu.com>  Wed, 09 Jun 2010 15:21:45 -0400
+ -- Robert Hooker <sarvatt@ubuntu.com>  Tue, 06 Jul 2010 08:54:45 +0845
 
 xserver-xorg-input-mouse (1:1.5.0-2) unstable; urgency=medium
 
diff -Nru xserver-xorg-input-mouse-1.5.0+git20100609.ad78ef7a/.lastcommit xserver-xorg-input-mouse-1.5.0+git20100706.b714882b/.lastcommit
--- xserver-xorg-input-mouse-1.5.0+git20100609.ad78ef7a/.lastcommit	2010-06-09 20:21:04.000000000 +0100
+++ xserver-xorg-input-mouse-1.5.0+git20100706.b714882b/.lastcommit	2010-07-06 01:09:06.000000000 +0100
@@ -1 +1 @@
-commit ad78ef7a9488f7235032e106839224fc43f20e5f
+commit b714882b0245a2d6078d8778156e88813761f2c4
diff -Nru xserver-xorg-input-mouse-1.5.0+git20100609.ad78ef7a/man/Makefile.am xserver-xorg-input-mouse-1.5.0+git20100706.b714882b/man/Makefile.am
--- xserver-xorg-input-mouse-1.5.0+git20100609.ad78ef7a/man/Makefile.am	2010-06-09 20:21:04.000000000 +0100
+++ xserver-xorg-input-mouse-1.5.0+git20100706.b714882b/man/Makefile.am	2010-07-06 01:09:06.000000000 +0100
@@ -31,22 +31,6 @@
 
 CLEANFILES = $(driverman_DATA)
 
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
-  XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
-	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-	-e 's|__xservername__|Xorg|g' \
-	-e 's|__xconfigfile__|xorg.conf|g' \
-	-e 's|__projectroot__|$(prefix)|g' \
-	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
-	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
-	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
-	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
 SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
 
 .man.$(DRIVER_MAN_SUFFIX):