diff -u darcs-1.0.9/configure darcs-1.0.9/configure
diff -u darcs-1.0.9/debian/changelog darcs-1.0.9/debian/changelog
--- darcs-1.0.9/debian/changelog
+++ darcs-1.0.9/debian/changelog
@@ -1,3 +1,15 @@
+darcs (1.0.9-1ubuntu1) hardy; urgency=low
+
+  * Patch aclocal.m4 to fix FTBFS. Changed files:
+    debian/rules, debian/patches/openfd_configure_workaround.patch
+    (LP: #188489)
+  * Add libghc6-regex-compat-dev and libghc6-parsec-dev to build-dep.
+    Changed files: debian/control
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- Iain Lane <iain@orangesquash.org.uk>  Fri, 22 Feb 2008 15:37:27 +0000
+
 darcs (1.0.9-1) unstable; urgency=low
 
   * New upstream release (Closes: 430950).
diff -u darcs-1.0.9/debian/rules darcs-1.0.9/debian/rules
--- darcs-1.0.9/debian/rules
+++ darcs-1.0.9/debian/rules
@@ -8,7 +8,7 @@
 	  --mandir=/usr/share/man --datadir=/usr/share
 	touch configure-stamp
 
-build: build-stamp
+build: patch-stamp build-stamp
 build-stamp: configure-stamp 
 	dh_testdir
 #	$(MAKE)
@@ -17,7 +17,7 @@
 	$(MAKE) index.html
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
@@ -66,6 +66,34 @@
 	dh_md5sums -a
 	dh_builddeb -a
 
+# Apply patches to the package
+patch: patch-stamp
+patch-stamp:
+	dh_testdir
+	@patches=debian/patches/*.patch; for patch in $$patches; do \
+		test -f $$patch || continue; \
+		echo "Applying $$patch"; \
+		patch -stuN -p1 < $$patch || exit 1; \
+	done
+	autoconf
+	touch $@
+
+# Remove patches from the package
+unpatch:
+	dh_testdir
+	@if test -f patch-stamp; then \
+		patches=debian/patches/*.patch; \
+		for patch in $$patches; do \
+			reversepatches="$$patch $$reversepatches"; \
+		done; \
+		for patch in $$reversepatches; do \
+			test -f $$patch || continue; \
+			echo "Reversing $$patch"; \
+			patch -suRf -p1 < $$patch || exit 1; \
+		done; \
+		rm -f patch-stamp; \
+	fi
+
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure
 
diff -u darcs-1.0.9/debian/control darcs-1.0.9/debian/control
--- darcs-1.0.9/debian/control
+++ darcs-1.0.9/debian/control
@@ -1,8 +1,9 @@
 Source: darcs
 Section: devel
 Priority: optional
-Maintainer: Isaac Jones <ijones@debian.org>
-Build-Depends: debhelper (>> 4.0), ghc6 (>> 6.2), libghc6-html-dev, libghc6-mtl-dev, libghc6-quickcheck-dev, libcurl3-dev, libkrb5-dev, dvipng, tetex-bin, tetex-extra, tex4ht
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Isaac Jones <ijones@debian.org>
+Build-Depends: debhelper (>> 4.0), ghc6 (>> 6.2), libghc6-html-dev, libghc6-mtl-dev, libghc6-quickcheck-dev, libghc6-regex-compat-dev, libghc6-parsec-dev, libcurl3-dev, libkrb5-dev, dvipng, tetex-bin, tetex-extra, tex4ht
 Standards-Version: 3.7.2
 
 Package: darcs
only in patch2:
unchanged:
--- darcs-1.0.9.orig/debian/patches/openfd_configure_workaround.patch
+++ darcs-1.0.9/debian/patches/openfd_configure_workaround.patch
@@ -0,0 +1,34 @@
+--- darcs-1.0.9/aclocal.m4	2007-06-16 18:12:11.000000000 +0100
++++ darcs-1.0.9/aclocal.m4	2008-02-22 11:40:51.000000000 +0000
+@@ -447,9 +447,30 @@ Work around change in the GHC.Handle.ope
+ openFd :: Int -> Maybe FDType -> FilePath -> IOMode -> Bool -> Bool -> IO Handle
+ openFd fd x y z a b = GHC.Handle.openFd fd x b y z a
+         ]]),
++       AC_MSG_RESULT([NOT 'new' API])
++       AC_MSG_CHECKING([GHC.Handle.fdToHandle' API])
++       TRY_RUN_GHC([
++import GHC.Handle ( fdToHandle' )
++import IO ( IOMode(..) )
++
++main = fdToHandle' 1 Nothing False "stdout" WriteMode True
++       ],
++       AC_MSG_RESULT([okay])
++       IMPORT_WORKAROUND([import qualified GHC.Handle ( fdToHandle' )
++import System.IO ( Handle, IOMode )
++import System.Posix.Internals ( FDType )
++])
++       CODE_WORKAROUND([[
++{-
++Work around renaming of GHC.Handle.openFd and change in its API.
++-}
++openFd :: Int -> Maybe FDType -> FilePath -> IOMode -> Bool -> Bool -> IO Handle
++openFd fd x y z a b = GHC.Handle.fdToHandle' (fromIntegral fd) x b y z a
++        ]]),
+        AC_MSG_RESULT([failed])
+        AC_MSG_ERROR([Couldnt figure out how to call GHC.Handle.openFd!])
+     )
+   )
+-])
++)])
++
+