diff -u davfs2-1.2.1/debian/control davfs2-1.2.1/debian/control
--- davfs2-1.2.1/debian/control
+++ davfs2-1.2.1/debian/control
@@ -1,8 +1,9 @@
 Source: davfs2
 Section: utils
 Priority: extra
-Maintainer: Luciano Bello <luciano@linux.org.ar>
-Build-Depends: debhelper (>= 4.0.0), po-debconf, libssl-dev, libxml2-dev, libneon26-dev
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Luciano Bello <luciano@linux.org.ar>
+Build-Depends: debhelper (>= 4.0.0), po-debconf, libssl-dev, libxml2-dev, libneon26-dev, dpatch
 Standards-Version: 3.7.2
 
 Package: davfs2
diff -u davfs2-1.2.1/debian/changelog davfs2-1.2.1/debian/changelog
--- davfs2-1.2.1/debian/changelog
+++ davfs2-1.2.1/debian/changelog
@@ -1,3 +1,16 @@
+davfs2 (1.2.1-3ubuntu1) hardy; urgency=low
+
+  * debian/control, debian/rules,
+    debian/patches/00list:
+    - added dpatch support
+  * debian/patches/umount_errors.dpatch:
+    - patch to fix umount errors (LP: #178650)
+      (patch from Adrian Bridgett)
+  * debian/control:
+    - updated Maintainer field
+
+ -- Mario Bonino <mariobonino@ubuntu-it.org>  Thu, 27 Dec 2007 13:11:59 +0100
+
 davfs2 (1.2.1-3) unstable; urgency=low
 
   * DebConf7 release.
diff -u davfs2-1.2.1/debian/rules davfs2-1.2.1/debian/rules
--- davfs2-1.2.1/debian/rules
+++ davfs2-1.2.1/debian/rules
@@ -4,6 +4,7 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+include /usr/share/dpatch/dpatch.make
 
 CFLAGS = -Wall -g
 
@@ -22,14 +23,14 @@
 
 build: build-stamp 
 
-build-stamp: config.status 
+build-stamp: patch-stamp config.status 
 	dh_testdir
 
 	$(MAKE)
 
 	touch build-stamp
 
-clean:
+clean:  unpatch
 	dh_testdir
 	dh_testroot
 	debconf-updatepo
only in patch2:
unchanged:
--- davfs2-1.2.1.orig/debian/patches/00list
+++ davfs2-1.2.1/debian/patches/00list
@@ -0,0 +1 @@
+umount_errors.dpatch
only in patch2:
unchanged:
--- davfs2-1.2.1.orig/debian/patches/umount_errors.dpatch
+++ davfs2-1.2.1/debian/patches/umount_errors.dpatch
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## umount_errors.dpatch by Mario Bonino <mariobonino@ubuntu-it.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch to fix umount errors. (Patch from Adrian Bridgett)
+
+@DPATCH@
+diff -urNad davfs2-1.2.1~/src/umount_davfs.c davfs2-1.2.1/src/umount_davfs.c
+--- davfs2-1.2.1~/src/umount_davfs.c	2007-02-18 11:03:08.000000000 +0100
++++ davfs2-1.2.1/src/umount_davfs.c	2007-12-27 13:17:33.000000000 +0100
+@@ -147,7 +147,7 @@
+     }
+     fclose(file);
+ 
+-    char *ps_command = ne_concat("ps -p ", pid, " -C ", mpoint, NULL);
++    char *ps_command = ne_concat("ps -p ", pid, NULL);
+     FILE *ps_in = popen(ps_command, "r");
+     if (ps_in == NULL) {
+         error(0, 0,
+@@ -163,7 +163,8 @@
+     char *ps_line = NULL;
+     while (!found && getline(&ps_line, &n, ps_in) > 0)
+         found = (strstr(ps_line, pid) != NULL
+-                 && strstr(ps_line, PROGRAM_NAME) != NULL);
++                 && strstr(ps_line, PROGRAM_NAME) != NULL
++                 && strstr(ps_line, mpoint));
+ 
+     pclose(ps_in);
+