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

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2008-07-07 18:53:40 +0000 (Mon, 07 Jul 2008)
New Revision: 144

Modified:
   trunk/foo2zjs_20070718dfsg/debian/changelog
   trunk/foo2zjs_20070718dfsg/debian/control
   trunk/foo2zjs_20070718dfsg/debian/hannah-foo2zjs.menu
   trunk/foo2zjs_20070718dfsg/debian/hannah-package/hannah.desktop
   trunk/foo2zjs_20070718dfsg/debian/patches/60-getweb.in.dpatch
Log:
foo2zjs (20070718dfsg-8) UNRELEASED; urgency=low

  * Fixed bashism in debian/patches/60-getweb.in.dpatch. Closes: #489576
  * Use su-to-root in debian/hannah-foo2zjs.menu and
    debian/hannah-package/hannah.desktop.
  * Use menu section Applications/System/Administration instead of
    Applications/System.
  * Build-Depends on ghostscript instead of gs-gpl.
  * Added Recommends for foo2zjs on wget. Neede by getweb script.

 -- Michael Koch <konqueror at gmx.de>  Mon, 07 Jul 2008 13:09:27 +0200



Modified: trunk/foo2zjs_20070718dfsg/debian/changelog
===================================================================
--- trunk/foo2zjs_20070718dfsg/debian/changelog	2008-07-07 18:40:55 UTC (rev 143)
+++ trunk/foo2zjs_20070718dfsg/debian/changelog	2008-07-07 18:53:40 UTC (rev 144)
@@ -1,3 +1,15 @@
+foo2zjs (20070718dfsg-8) UNRELEASED; urgency=low
+
+  * Fixed bashism in debian/patches/60-getweb.in.dpatch. Closes: #489576
+  * Use su-to-root in debian/hannah-foo2zjs.menu and
+    debian/hannah-package/hannah.desktop.
+  * Use menu section Applications/System/Administration instead of
+    Applications/System.
+  * Build-Depends on ghostscript instead of gs-gpl.
+  * Added Recommends for foo2zjs on wget. Neede by getweb script.
+
+ -- Michael Koch <konqueror at gmx.de>  Mon, 07 Jul 2008 13:09:27 +0200
+
 foo2zjs (20070718dfsg-7.1) unstable; urgency=medium
 
   * Non-maintainer upload.

Modified: trunk/foo2zjs_20070718dfsg/debian/control
===================================================================
--- trunk/foo2zjs_20070718dfsg/debian/control	2008-07-07 18:40:55 UTC (rev 143)
+++ trunk/foo2zjs_20070718dfsg/debian/control	2008-07-07 18:53:40 UTC (rev 144)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Foo2zjs Maintainers <foo2zjs-maintainer at lists.alioth.debian.org>
 Uploaders: Luca Bedogni <me at lucabedogni.it>, Michael Koch <konqueror at gmx.de>, Steffen Joeris <white at debian.org>
-Build-Depends: debhelper (>= 5), gs-gpl, dpatch, foomatic-filters, libcupsys2-dev, libqt4-dev
+Build-Depends: debhelper (>= 5), ghostscript, dpatch, foomatic-filters, libcupsys2-dev, libqt4-dev
 Standards-Version: 3.8.0
 Homepage: http://foo2zjs.rkkda.com/
 Vcs-Svn: svn://svn.debian.org/foo2zjs
@@ -11,7 +11,7 @@
 Package: foo2zjs
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: foomatic-db-engine
+Recommends: foomatic-db-engine, wget
 Suggests: psutils, hannah-foo2zjs
 Description: Support for printing to ZjStream-based printers
  foo2zjs is an open source printer driver for printers that use the

Modified: trunk/foo2zjs_20070718dfsg/debian/hannah-foo2zjs.menu
===================================================================
--- trunk/foo2zjs_20070718dfsg/debian/hannah-foo2zjs.menu	2008-07-07 18:40:55 UTC (rev 143)
+++ trunk/foo2zjs_20070718dfsg/debian/hannah-foo2zjs.menu	2008-07-07 18:53:40 UTC (rev 144)
@@ -1,6 +1,6 @@
 ?package(hannah-foo2zjs):\
     needs="X11"\
-    section="Applications/System"\
+    section="Applications/System/Administration"\
     title="Hannah-foo2zjs"\
     longtitle="Foo2ZJS Firmware Installer (Hannah)"\
-    command="if [ -x /usr/bin/kdesu ] ; then `which kdesu` /usr/bin/hannah-foo2zjs ; else `which gksu` /usr/bin/hannah-foo2zjs ; fi"
+    command="/usr/bin/su-to-root -X -c /usr/bin/hannah-foo2zjs"

Modified: trunk/foo2zjs_20070718dfsg/debian/hannah-package/hannah.desktop
===================================================================
--- trunk/foo2zjs_20070718dfsg/debian/hannah-package/hannah.desktop	2008-07-07 18:40:55 UTC (rev 143)
+++ trunk/foo2zjs_20070718dfsg/debian/hannah-package/hannah.desktop	2008-07-07 18:53:40 UTC (rev 144)
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Foo2ZJS Firmware Installer (Hannah)
-Exec=if [ -x /usr/bin/kdesu ] ; then `which kdesu` /usr/bin/hannah-foo2zjs ; else `which gksu` /usr/bin/hannah-foo2zjs ; fi
+Exec=/usr/bin/su-to-root -X -c /usr/bin/hannah-foo2zjs
 Type=Application
 Comment=Foo2ZJS Firmware Downloader and Installer
 Terminal=0

Modified: trunk/foo2zjs_20070718dfsg/debian/patches/60-getweb.in.dpatch
===================================================================
--- trunk/foo2zjs_20070718dfsg/debian/patches/60-getweb.in.dpatch	2008-07-07 18:40:55 UTC (rev 143)
+++ trunk/foo2zjs_20070718dfsg/debian/patches/60-getweb.in.dpatch	2008-07-07 18:53:40 UTC (rev 144)
@@ -13,7 +13,7 @@
  WGETOPTS=--passive-ftp
 +ARM2HPDL="/usr/bin/arm2hpdl"
 +
-+if [ $UID -ne 0 ]; then
++if [ $(id -ru) -ne 0 ]; then
 +       echo "You need to be root"
 +       exit 0
 +fi
@@ -21,6 +21,15 @@
  
  usage() {
  cat <<EOF
+@@ -52,7 +59,7 @@
+ }
+ 
+ SYSTEM=$(uname -s)
+-WGET=$(type wget 2>/dev/null)
++WGET=/usr/bin/wget
+ if [ "$SYSTEM" = Darwin -a "$WGET" = "" ]
+ then
+     WGETOPTS=
 @@ -62,6 +69,13 @@
      }
  fi