diff -u rkward-0.4.7a/debian/changelog rkward-0.4.7a/debian/changelog
--- rkward-0.4.7a/debian/changelog
+++ rkward-0.4.7a/debian/changelog
@@ -1,3 +1,11 @@
+rkward (0.4.7a-1ubuntu2) gutsy; urgency=low
+
+  * Updated .desktop file to be freedesktop compliant
+  * Fixed .desktop installation directory (LP: #139769)
+  * Fixed icon installation directory
+
+ -- Mario Bonino <mariobonino@ubuntu-it.org>  Wed, 19 Sep 2007 08:49:33 +0200
+
 rkward (0.4.7a-1ubuntu1) gutsy; urgency=low
 
   * Add b-d for gfortran-4.1 (Fixes FTBFS)
only in patch2:
unchanged:
--- rkward-0.4.7a.orig/rkward/Makefile.in
+++ rkward-0.4.7a/rkward/Makefile.in
@@ -887,12 +887,12 @@
 
 
 install-data-local:
-#>- 	$(mkinstalldirs) $(kde_appsdir)/Applications/
+#>- 	$(mkinstalldirs) /usr/share/applications
 #>+ 1
-	$(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Applications/
-#>- 	$(INSTALL_DATA) $(srcdir)/rkward.desktop $(kde_appsdir)/Applications/rkward.desktop
+	$(mkinstalldirs) $(DESTDIR)/usr/share/applications
+#>- 	$(INSTALL_DATA) $(srcdir)/rkward.desktop /usr/share/applications/rkward.desktop
 #>+ 1
-	$(INSTALL_DATA) $(srcdir)/rkward.desktop $(DESTDIR)$(kde_appsdir)/Applications/rkward.desktop
+	$(INSTALL_DATA) $(srcdir)/rkward.desktop $(DESTDIR)/usr/share/applications/rkward.desktop
 #>- 	$(mkinstalldirs) $(kde_icondir)/locolor/32x32/apps/
 #>+ 1
 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/
@@ -905,17 +905,26 @@
 #>- 	$(INSTALL_DATA) $(srcdir)/lo16-app-rkward.png $(kde_icondir)/locolor/16x16/apps/rkward.png
 #>+ 1
 	$(INSTALL_DATA) $(srcdir)/lo16-app-rkward.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/rkward.png
+#>- 	$(mkinstalldirs) /usr/share/pixmaps
+#>+ 1
+	$(mkinstalldirs) $(DESTDIR)/usr/share/pixmaps
+#>- 	$(INSTALL_DATA) $(srcdir)/lo32-app-rkward.png /usr/share/pixmaps/rkward.png
+#>+ 1
+	$(INSTALL_DATA) $(srcdir)/lo32-app-rkward.png $(DESTDIR)/usr/share/pixmaps/rkward.png
 
 uninstall-local:
-#>- 	-rm -f $(kde_appsdir)/Applications/rkward.desktop
+#>- 	-rm -f /usr/share/applications/rkward.desktop
 #>+ 1
-	-rm -f $(DESTDIR)$(kde_appsdir)/Applications/rkward.desktop
+	-rm -f $(DESTDIR)/usr/share/applications/rkward.desktop
 #>- 	-rm -f $(kde_icondir)/locolor/32x32/apps/rkward.png
 #>+ 1
 	-rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/rkward.png
 #>- 	-rm -f $(kde_icondir)/locolor/16x16/apps/rkward.png
 #>+ 1
 	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/rkward.png
+#>- 	-rm -f /usr/share/pixmaps/rkward.png
+#>+ 1
+	-rm -f $(DESTDIR)/usr/share/pixmaps/rkward.png
 
 # all the perl script does is fill in the placeholder for R_HOMEDIR and friends
 rkward: makerkwardscript.pl rkward.sh.template
@@ -970,7 +979,7 @@
 	-rm -f  rkward.moc rkconsole.moc robjectviewer.moc robjectbrowser.moc
 
 #>+ 2
-KDE_DIST=Makefile.in rkconsolepart.rc lo16-app-rkward.png lo32-app-rkward.png rkward.kidl rkward.desktop rkwardui.rc Makefile.am 
+KDE_DIST=Makefile.in rkconsolepart.rc lo16-app-rkward.png rkward.bin lo32-app-rkward.png rkward.kidl rkward.desktop rkwardui.rc Makefile.am 
 
 #>+ 4
 clean-idl:
only in patch2:
unchanged:
--- rkward-0.4.7a.orig/rkward/rkward.desktop
+++ rkward-0.4.7a/rkward/rkward.desktop
@@ -1,13 +1,12 @@
 # KDE Config File  
 [Desktop Entry]
-Encoding=UTF-8
 Name=RKWard
 Comment=GUI for the R-project
 Comment[pl]=Graficzny interfejs dla projektu R
 Comment[fr]=Interface graphique pour R
-Icon=rkward.png
-Exec=konsole -e rkward -caption "%c" %i %m  
-Terminal=false
+Icon=rkward
+Exec=rkward
+Terminal=true
 Type=Application
 DocPath=rkward/index.html
 Categories=Education;Science;Math;
only in patch2:
unchanged:
--- rkward-0.4.7a.orig/rkward/Makefile.am
+++ rkward-0.4.7a/rkward/Makefile.am
@@ -41,17 +41,20 @@
 	misc core icons windows syntax pages
 
 install-data-local:
-	$(mkinstalldirs) $(kde_appsdir)/Applications/
-	$(INSTALL_DATA) $(srcdir)/rkward.desktop $(kde_appsdir)/Applications/rkward.desktop
+	$(mkinstalldirs) /usr/share/applications
+	$(INSTALL_DATA) $(srcdir)/rkward.desktop /usr/share/applications/rkward.desktop
 	$(mkinstalldirs) $(kde_icondir)/locolor/32x32/apps/
 	$(INSTALL_DATA) $(srcdir)/lo32-app-rkward.png $(kde_icondir)/locolor/32x32/apps/rkward.png
 	$(mkinstalldirs) $(kde_icondir)/locolor/16x16/apps/
 	$(INSTALL_DATA) $(srcdir)/lo16-app-rkward.png $(kde_icondir)/locolor/16x16/apps/rkward.png
+	$(mkinstalldirs) /usr/share/pixmaps
+	$(INSTALL_DATA) $(srcdir)/lo32-app-rkward.png /usr/share/pixmaps/rkward.png
 
 uninstall-local:
-	-rm -f $(kde_appsdir)/Applications/rkward.desktop
+	-rm -f /usr/share/applications/rkward.desktop
 	-rm -f $(kde_icondir)/locolor/32x32/apps/rkward.png
 	-rm -f $(kde_icondir)/locolor/16x16/apps/rkward.png
+	-rm -f /usr/share/pixmaps/rkward.png
 
 # set the include path for X, qt and KDE
 INCLUDES = $(all_includes)