diff -u rt2500-1.1.0-b4/debian/patches/series rt2500-1.1.0-b4/debian/patches/series
diff -u rt2500-1.1.0-b4/debian/changelog rt2500-1.1.0-b4/debian/changelog
--- rt2500-1.1.0-b4/debian/changelog
+++ rt2500-1.1.0-b4/debian/changelog
@@ -1,3 +1,10 @@
+rt2500 (1:1.1.0-b4-4ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable (LP: #127397)
+  * Reverse compilation fixes to Debian ones
+
+ -- Cesare Tirabassi <cesare.tirabassi@gmail.com>  Sat, 21 Jul 2007 21:25:14 +0200
+
 rt2500 (1:1.1.0-b4-4) unstable; urgency=low
 
   * Workaround linux-libc-dev bug by including linux/if.h before
@@ -7,6 +14,15 @@
 
  -- Aurelien Jarno <aurel32@debian.org>  Sun, 15 Jul 2007 21:30:43 +0200
 
+rt2500 (1:1.1.0-b4-3ubuntu1) gutsy; urgency=low
+
+  * Add .desktop file (LP: #113054)
+  * Change Maintainer field
+  * Fix failed compilation (LP: #120301) Thanks to Andrew Price
+  * Fix rt2500 module compilation
+
+ -- Cesare Tirabassi <cesare.tirabassi@gmail.com>  Mon,  7 May 2007 14:19:35 +0200
+
 rt2500 (1:1.1.0-b4-3) unstable; urgency=low
 
   * Fixed 2.6.19.patch (Closes: #399051)
diff -u rt2500-1.1.0-b4/debian/control rt2500-1.1.0-b4/debian/control
--- rt2500-1.1.0-b4/debian/control
+++ rt2500-1.1.0-b4/debian/control
@@ -1,8 +1,9 @@
 Source: rt2500
 Section: net
 Priority: extra
-Build-Depends: debhelper (>= 4.0), libqt3-mt-dev (>= 3.3.4-4), bzip2, quilt
-Maintainer: Debian Ralink packages maintainers <pkg-ralink-maintainers@lists.alioth.debian.org>
+Build-Depends: debhelper (>= 4.0), libqt3-mt-dev (>= 3.3.4-4), bzip2, quilt, libiw-dev
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Ralink packages maintainers <pkg-ralink-maintainers@lists.alioth.debian.org>
 Uploaders: Aurelien Jarno <aurel32@debian.org>, Ben Hutchings <ben@decadentplace.org.uk>, Romain Beauxis <toots@rastageeks.org>
 Standards-Version: 3.7.2
 
diff -u rt2500-1.1.0-b4/debian/rules rt2500-1.1.0-b4/debian/rules
--- rt2500-1.1.0-b4/debian/rules
+++ rt2500-1.1.0-b4/debian/rules
@@ -60,6 +60,7 @@
 
 	install -m 755 -o root -g root $(CURDIR)/Utilitys/RaConfig2500 $(CURDIR)/debian/rt2500/usr/bin
 	install -m 644 -o root -g root $(CURDIR)/Utilitys/ico/RaConfig2500.xpm $(CURDIR)/debian/rt2500/usr/share/pixmaps
+	install -m 644 -o root -g root $(CURDIR)/debian/rt2500.desktop $(CURDIR)/debian/rt2500/usr/share/applications
 	install -m 644 -o root -g root $(CURDIR)/Module/RT2500STA.dat $(CURDIR)/debian/rt2500/etc/Wireless/RT2500STA/RT2500STA.dat
 
 	touch install-arch-stamp
diff -u rt2500-1.1.0-b4/debian/rt2500.dirs rt2500-1.1.0-b4/debian/rt2500.dirs
--- rt2500-1.1.0-b4/debian/rt2500.dirs
+++ rt2500-1.1.0-b4/debian/rt2500.dirs
@@ -3,0 +4 @@
+usr/share/applications
only in patch2:
unchanged:
--- rt2500-1.1.0-b4.orig/debian/rt2500.desktop
+++ rt2500-1.1.0-b4/debian/rt2500.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Name=RT2500
+Comment=RT2500 configuration utility
+TryExec=RaConfig2500
+Exec=gksu /usr/bin/RaConfig2500
+Icon=RaConfig2500
+Categories=System