[Foo2zjs-commits] r110 - in trunk/foo2zjs_20070718dfsg/debian: . hannah-package

[bedo-guest at alioth.debian.org]

Author: bedo-guest
Date: 2007-10-05 11:16:56 +0000 (Fri, 05 Oct 2007)
New Revision: 110

Modified:
   trunk/foo2zjs_20070718dfsg/debian/changelog
   trunk/foo2zjs_20070718dfsg/debian/hannah-package/hannah.desktop
   trunk/foo2zjs_20070718dfsg/debian/rules
Log:
Fixed .desktop file, now it uses kdesu or gksu depending on what's
installed


Modified: trunk/foo2zjs_20070718dfsg/debian/changelog
===================================================================
--- trunk/foo2zjs_20070718dfsg/debian/changelog	2007-10-05 09:44:52 UTC (rev 109)
+++ trunk/foo2zjs_20070718dfsg/debian/changelog	2007-10-05 11:16:56 UTC (rev 110)
@@ -3,6 +3,8 @@
   * Now hannah is a standalone package
   * Moved debian/hannah to debian/hannah-package
   * Added the clean call for hannah-package in debian/rules
+  * Modified menu file for opening hannah with with kdesu or gksu (Closes:
+    #444850).
 
  -- Luca Bedogni <me at lucabedogni.it>  Fri, 05 Oct 2007 11:00:43 +1000
 

Modified: trunk/foo2zjs_20070718dfsg/debian/hannah-package/hannah.desktop
===================================================================
--- trunk/foo2zjs_20070718dfsg/debian/hannah-package/hannah.desktop	2007-10-05 09:44:52 UTC (rev 109)
+++ trunk/foo2zjs_20070718dfsg/debian/hannah-package/hannah.desktop	2007-10-05 11:16:56 UTC (rev 110)
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Foo2ZJS Firmware Installer (Hannah)
-Exec=if [ -n `which kdesu` ] ; then `which kdesu` /usr/bin/hannah : else `which gksu` /usr/bin/hannah ; fi
+Exec=if [ -x /usr/bin/kdesu ] ; then `which kdesu` /usr/bin/hannah ; else `which gksu` /usr/bin/hannah ; fi
 Type=Application
 Comment=Foo2ZJS Firmware Downloader and Installer
 Terminal=0

Modified: trunk/foo2zjs_20070718dfsg/debian/rules
===================================================================
--- trunk/foo2zjs_20070718dfsg/debian/rules	2007-10-05 09:44:52 UTC (rev 109)
+++ trunk/foo2zjs_20070718dfsg/debian/rules	2007-10-05 11:16:56 UTC (rev 110)
@@ -70,6 +70,7 @@
 	install -m 755 debian/hannah-package/hannah $(CURDIR)/debian/hannah/usr/bin/hannah
 	mkdir -p $(CURDIR)/debian/hannah/usr/share/applications
 	install -m 644 debian/hannah-package/hannah.desktop $(CURDIR)/debian/hannah/usr/share/applications/hannah.desktop
+	#mkdir -p $(CURDIR)/debian/hannah/usr/share/menu
 	touch $(CURDIR)/debian/foo2zjs/usr/share/foo2zjs/tmp/.placeholder
 
 # Build architecture-independent files here.