diff -u ksocrat-3.2.1/debian/control ksocrat-3.2.1/debian/control
--- ksocrat-3.2.1/debian/control
+++ ksocrat-3.2.1/debian/control
@@ -1,7 +1,8 @@
 Source: ksocrat
-Section: contrib/text
+Section: multiverse
 Priority: optional
-Maintainer: Debian QA Group <packages@qa.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org>
 Build-Depends: debhelper (>> 5.0.0), kdelibs4-dev (>= 4:3.4.2), libartsc0-dev (>= 1.4.2-1), gettext, libpng12-dev, libjpeg62-dev, zlib1g-dev
 Standards-Version: 3.7.3
 
diff -u ksocrat-3.2.1/debian/rules ksocrat-3.2.1/debian/rules
--- ksocrat-3.2.1/debian/rules
+++ ksocrat-3.2.1/debian/rules
@@ -72,6 +72,7 @@
 	dh_installdocs
 	dh_installexamples
 	dh_installmenu
+	dh_icons
 	dh_installman
 	dh_installinfo
 	dh_link
diff -u ksocrat-3.2.1/debian/changelog ksocrat-3.2.1/debian/changelog
--- ksocrat-3.2.1/debian/changelog
+++ ksocrat-3.2.1/debian/changelog
@@ -1,3 +1,12 @@
+ksocrat (3.2.1-2ubuntu1) hardy; urgency=low
+
+  * Merge from Debian(Unstable). (LP:#192942) remaining changes:
+    - debian/rules: Add dh_icons
+    - Modify Maintainer value to match Debian-Maintainer-Field Spec
+  * debian/control: Replace contrib/text with multiverse
+
+ -- Stefan Ebner <hellboy195@gmail.com>  Mon, 18 Feb 2008 16:51:47 +0100
+
 ksocrat (3.2.1-2) unstable; urgency=low
 
   * QA upload.
@@ -13,6 +22,31 @@
 
  -- Barry deFreese <bddebian@comcast.net>  Sat, 09 Feb 2008 15:17:17 -0500
 
+ksocrat (3.2.1-1ubuntu3) hardy; urgency=low
+
+  * Replace dh_iconcache with dh_icons.
+  * Modify Maintainer as per spec.
+
+ -- Steve Kowalik <stevenk@ubuntu.com>  Thu, 06 Dec 2007 16:37:50 +1100
+
+ksocrat (3.2.1-1ubuntu2) gutsy; urgency=low
+
+  * rebuild for libgcc2
+
+ -- LaMont Jones <lamont@ubuntu.com>  Tue, 12 Jun 2007 06:53:30 -0600
+
+ksocrat (3.2.1-1ubuntu1) dapper; urgency=low
+
+  * Added dh_iconcache
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Sat,  6 May 2006 22:36:15 +1000
+
+ksocrat (3.2.1-1build1) dapper; urgency=low
+
+  * Rebuild KDE universe for libstdc++ transition
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 17 Dec 2005 16:24:49 +0000
+
 ksocrat (3.2.1-1) unstable; urgency=medium
 
   * QA upload.