diff -u darcs-2.0.0/debian/control darcs-2.0.0/debian/control
--- darcs-2.0.0/debian/control
+++ darcs-2.0.0/debian/control
@@ -1,7 +1,8 @@
 Source: darcs
 Section: devel
 Priority: optional
-Maintainer: Trent W. Buck <trentbuck@gmail.com>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Trent W. Buck <trentbuck@gmail.com>
 Uploaders: Isaac Jones <ijones@debian.org>, Petr Rockai <mornfall@debian.org>
 Build-Depends: debhelper (>> 4.0), cdbs, patchutils, ghc6 (>= 6.8), libghc6-html-dev, libghc6-http-dev, libghc6-parsec-dev, libghc6-regex-compat-dev, libghc6-http-dev, libghc6-mtl-dev, libghc6-quickcheck-dev, libcurl4-openssl-dev | libcurl4-gnutls-dev, libkrb5-dev, texlive, tex4ht
 Standards-Version: 3.7.2
diff -u darcs-2.0.0/debian/rules darcs-2.0.0/debian/rules
--- darcs-2.0.0/debian/rules
+++ darcs-2.0.0/debian/rules
@@ -9,11 +9,10 @@
 DEB_CONFIGURE_EXTRA_FLAGS += --datadir=/usr/share
 DEB_MAKE_INSTALL_TARGET += installdocs installserver
 
-# Work around #481592 (Closes: #485631).
-# Remove me when #481592 is closed!
-ifeq ($(DEB_HOST_ARCH),ia64)
+# See: https://bugs.launchpad.net/ubuntu/+source/binutils/+bug/240884
+# and: http://sourceware.org/bugzilla/show_bug.cgi?id=6656 for why this
+# is necessary.
 CFLAGS := $(filter-out -g,$(CFLAGS))
-endif
 
 # The upstream makefile's "all" target rebuilds a bunch of files that
 # are included in the source tarball.  This upsets dpkg-source -b if
diff -u darcs-2.0.0/debian/changelog darcs-2.0.0/debian/changelog
--- darcs-2.0.0/debian/changelog
+++ darcs-2.0.0/debian/changelog
@@ -1,3 +1,12 @@
+darcs (2.0.0-5ubuntu1) intrepid; urgency=low
+
+  * Merge with Debian (LP: #237175), remaining changes:
+    + Filter out -g from CFLAGS, due to bug #240884
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- Iain Lane <iain@orangesquash.org.uk>  Tue, 15 Jul 2008 20:38:27 +0100
+
 darcs (2.0.0-5) unstable; urgency=low
 
   * Work around #481592 (Closes: #485631).