diff -Nru fprint-demo-20080303git/debian/changelog fprint-demo-20080303git/debian/changelog
--- fprint-demo-20080303git/debian/changelog	2010-08-11 06:07:21.000000000 +0530
+++ fprint-demo-20080303git/debian/changelog	2010-08-15 03:32:07.000000000 +0530
@@ -1,3 +1,12 @@
+fprint-demo (20080303git-5ubuntu1) maverick; urgency=low
+
+  * Merge with debian, remaining changes
+    - Add dh_icons in debian/rules to install icons
+    - Build-depend on debhelper >= 5.0.51~ for dh_icons
+    - Add usr/share/applications to debian/dirs
+
+ -- Rohan Garg <rohangarg@ubuntu.com>  Sun, 15 Aug 2010 03:30:56 +0530
+
 fprint-demo (20080303git-5) unstable; urgency=low
 
   * Generated proper patch file to handle re-configure'ing (some cleanup).
@@ -49,6 +58,22 @@
 
  -- Ulises Vitulli <uvitulli@fi.uba.ar>  Fri, 27 Jun 2008 20:04:23 -0300
 
+fprint-demo (20080202-2ubuntu1) intrepid; urgency=low
+
+  * debian/fprint-demo.desktop: 
+   + Removed "Encoding" in "Desktop Entry" is deprecated
+  * debian/rules: (LP: #243619)
+   + icon added
+   + call dh_icons
+  * debian/dirs:
+   + added usr/share/applications 
+  * debian/control:
+   + Standards-Version updated.
+   + Set Ubuntu maintainer address. 
+   - Build-depend on debhelper >= 5.0.51~ for dh_icons
+
+ -- Emanuele Gentili <emgent@ubuntu.com>  Fri, 27 Jun 2008 19:42:50 +0200
+
 fprint-demo (20080202-2) experimental; urgency=low
 
   * Added +x perms to configure script (Closes: 472464)
@@ -60,4 +85,3 @@
   * Initial release (Closes: #469768)
 
  -- Ulises Vitulli <uvitulli@fi.uba.ar>  Tue, 19 Feb 2008 11:15:48 -0200
-
diff -Nru fprint-demo-20080303git/debian/control fprint-demo-20080303git/debian/control
--- fprint-demo-20080303git/debian/control	2010-08-11 06:07:30.000000000 +0530
+++ fprint-demo-20080303git/debian/control	2010-08-15 03:30:44.000000000 +0530
@@ -1,9 +1,10 @@
 Source: fprint-demo
 Section: x11
 Priority: extra
-Maintainer: FingerForce Team <fingerforce-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: FingerForce Team <fingerforce-devel@lists.alioth.debian.org>
 Uploaders: Ulises Vitulli <dererk@debian.org>, Miguel Gea Milvaques <xerakko@debian.org>
-Build-Depends: debhelper (>= 5), autotools-dev, automake, libfprint-dev, 
+Build-Depends: debhelper (>= 5.0.51~), autotools-dev, automake, libfprint-dev, 
  libgtk2.0-dev, pkg-config
 Standards-Version: 3.9.1
 Homepage: http://reactivated.net/fprint/
diff -Nru fprint-demo-20080303git/debian/dirs fprint-demo-20080303git/debian/dirs
--- fprint-demo-20080303git/debian/dirs	2009-01-14 03:53:49.000000000 +0530
+++ fprint-demo-20080303git/debian/dirs	2010-08-15 03:29:44.000000000 +0530
@@ -1,2 +1,3 @@
 usr/bin
 usr/share/pixmaps
+usr/share/applications
\ No newline at end of file
diff -Nru fprint-demo-20080303git/debian/rules fprint-demo-20080303git/debian/rules
--- fprint-demo-20080303git/debian/rules	2010-06-03 19:37:21.000000000 +0530
+++ fprint-demo-20080303git/debian/rules	2010-08-15 03:28:40.000000000 +0530
@@ -67,6 +67,7 @@
 	dh_testroot
 	dh_installchangelogs NEWS
 	dh_installdocs
+	dh_icons
 	dh_installmenu
 	dh_installman
 	dh_link