reverted:
--- darcs-1.0.9/debian/dirs
+++ darcs-1.0.9.orig/debian/dirs
@@ -1 +0,0 @@
-/var/cache/darcs
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
@@ -3,8 +3,8 @@
 Priority: optional
 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), autoconf, 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.3
+Build-Depends: debhelper (>> 4.0), ghc6 (>> 6.2), autoconf, libghc6-html-dev, libghc6-mtl-dev, libghc6-quickcheck-dev, libghc6-regex-compat-dev, libghc6-parsec-dev, libcurl3-dev, libkrb5-dev, dvipng, tetex-bin, tex4ht, quilt
+Standards-Version: 3.7.2
 
 Package: darcs
 Architecture: any
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
@@ -1,14 +1,17 @@
 #!/usr/bin/make -f
 
+include /usr/share/quilt/quilt.make
+
 configure: configure-stamp
-configure-stamp:
+configure-stamp: patch
 	dh_testdir
+	autoconf
 	sh ./configure --with-sendmail=/usr/sbin/sendmail \
 	  --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
 	  --mandir=/usr/share/man --datadir=/usr/share
 	touch configure-stamp
 
-build: patch-stamp build-stamp
+build: build-stamp
 build-stamp: configure-stamp 
 	dh_testdir
 #	$(MAKE)
@@ -17,7 +20,8 @@
 	$(MAKE) index.html
 	touch build-stamp
 
-clean: unpatch
+clean: clean-patched unpatch
+clean-patched:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
@@ -54,7 +58,6 @@
 	dh_testroot -a
 	dh_installdocs -a
 	dh_installexamples -a
-	dh_installdirs
 	dh_installman -pdarcs darcs.1
 	dh_installman -pdarcs-server
 	dh_installchangelogs -a ChangeLog
@@ -68,34 +71,6 @@
 	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/changelog darcs-1.0.9/debian/changelog
--- darcs-1.0.9/debian/changelog
+++ darcs-1.0.9/debian/changelog
@@ -1,3 +1,23 @@
+darcs (1.0.9-1.1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable (LP: #230442), remaining changes:
+    - Add /var/cache/darcs to dirs (slight change from original patch to
+      only add for darcs-server)
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- Iain Lane <iain@orangesquash.org.uk>  Thu, 15 May 2008 00:57:18 +0100
+
+darcs (1.0.9-1.1) unstable; urgency=low
+
+  * Non-maintainer upload, based on the fix in Ubuntu.
+  * Patch aclocal.m4 to fix FTBFS. Requires build-dep on autoconf.
+    debian/patches/openfd_configure_workaround.patch (Closes: #470376)
+  * Add libghc6-regex-compat-dev, libghc6-parsec-dev and quilt to build-dep.
+  * Removing tetex-extra from build-dep as requested by the Release Managers.
+
+ -- Bernd Zeimetz <bzed@debian.org>  Fri, 04 Apr 2008 21:54:03 +0200
+
 darcs (1.0.9-1ubuntu2) hardy; urgency=low
 
   * Added /var/cache/darcs to dirs (LP: #52199)
only in patch2:
unchanged:
--- darcs-1.0.9.orig/debian/patches/series
+++ darcs-1.0.9/debian/patches/series
@@ -0,0 +1 @@
+openfd_configure_workaround.patch
only in patch2:
unchanged:
--- darcs-1.0.9.orig/debian/darcs-server.dirs
+++ darcs-1.0.9/debian/darcs-server.dirs
@@ -0,0 +1 @@
+var/cache/darcs