diff -Nru module-assistant-0.10.11.0/debian/changelog module-assistant-0.10.11.0ubuntu1/debian/changelog
--- module-assistant-0.10.11.0/debian/changelog	2008-01-18 01:46:15.000000000 +0530
+++ module-assistant-0.10.11.0ubuntu1/debian/changelog	2008-12-24 11:08:51.000000000 +0530
@@ -1,3 +1,10 @@
+module-assistant (0.10.11.0ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #311100)
+    - fglrx-kernel-src -> fglrx-kernel-source
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Wed, 24 Dec 2008 11:05:20 +0530
+
 module-assistant (0.10.11.0) unstable; urgency=medium
 
   * NMU prepared after consultation with the package maintainer.
@@ -5,6 +12,12 @@
 
  -- Sean Finney <seanius@debian.org>  Thu, 17 Jan 2008 21:14:15 +0100
 
+module-assistant (0.10.11ubuntu1) hardy; urgency=low
+
+  * fglrx-kernel-src -> fglrx-kernel-source (LP: #70059)
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Thu, 07 Feb 2008 20:46:47 +0200
+
 module-assistant (0.10.11) unstable; urgency=medium
 
   * Updated the Makefile list for the languages (sorry translators)
@@ -794,3 +807,4 @@
 Local variables:
 mode: debian-changelog
 End:
+
diff -Nru /tmp/qXH4kJl9bK/module-assistant-0.10.11.0/debian/control /tmp/Sj8HHbCIMN/module-assistant-0.10.11.0ubuntu1/debian/control
--- module-assistant-0.10.11.0/debian/control	2006-11-15 20:54:27.000000000 +0530
+++ module-assistant-0.10.11.0ubuntu1/debian/control	2008-11-05 10:08:28.000000000 +0530
@@ -1,7 +1,8 @@
 Source: module-assistant
 Section: misc
 Priority: optional
-Maintainer: Eduard Bloch <blade@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Eduard Bloch <blade@debian.org>
 Build-Depends: debhelper (>> 4.0.0), bzip2, gettext
 Standards-Version: 3.7.2
 
diff -Nru /tmp/qXH4kJl9bK/module-assistant-0.10.11.0/modass/compliant.list /tmp/Sj8HHbCIMN/module-assistant-0.10.11.0ubuntu1/modass/compliant.list
--- module-assistant-0.10.11.0/modass/compliant.list	2008-01-18 02:12:36.000000000 +0530
+++ module-assistant-0.10.11.0ubuntu1/modass/compliant.list	2008-11-05 10:08:28.000000000 +0530
@@ -22,7 +22,7 @@
 eagle-usb-modules-source
 em8300-source
 exmap-modules-source
-fglrx-kernel-src
+fglrx-kernel-source
 freeswan-modules-source
 ftape-source
 ftpfs-src