[Foo2zjs-commits] r102 - in trunk: foo2zjs_20070718dfsg/debian foo2zjs_20070718dfsg/debian/hannah hannah

[white at alioth.debian.org]

Author: white
Date: 2007-09-30 06:54:41 +0000 (Sun, 30 Sep 2007)
New Revision: 102

Modified:
   trunk/foo2zjs_20070718dfsg/debian/changelog
   trunk/foo2zjs_20070718dfsg/debian/control
   trunk/foo2zjs_20070718dfsg/debian/hannah/hannah.desktop
   trunk/hannah/hannah.desktop
Log:
Give the user the choice between kdesu and gksu

Modified: trunk/foo2zjs_20070718dfsg/debian/changelog
===================================================================
--- trunk/foo2zjs_20070718dfsg/debian/changelog	2007-09-30 06:18:34 UTC (rev 101)
+++ trunk/foo2zjs_20070718dfsg/debian/changelog	2007-09-30 06:54:41 UTC (rev 102)
@@ -13,6 +13,8 @@
      for Hannah
    - Use tmp file under /usr/share/foo2zjs/tmp for unpacking and
      preparing downloaded firmware
+   - Add a depends against kdebase-bin | gksu to use either of both
+     programs to become root, when calling hannah
 
  -- Steffen Joeris <white at debian.org>  Sat, 29 Sep 2007 23:30:57 +1000
 

Modified: trunk/foo2zjs_20070718dfsg/debian/control
===================================================================
--- trunk/foo2zjs_20070718dfsg/debian/control	2007-09-30 06:18:34 UTC (rev 101)
+++ trunk/foo2zjs_20070718dfsg/debian/control	2007-09-30 06:54:41 UTC (rev 102)
@@ -8,7 +8,7 @@
 
 Package: foo2zjs
 Architecture: any
-Depends: ${shlibs:Depends}, kdebase-bin
+Depends: ${shlibs:Depends}, kdebase-bin | gksu
 Recommends: foomatic-db-engine
 Suggests: psutils
 Description: Support for printing to ZjStream-based printers

Modified: trunk/foo2zjs_20070718dfsg/debian/hannah/hannah.desktop
===================================================================
--- trunk/foo2zjs_20070718dfsg/debian/hannah/hannah.desktop	2007-09-30 06:18:34 UTC (rev 101)
+++ trunk/foo2zjs_20070718dfsg/debian/hannah/hannah.desktop	2007-09-30 06:54:41 UTC (rev 102)
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Foo2ZJS Firmware Installer (Hannah)
-Exec=/usr/bin/kdesu /usr/bin/hannah
+Exec=if [ -n `which 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/hannah/hannah.desktop
===================================================================
--- trunk/hannah/hannah.desktop	2007-09-30 06:18:34 UTC (rev 101)
+++ trunk/hannah/hannah.desktop	2007-09-30 06:54:41 UTC (rev 102)
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Foo2ZJS Firmware Installer (Hannah)
-Exec=/usr/bin/kdesu /usr/bin/hannah
+Exec=if [ -n `which kdesu` ] ; then `which kdesu` /usr/bin/hannah : else `which gksu` /usr/bin/hannah ; fi
 Type=Application
 Comment=Foo2ZJS Firmware Downloader and Installer
 Terminal=0