[Foo2zjs-commits] r98 - in trunk/foo2zjs_20070718dfsg/debian: . patches
white at alioth.debian.org
white at alioth.debian.org
Sat Sep 29 13:25:23 UTC 2007
Author: white
Date: 2007-09-29 13:25:23 +0000 (Sat, 29 Sep 2007)
New Revision: 98
Added:
trunk/foo2zjs_20070718dfsg/debian/patches/60-getweb.in.dpatch
Removed:
trunk/foo2zjs_20070718dfsg/debian/patches/60-getweb.dpatch
Modified:
trunk/foo2zjs_20070718dfsg/debian/changelog
trunk/foo2zjs_20070718dfsg/debian/dirs
trunk/foo2zjs_20070718dfsg/debian/patches/00list
trunk/foo2zjs_20070718dfsg/debian/rules
Log:
Adjust getweb script for better download, now it can also put the icm files into a right place
Modified: trunk/foo2zjs_20070718dfsg/debian/changelog
===================================================================
--- trunk/foo2zjs_20070718dfsg/debian/changelog 2007-09-28 15:56:16 UTC (rev 97)
+++ trunk/foo2zjs_20070718dfsg/debian/changelog 2007-09-29 13:25:23 UTC (rev 98)
@@ -1,4 +1,4 @@
-foo2zjs (20070718dfsg-3) experimental; urgency=low
+foo2zjs (20070718dfsg-3) UNRELEASED; urgency=low
[ Steffen Joeris ]
* Include first version of Hannah (GUI for downloading and installing
@@ -9,8 +9,12 @@
- Generate the standard directory for .desktop files in debian/dirs
- Install hannah.desktop into the standard desktop directory
- Update README.Debian to point to Hannah
+ - Renamed dpatch to 60-getweb.in.dpatch and adjusted it to match
+ for Hannah
+ - Use tmp file under /usr/share/foo2zjs/tmp for unpacking and
+ preparing downloaded firmware
- -- Steffen Joeris <white at debian.org> Sat, 29 Sep 2007 01:25:20 +1000
+ -- Steffen Joeris <white at debian.org> Sat, 29 Sep 2007 23:30:57 +1000
foo2zjs (20070718dfsg-2) unstable; urgency=low
Modified: trunk/foo2zjs_20070718dfsg/debian/dirs
===================================================================
--- trunk/foo2zjs_20070718dfsg/debian/dirs 2007-09-28 15:56:16 UTC (rev 97)
+++ trunk/foo2zjs_20070718dfsg/debian/dirs 2007-09-29 13:25:23 UTC (rev 98)
@@ -3,3 +3,4 @@
usr/share/man/man1
usr/share/ppd
usr/share/applications
+usr/share/foo2zjs/tmp
Modified: trunk/foo2zjs_20070718dfsg/debian/patches/00list
===================================================================
--- trunk/foo2zjs_20070718dfsg/debian/patches/00list 2007-09-28 15:56:16 UTC (rev 97)
+++ trunk/foo2zjs_20070718dfsg/debian/patches/00list 2007-09-29 13:25:23 UTC (rev 98)
@@ -3,4 +3,4 @@
30-udev-rules
40-path-correction
50-fix-grotty-warnings
-60-getweb.dpatch
+60-getweb.in.dpatch
Deleted: trunk/foo2zjs_20070718dfsg/debian/patches/60-getweb.dpatch
===================================================================
--- trunk/foo2zjs_20070718dfsg/debian/patches/60-getweb.dpatch 2007-09-28 15:56:16 UTC (rev 97)
+++ trunk/foo2zjs_20070718dfsg/debian/patches/60-getweb.dpatch 2007-09-29 13:25:23 UTC (rev 98)
@@ -1,62 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 60-getweb.dpatch by Luca Bedogni <me at lucabedogni.it>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Improve getweb also for installing the firmware
-
- at DPATCH@
---- foo2zjs_20070718/getweb.in.orig 2007-06-05 17:01:14.000000000 +0200
-+++ foo2zjs_20070718/getweb.in 2007-09-22 21:51:59.000000000 +0200
-@@ -63,6 +63,18 @@
- fi
-
- #
-+# Put firmware in right place
-+putfw() {
-+ inputname=$1
-+ outputname=$2
-+ if [ $UID -ne 0 ]; then
-+ echo "Please, type root's password..."
-+ su -c "arm2hpdl $inputname > /usr/share/foo2zjs/firmware/$outputname"
-+ exit
-+ fi
-+}
-+
-+#
- # Download a .EXE file from the web, unzip it, and extract the
- # files we want
- getexe() {
-@@ -96,6 +108,8 @@
- gettgz \
- http://foo2zjs.rkkda.com sihp1000.tar.gz \
- ""
-+ putfw sihp1000.img sihp1000.dl
-+ rm -f sihp1000.img
- #echo "provided"
- #getexe \
- #ftp://ftp.hp.com/pub/softlib/software1/lj1488/lj-1145-2 \
-@@ -106,6 +120,8 @@
- gettgz \
- http://foo2zjs.rkkda.com sihp1005.tar.gz \
- ""
-+ putfw sihp1005.img sihp1005.dl
-+ rm -f sihp1005.img
- #echo "provided"
- #getexe \
- #ftp://ftp.hp.com/pub/softlib/software2/COL2222/lj-10067-2 \
-@@ -116,11 +132,15 @@
- gettgz \
- http://foo2zjs.rkkda.com sihp1018.tar.gz \
- ""
-+ putfw sihp1018.img sihp1018.dl
-+ rm -f sihp1018.img
- ;;
- lj1020|1020)
- gettgz \
- http://foo2zjs.rkkda.com sihp1020.tar.gz \
- ""
-+ putfw sihp1020.img sihp1020.dl
-+ rm -f sihp1020.img
- ;;
- 2200dl|2200)
- getexe \
Added: trunk/foo2zjs_20070718dfsg/debian/patches/60-getweb.in.dpatch
===================================================================
--- trunk/foo2zjs_20070718dfsg/debian/patches/60-getweb.in.dpatch (rev 0)
+++ trunk/foo2zjs_20070718dfsg/debian/patches/60-getweb.in.dpatch 2007-09-29 13:25:23 UTC (rev 98)
@@ -0,0 +1,146 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 60-getweb.dpatch by Debian FOO2ZJS Maintainers
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Improve getweb also for installing the firmware
+
+ at DPATCH@
+--- getweb.in.orig 2007-09-29 23:26:02.000000000 +1000
++++ foo2zjs_20070718dfsg/getweb.in 2007-09-29 23:25:36.000000000 +1000
+@@ -1,6 +1,13 @@
+ #!/bin/sh
+
+ WGETOPTS=--passive-ftp
++ARM2HPDL="/usr/bin/arm2hpdl"
++
++if [ $UID -ne 0 ]; then
++ echo "You need to be root"
++ exit 0
++fi
++
+
+ usage() {
+ cat <<EOF
+@@ -62,6 +69,13 @@
+ }
+ fi
+
++putfw() {
++ inputname=$1
++ outputname=$2
++ $ARM2HPDL /usr/share/foo2zjs/tmp/$inputname > /usr/share/foo2zjs/firmware/$outputname
++ rm -f /usr/share/foo2zjs/tmp/*.img
++}
++
+ #
+ # Download a .EXE file from the web, unzip it, and extract the
+ # files we want
+@@ -84,15 +98,22 @@
+ file="$2"
+ what="$3"
+
+- wget $WGETOPTS -O $file "$url/$file" ||
+- error "Couldn't download $url/$file"
+- gunzip <$file | tar xvf - $what
+- rm $file
++ if ! [ -d /tmp/foo2zjs ] ; then
++ wget $WGETOPTS -O /usr/share/foo2zjs/tmp/$file "$url/$file" ||
++ error "Couldn't download $url/$file"
++ cd /usr/share/foo2zjs/tmp && gunzip </usr/share/foo2zjs/tmp/$file | tar xvf - $what
++ CHECK=`ls /usr/share/foo2zjs/tmp/*.icm 2>/dev/null`
++ if [ -n "$CHECK" ] ; then
++ mv /usr/share/foo2zjs/tmp/*.icm /usr/share/foo2zjs/icm/
++ fi
++ rm /usr/share/foo2zjs/tmp/$file
++ fi
++
+ }
+
+ getone() {
+ case "$1" in
+- lj1000|1000)
++ lj1000|1000|hp1000)
+ gettgz \
+ http://foo2zjs.rkkda.com sihp1000.tar.gz \
+ ""
+@@ -102,7 +123,7 @@
+ #lj1488en.exe \
+ #sihp1000.img
+ ;;
+- lj1005|1005)
++ lj1005|1005|hp1005)
+ gettgz \
+ http://foo2zjs.rkkda.com sihp1005.tar.gz \
+ ""
+@@ -112,22 +133,22 @@
+ #lj1005hostbased-en.exe \
+ #sihp1005.img
+ ;;
+- lj1018|1018)
++ lj1018|1018|hp1018)
+ gettgz \
+ http://foo2zjs.rkkda.com sihp1018.tar.gz \
+ ""
+ ;;
+- lj1020|1020)
++ lj1020|1020|hp1020)
+ gettgz \
+ http://foo2zjs.rkkda.com sihp1020.tar.gz \
+ ""
+ ;;
+- 2200dl|2200)
++ 2200dl|2200|minolta2200)
+ getexe \
+ ftp://ftp.minolta-qms.com/pub/crc/out_going/win2000 m22dlicc.exe \
+ "*.icm"
+ ;;
+- 2300dl|2300)
++ 2300dl|2300|minolta2300)
+ getexe \
+ ftp://ftp.minolta-qms.com/pub/crc/out_going/win m23dlicc.exe \
+ "*.icm"
+@@ -144,7 +165,7 @@
+ wget $WGETOPTS "$URL" || error "Couldn't download $URL"
+ echo "*** Now use a windows box to unzip and install $FILE ***"
+ ;;
+- cpwl|pageworks)
++ cpwl|pageworks|minoltapro)
+ getexe \
+ ftp://ftp.minolta-qms.com/pub/crc/out_going/windows cpplxp.exe \
+ "*.IC_"
+@@ -156,17 +177,17 @@
+ rm -f $base.ic_
+ done
+ ;;
+- 2430)
++ 2430|minolta2430)
+ gettgz \
+ http://foo2zjs.rkkda.com km2430.tar.gz \
+ ""
+ ;;
+- 2530|2490|6115|2480)
++ 2530|2490|6115|2480|minolta2530|minolta2490|minolta|xerox6115|minolta2480)
+ gettgz \
+ http://foo2lava.rkkda.com km2530.tar.gz \
+ ""
+ ;;
+- 1600|2600n)
++ 1600|2600n|hp1600|hp2600)
+ gettgz \
+ http://foo2hp.rkkda.com hpclj2600n.tar.gz \
+ ""
+@@ -174,12 +195,12 @@
+ http://foo2zjs.rkkda.com km2430.tar.gz \
+ "km2430_2.icm"
+ ;;
+- 300|3160|6110)
++ 300|3160|6110|samsung300|samsung3160|xerox6110)
+ gettgz \
+ http://foo2qpdl.rkkda.com samclp300.tar.gz \
+ ""
+ ;;
+- 600)
++ 600|samsung600)
+ ;;
+
+ xPPD)
Modified: trunk/foo2zjs_20070718dfsg/debian/rules
===================================================================
--- trunk/foo2zjs_20070718dfsg/debian/rules 2007-09-28 15:56:16 UTC (rev 97)
+++ trunk/foo2zjs_20070718dfsg/debian/rules 2007-09-29 13:25:23 UTC (rev 98)
@@ -66,6 +66,7 @@
install -m 755 getweb $(CURDIR)/debian/foo2zjs/usr/bin/getweb
install -m 755 debian/hannah/hannah $(CURDIR)/debian/foo2zjs/usr/bin/hannah
install -m 644 debian/hannah/hannah.desktop $(CURDIR)/debian/foo2zjs/usr/share/applications/hannah.desktop
+ touch $(CURDIR)/debian/foo2zjs/usr/share/foo2zjs/tmp/.placeholder
# Build architecture-independent files here.
binary-indep: build install
More information about the Foo2zjs-commits
mailing list