diff -u hat-2.05+rerolled/debian/changelog hat-2.05+rerolled/debian/changelog
--- hat-2.05+rerolled/debian/changelog
+++ hat-2.05+rerolled/debian/changelog
@@ -1,3 +1,11 @@
+hat (2.05+rerolled-7ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #254642):
+    - debian/rules: 
+      + Unexport default LDFLAGS as ghc6 doesn't understand them.
+
+ -- Nathan Handler <nhandler@ubuntu.com>  Mon, 04 Aug 2008 07:55:19 -0500
+
 hat (2.05+rerolled-7) unstable; urgency=low
 
   * debian/rules:
@@ -21,6 +29,15 @@
   
  -- Arjan Oosting <arjan@debian.org>  Tue, 22 Jul 2008 21:58:08 +0200
 
+hat (2.05+rerolled-5ubuntu1) hardy; urgency=low
+
+  * debian/rules:
+    + Unexport default LDFLAGS as ghc6 doesn't understand them.
+  * debian/control:
+    + Modify Maintainer value to match DebianMaintainerField spec.
+
+ -- Michael Bienia <geser@ubuntu.com>  Tue, 19 Feb 2008 11:55:47 +0100
+
 hat (2.05+rerolled-5) unstable; urgency=high
 
   * Set urgency to high as this upload fixes an RC bug.
@@ -404 +420,0 @@
-
diff -u hat-2.05+rerolled/debian/control hat-2.05+rerolled/debian/control
--- hat-2.05+rerolled/debian/control
+++ hat-2.05+rerolled/debian/control
@@ -1,7 +1,8 @@
 Source: hat
 Section: devel
 Priority: optional
-Maintainer: Arjan Oosting <arjan@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Arjan Oosting <arjan@debian.org>
 Uploaders: Isaac Jones <ijones@debian.org>
 Standards-Version: 3.8.0
 Build-Depends: dctrl-tools, debhelper (>= 5), dpatch, 
diff -u hat-2.05+rerolled/debian/rules hat-2.05+rerolled/debian/rules
--- hat-2.05+rerolled/debian/rules
+++ hat-2.05+rerolled/debian/rules
@@ -5,6 +5,9 @@
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
 
+# Unset LDFLAGS set by dpkg-buildpackage
+unexport LDFLAGS
+
 # Include dpatch
 include /usr/share/dpatch/dpatch.make