diff -pruN 7.4.1-4.1/debian/changelog 7.4.1-4.1ubuntu1/debian/changelog
--- 7.4.1-4.1/debian/changelog	2010-03-21 20:34:50.000000000 +0000
+++ 7.4.1-4.1ubuntu1/debian/changelog	2010-03-21 20:32:18.000000000 +0000
@@ -1,3 +1,11 @@
+xconq (7.4.1-4.1ubuntu1) lucid; urgency=low
+
+  * Merge from Debian testing, remaining changes:
+    - install a desktop file.
+  * Make desktop file pass validation.
+
+ -- Ilya Barygin <barygin@gmail.com>  Sun, 21 Mar 2010 20:33:24 +0300
+
 xconq (7.4.1-4.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -6,6 +14,20 @@ xconq (7.4.1-4.1) unstable; urgency=low
 
  -- Mehdi Dogguy <mehdi@debian.org>  Fri, 05 Feb 2010 18:11:57 +0100
 
+xconq (7.4.1-4ubuntu2) gutsy; urgency=low
+
+  * debian/control: Update maintainer fields according to debian-
+    maintainer-field spec.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 15 Aug 2007 08:11:32 +0000
+
+xconq (7.4.1-4ubuntu1) edgy; urgency=low
+
+  * Merge from debian unstable:
+    - debian/rules: Keep .desktop file.
+
+ -- Daniel T Chen <crimsun@ubuntu.com>  Fri, 30 Jun 2006 19:59:24 +0100
+
 xconq (7.4.1-4) unstable; urgency=low
 
   * Adopt this package (closes: #333796)
@@ -14,6 +36,14 @@ xconq (7.4.1-4) unstable; urgency=low
 
  -- David Nusinow <dnusinow@debian.org>  Sun, 26 Mar 2006 21:56:38 -0500
 
+xconq (7.4.1-3ubuntu1) dapper; urgency=low
+
+  * Resynchronise with Debian (Closes: #4103):
+    - Still Build-Depend on libxaw7-dev.
+    - Remove 12-bts-317485-tkmain_c in favor of 12-xconq-7.4.1-gcc-3.4.
+
+ -- Daniel T Chen <crimsun@fungus.sh.nu>  Tue, 08 Nov 2005 10:56:43 +0000
+
 xconq (7.4.1-3) unstable; urgency=medium
 
   * QA upload.
@@ -33,6 +63,25 @@ xconq (7.4.1-3) unstable; urgency=medium
 
  -- Matej Vela <vela@debian.org>  Wed,  2 Nov 2005 11:00:59 +0100
 
+xconq (7.4.1-2.1ubuntu3) breezy; urgency=low
+
+  * applied patch to fix FTBFS (Closes: bts 317485)
+  * Fixed .desktop installation 
+
+ -- Stephan Hermann <sh@sourcecode.de>  Wed, 12 Oct 2005 15:57:45 -0400
+
+xconq (7.4.1-2.1ubuntu2) breezy; urgency=low
+
+  * added .desktop file
+
+ -- Benjamin Montgomery <bmontgom@montynet.org>  Sat, 17 Sep 2005 19:56:04 -0500
+
+xconq (7.4.1-2.1ubuntu1) hoary; urgency=low
+
+  * Rebuild with ubuntu sources
+
+ -- Corey Burger <corey.burger@gmail.com>  Sat, 19 Mar 2005 02:43:11 -0800
+
 xconq (7.4.1-2.1) unstable; urgency=high
 
   * Non-maintainer upload by the Security Team
@@ -123,7 +172,7 @@ xconq (7.2.2-3) unstable; urgency=low
   * Make postinst set the permissions to 2755, not 2775.  (closes: bug#48264)
 
  -- Richard Braakman <dark@xs4all.nl>  Sun,  8 Aug 1999 22:53:50 +0200
-  
+
 xconq (7.2.2-2) unstable; urgency=low
 
   * Compile with -rpath /usr/X11R6/lib to force linking with real libXaw,
diff -pruN 7.4.1-4.1/debian/control 7.4.1-4.1ubuntu1/debian/control
--- 7.4.1-4.1/debian/control	2010-03-21 20:34:50.000000000 +0000
+++ 7.4.1-4.1ubuntu1/debian/control	2010-03-21 20:32:18.000000000 +0000
@@ -1,7 +1,8 @@
 Source: xconq
 Section: games
 Priority: optional
-Maintainer: David Nusinow <dnusinow@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: David Nusinow <dnusinow@debian.org>
 Build-Depends: debhelper (>> 3.0.0), tk8.3-dev, libxaw7-dev, texinfo (>= 4.0), texlive-latex-base, autotools-dev
 Standards-Version: 3.5.2
 
diff -pruN 7.4.1-4.1/debian/rules 7.4.1-4.1ubuntu1/debian/rules
--- 7.4.1-4.1/debian/rules	2010-03-21 20:34:50.000000000 +0000
+++ 7.4.1-4.1ubuntu1/debian/rules	2010-03-21 20:32:18.000000000 +0000
@@ -54,6 +54,10 @@ install: build
 	install -d debian/tmp/usr/share/doc/xconq-doc/doc-html
 	install -m 644 $(BUILD_DIR)/doc-html/* debian/tmp/usr/share/doc/xconq-doc/doc-html
 	    
+	# install the desktop file
+	install -d debian/tmp/usr/share/applications
+	install -m 644 debian/xconq.desktop debian/tmp/usr/share/applications
+    
 	# install the info docs
 	mv debian/tmp/usr/info debian/tmp/usr/share/info
 	cp $(BUILD_DIR)/doc/xconq.info*    debian/tmp/usr/share/info
diff -pruN 7.4.1-4.1/debian/xconq.desktop 7.4.1-4.1ubuntu1/debian/xconq.desktop
--- 7.4.1-4.1/debian/xconq.desktop	1970-01-01 01:00:00.000000000 +0100
+++ 7.4.1-4.1ubuntu1/debian/xconq.desktop	2010-03-21 20:32:18.000000000 +0000
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=XConq
+Comment=Turn based strategy game
+
+Exec=xconq
+StartupNotify=false
+Terminal=false
+Type=Application
+Categories=Game;2DGraphics;StrategyGame;
+MimeType=text/plain;
