diff -u xmds-1.6.6/debian/changelog xmds-1.6.6/debian/changelog
--- xmds-1.6.6/debian/changelog
+++ xmds-1.6.6/debian/changelog
@@ -1,3 +1,12 @@
+xmds (1.6.6-1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #249987):
+    - debian/control: Getting rid of octave2.1-headers in b-d
+    - Modify Maintainer value to match the DebianMaintainerField
+      specification.
+
+ -- Nathan Handler <nhandler@ubuntu.com>  Fri, 18 Jul 2008 17:59:20 -0500
+
 xmds (1.6.6-1) unstable; urgency=low
 
   * New upstream release
@@ -10,6 +19,15 @@
 
  -- Rafael Laboissiere <rafael@debian.org>  Sat, 12 Jul 2008 10:53:41 +0200
 
+xmds (1.6.5-2ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/control: Getting rid of octave2.1-headers in b-d
+    - Modify Maintainer value to match the DebianMaintainerField
+      specification.
+
+ -- Nathan Handler <mrcheatr@gmail.com>  Wed, 07 May 2008 20:40:13 -0500
+
 xmds (1.6.5-2) unstable; urgency=low
 
   * debian/control: Build-depend on quilt
@@ -32,6 +50,14 @@
 
  -- Rafael Laboissiere <rafael@debian.org>  Fri, 29 Feb 2008 00:32:17 +0100
 
+xmds (1.6.4-1ubuntu1) hardy; urgency=low
+
+  * debian/control: Getting rid of octave2.1-headers in b-d
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- Stephan Hermann <sh@sourcecode.de>  Tue, 12 Feb 2008 20:57:27 +0100
+
 xmds (1.6.4-1) unstable; urgency=low
 
   * New upstream release
diff -u xmds-1.6.6/debian/control xmds-1.6.6/debian/control
--- xmds-1.6.6/debian/control
+++ xmds-1.6.6/debian/control
@@ -1,11 +1,12 @@
 Source: xmds
 Section: science
 Priority: extra
-Maintainer: Debian Scientific Computing Team <pkg-scicomp-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Scientific Computing Team <pkg-scicomp-devel@lists.alioth.debian.org>
 Uploaders: Christian T. Steigies <cts@debian.org>,
  Rafael Laboissiere <rafael@debian.org>
 Build-Depends: cdbs, debhelper (>= 7.0.0), autotools-dev, fftw-dev,
- libfftw3-dev, libmpich1.0-dev, octave2.1-headers, octave3.0-headers,
+ libfftw3-dev, libmpich1.0-dev, octave3.0-headers,
  autoconf
 Standards-Version: 3.8.0
 Homepage: http://xmds.sourceforge.net/