[Foo2zjs-commits] r143 - in trunk/foo2zjs_20070718dfsg/debian: . patches
mkoch at alioth.debian.org
mkoch at alioth.debian.org
Mon Jul 7 18:40:57 UTC 2008
Author: mkoch
Date: 2008-07-07 18:40:55 +0000 (Mon, 07 Jul 2008)
New Revision: 143
Added:
trunk/foo2zjs_20070718dfsg/debian/patches/70-getweb.in.dpatch
trunk/foo2zjs_20070718dfsg/debian/patches/80-getweb.in.dpatch
Modified:
trunk/foo2zjs_20070718dfsg/debian/changelog
trunk/foo2zjs_20070718dfsg/debian/control
trunk/foo2zjs_20070718dfsg/debian/patches/00list
trunk/foo2zjs_20070718dfsg/debian/patches/60-getweb.in.dpatch
Log:
foo2zjs (20070718dfsg-7.1) unstable; urgency=medium
* Non-maintainer upload.
* Add '80-getweb.in.dpatch' to fix bashism in /bin/sh script
(Closes: #472895)
* Bump Standards-Version to 3.8.0.
-- Chris Lamb <chris at chris-lamb.co.uk> Sat, 07 Jun 2008 20:17:48 +0100
Modified: trunk/foo2zjs_20070718dfsg/debian/changelog
===================================================================
--- trunk/foo2zjs_20070718dfsg/debian/changelog 2007-11-15 06:30:38 UTC (rev 142)
+++ trunk/foo2zjs_20070718dfsg/debian/changelog 2008-07-07 18:40:55 UTC (rev 143)
@@ -1,3 +1,12 @@
+foo2zjs (20070718dfsg-7.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add '80-getweb.in.dpatch' to fix bashism in /bin/sh script
+ (Closes: #472895)
+ * Bump Standards-Version to 3.8.0.
+
+ -- Chris Lamb <chris at chris-lamb.co.uk> Sat, 07 Jun 2008 20:17:48 +0100
+
foo2zjs (20070718dfsg-7) unstable; urgency=medium
* Added menu file for hannah-foo2zjs package (Closes: #444850).
Modified: trunk/foo2zjs_20070718dfsg/debian/control
===================================================================
--- trunk/foo2zjs_20070718dfsg/debian/control 2007-11-15 06:30:38 UTC (rev 142)
+++ trunk/foo2zjs_20070718dfsg/debian/control 2008-07-07 18:40:55 UTC (rev 143)
@@ -4,7 +4,7 @@
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
-Standards-Version: 3.7.2
+Standards-Version: 3.8.0
Homepage: http://foo2zjs.rkkda.com/
Vcs-Svn: svn://svn.debian.org/foo2zjs
Modified: trunk/foo2zjs_20070718dfsg/debian/patches/00list
===================================================================
--- trunk/foo2zjs_20070718dfsg/debian/patches/00list 2007-11-15 06:30:38 UTC (rev 142)
+++ trunk/foo2zjs_20070718dfsg/debian/patches/00list 2008-07-07 18:40:55 UTC (rev 143)
@@ -4,3 +4,5 @@
40-path-correction
50-fix-grotty-warnings
60-getweb.in.dpatch
+70-getweb.in.dpatch
+80-getweb.in.dpatch
Modified: trunk/foo2zjs_20070718dfsg/debian/patches/60-getweb.in.dpatch
===================================================================
--- trunk/foo2zjs_20070718dfsg/debian/patches/60-getweb.in.dpatch 2007-11-15 06:30:38 UTC (rev 142)
+++ trunk/foo2zjs_20070718dfsg/debian/patches/60-getweb.in.dpatch 2008-07-07 18:40:55 UTC (rev 143)
@@ -5,16 +5,13 @@
## DP: Improve getweb also for installing the firmware
@DPATCH@
-diff -urNad foo2zjs_20070718dfsg~/getweb.in foo2zjs_20070718dfsg/getweb.in
---- foo2zjs_20070718dfsg~/getweb.in 2007-06-05 17:01:14.000000000 +0200
-+++ foo2zjs_20070718dfsg/getweb.in 2007-11-08 13:35:13.000000000 +0100
-@@ -1,6 +1,14 @@
+--- getweb.in.orig 2007-09-30 16:11:40.000000000 +1000
++++ foo2zjs-20070718dfsg/getweb.in 2007-09-30 16:16:38.000000000 +1000
+@@ -1,6 +1,13 @@
#!/bin/sh
--WGETOPTS=--passive-ftp
-+WGETOPTS="--passive-ftp -q"
+ WGETOPTS=--passive-ftp
+ARM2HPDL="/usr/bin/arm2hpdl"
-+VERSION='$Id: getweb.in,v 1.51 2007/11/04 01:58:16 rick Exp $'
+
+if [ $UID -ne 0 ]; then
+ echo "You need to be root"
@@ -24,23 +21,7 @@
usage() {
cat <<EOF
-@@ -12,6 +20,7 @@
-
- $ ./getweb 2600n # Get HP Color LaserJet 2600n .ICM files
- $ ./getweb 1600 # Get HP Color LaserJet 1600 .ICM files
-+ $ ./getweb 1500 # Get HP Color LaserJet 1500 .ICM files
-
- $ ./getweb 2530 # Get Konica Minolta 2530 DL .ICM files
- $ ./getweb 2490 # Get Konica Minolta 2490 MF .ICM files
-@@ -25,6 +34,7 @@
-
- $ ./getweb 300 # Get Samsung CLP-300 .ICM files
- $ ./getweb 600 # Get Samsung CLP-600 .ICM files
-+ $ ./getweb 2160 # Get Samsung CLX-2160 .ICM files
- $ ./getweb 3160 # Get Samsung CLX-3160 .ICM files
- $ ./getweb 6110 # Get Xerox Phaser 6110 and 6110MFP .ICM files
-
-@@ -62,6 +72,13 @@
+@@ -62,6 +69,13 @@
}
fi
@@ -54,7 +35,7 @@
#
# Download a .EXE file from the web, unzip it, and extract the
# files we want
-@@ -84,56 +101,81 @@
+@@ -84,50 +98,61 @@
file="$2"
what="$3"
@@ -73,23 +54,14 @@
+ rm /usr/share/foo2zjs/tmp/$file
+ fi
+
-+}
-+
-+copyright() {
-+ echo
-+ echo "$1"
-+ echo
}
-+
-+
getone() {
case "$1" in
- lj1000|1000)
+ lj1000|1000|hp1000)
gettgz \
-- http://foo2zjs.rkkda.com sihp1000.tar.gz \
-+ http://foo2zjs.rkkda.com/firmware sihp1000.tar.gz \
+ http://foo2zjs.rkkda.com sihp1000.tar.gz \
""
+ putfw sihp1000.img sihp1000.dl
#echo "provided"
@@ -97,13 +69,11 @@
#ftp://ftp.hp.com/pub/softlib/software1/lj1488/lj-1145-2 \
#lj1488en.exe \
#sihp1000.img
-+ copyright "(c) Copyright Hewlett-Packard 2001"
;;
- lj1005|1005)
+ lj1005|1005|hp1005)
gettgz \
-- http://foo2zjs.rkkda.com sihp1005.tar.gz \
-+ http://foo2zjs.rkkda.com/firmware sihp1005.tar.gz \
+ http://foo2zjs.rkkda.com sihp1005.tar.gz \
""
+ putfw sihp1005.img sihp1005.dl
#echo "provided"
@@ -111,47 +81,33 @@
#ftp://ftp.hp.com/pub/softlib/software2/COL2222/lj-10067-2 \
#lj1005hostbased-en.exe \
#sihp1005.img
-+ copyright "(c) Copyright Hewlett-Packard 2002"
;;
- lj1018|1018)
+ lj1018|1018|hp1018)
gettgz \
-- http://foo2zjs.rkkda.com sihp1018.tar.gz \
-+ http://foo2zjs.rkkda.com/firmware sihp1018.tar.gz \
+ http://foo2zjs.rkkda.com sihp1018.tar.gz \
""
+ putfw sihp1018.img sihp1018.dl
-+ copyright "(c) Copyright Hewlett-Packard 2005"
;;
- lj1020|1020)
+ lj1020|1020|hp1020)
gettgz \
-- http://foo2zjs.rkkda.com sihp1020.tar.gz \
-+ http://foo2zjs.rkkda.com/firmware sihp1020.tar.gz \
+ http://foo2zjs.rkkda.com sihp1020.tar.gz \
""
+ putfw sihp1020.img sihp1020.dl
-+ copyright "(c) Copyright Hewlett-Packard 2005"
;;
- 2200dl|2200)
+ 2200dl|2200|minolta2200)
getexe \
ftp://ftp.minolta-qms.com/pub/crc/out_going/win2000 m22dlicc.exe \
"*.icm"
-+ copyright "(c) Copyright Minolta-QMS 1999"
;;
- 2300dl|2300)
+ 2300dl|2300|minolta2300)
getexe \
ftp://ftp.minolta-qms.com/pub/crc/out_going/win m23dlicc.exe \
"*.icm"
- gettgz \
-- http://foo2zjs.rkkda.com km2430.tar.gz \
-+ http://foo2zjs.rkkda.com/icm km2430.tar.gz \
- ""
-+ copyright "(c) Copyright Minolta-QMS 2001"
- ;;
- 2300dl_fw)
- # 2300DL firmware upgrade to v2.55
-@@ -144,7 +186,7 @@
+@@ -144,7 +169,7 @@
wget $WGETOPTS "$URL" || error "Couldn't download $URL"
echo "*** Now use a windows box to unzip and install $FILE ***"
;;
@@ -160,49 +116,36 @@
getexe \
ftp://ftp.minolta-qms.com/pub/crc/out_going/windows cpplxp.exe \
"*.IC_"
-@@ -155,31 +197,38 @@
- ./msexpand $base.ic_
+@@ -156,17 +181,17 @@
rm -f $base.ic_
done
-+ copyright "(c) Copyright Minolta-QMS 1998"
;;
- 2430)
+ 2430|minolta2430)
gettgz \
-- http://foo2zjs.rkkda.com km2430.tar.gz \
-+ http://foo2zjs.rkkda.com/icm km2430.tar.gz \
+ http://foo2zjs.rkkda.com km2430.tar.gz \
""
-+ copyright "(c) Copyright Minolta-QMS 2003"
;;
- 2530|2490|6115|2480)
+ 2530|2490|6115|2480|minolta2530|minolta2490|minolta|xerox6115|minolta2480)
gettgz \
-- http://foo2lava.rkkda.com km2530.tar.gz \
-+ http://foo2lava.rkkda.com/icm km2530.tar.gz \
+ http://foo2lava.rkkda.com km2530.tar.gz \
""
-+ copyright "(c) Copyright Konica Minolta 2005"
-+ copyright "(c) Copyright Rick Richardson 2006. All Rights Reserved"
;;
- 1600|2600n)
+ 1600|2600n|hp1600|hp2600)
gettgz \
-- http://foo2hp.rkkda.com hpclj2600n.tar.gz \
-+ http://foo2hp.rkkda.com/icm hpclj2600n.tar.gz \
+ http://foo2hp.rkkda.com hpclj2600n.tar.gz \
""
- gettgz \
-- http://foo2zjs.rkkda.com km2430.tar.gz \
-+ http://foo2zjs.rkkda.com/icm km2430.tar.gz \
+@@ -174,12 +199,12 @@
+ http://foo2zjs.rkkda.com km2430.tar.gz \
"km2430_2.icm"
-+ copyright "(c) Copyright Konica Minolta 2003"
-+ copyright "(c) Copyright Rick Richardson 2006. All Rights Reserved"
;;
- 300|3160|6110)
+ 300|3160|6110|samsung300|samsung3160|xerox6110)
gettgz \
-- http://foo2qpdl.rkkda.com samclp300.tar.gz \
-+ http://foo2qpdl.rkkda.com/icm samclp300.tar.gz \
+ http://foo2qpdl.rkkda.com samclp300.tar.gz \
""
-+ copyright "(c) Copyright Samsung 2006"
;;
- 600)
+ 600|samsung600)
Added: trunk/foo2zjs_20070718dfsg/debian/patches/70-getweb.in.dpatch
===================================================================
--- trunk/foo2zjs_20070718dfsg/debian/patches/70-getweb.in.dpatch (rev 0)
+++ trunk/foo2zjs_20070718dfsg/debian/patches/70-getweb.in.dpatch 2008-07-07 18:40:55 UTC (rev 143)
@@ -0,0 +1,151 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 70-getweb.in.dpatch by Luca Bedogni <me at lucabedogni.it>
+##
+## DP: update from the last getweb.in script
+
+ at DPATCH@
+diff -urNad foo2zjs_20070718dfsg~/getweb.in foo2zjs_20070718dfsg/getweb.in
+--- foo2zjs_20070718dfsg~/getweb.in 2007-11-07 17:14:58.000000000 +0100
++++ foo2zjs_20070718dfsg/getweb.in 2007-11-07 19:01:29.000000000 +0100
+@@ -1,7 +1,8 @@
+ #!/bin/sh
+
+-WGETOPTS=--passive-ftp
++WGETOPTS="--passive-ftp -q"
+ ARM2HPDL="/usr/bin/arm2hpdl"
++VERSION='$Id: getweb.in,v 1.51 2007/11/04 01:58:16 rick Exp $'
+
+ if [ $UID -ne 0 ]; then
+ echo "You need to be root"
+@@ -19,6 +20,7 @@
+
+ $ ./getweb 2600n # Get HP Color LaserJet 2600n .ICM files
+ $ ./getweb 1600 # Get HP Color LaserJet 1600 .ICM files
++ $ ./getweb 1500 # Get HP Color LaserJet 1500 .ICM files
+
+ $ ./getweb 2530 # Get Konica Minolta 2530 DL .ICM files
+ $ ./getweb 2490 # Get Konica Minolta 2490 MF .ICM files
+@@ -32,6 +34,7 @@
+
+ $ ./getweb 300 # Get Samsung CLP-300 .ICM files
+ $ ./getweb 600 # Get Samsung CLP-600 .ICM files
++ $ ./getweb 2160 # Get Samsung CLX-2160 .ICM files
+ $ ./getweb 3160 # Get Samsung CLX-3160 .ICM files
+ $ ./getweb 6110 # Get Xerox Phaser 6110 and 6110MFP .ICM files
+
+@@ -111,11 +114,19 @@
+
+ }
+
++copyright() {
++ echo
++ echo "$1"
++ echo
++}
++
++
++
+ getone() {
+ case "$1" in
+ lj1000|1000|hp1000)
+ gettgz \
+- http://foo2zjs.rkkda.com sihp1000.tar.gz \
++ http://foo2zjs.rkkda.com/firmware sihp1000.tar.gz \
+ ""
+ putfw sihp1000.img sihp1000.dl
+ #echo "provided"
+@@ -123,10 +134,11 @@
+ #ftp://ftp.hp.com/pub/softlib/software1/lj1488/lj-1145-2 \
+ #lj1488en.exe \
+ #sihp1000.img
++ copyright "(c) Copyright Hewlett-Packard 2001"
+ ;;
+ lj1005|1005|hp1005)
+ gettgz \
+- http://foo2zjs.rkkda.com sihp1005.tar.gz \
++ http://foo2zjs.rkkda.com/firmware sihp1005.tar.gz \
+ ""
+ putfw sihp1005.img sihp1005.dl
+ #echo "provided"
+@@ -134,31 +146,36 @@
+ #ftp://ftp.hp.com/pub/softlib/software2/COL2222/lj-10067-2 \
+ #lj1005hostbased-en.exe \
+ #sihp1005.img
++ copyright "(c) Copyright Hewlett-Packard 2002"
+ ;;
+ lj1018|1018|hp1018)
+ gettgz \
+- http://foo2zjs.rkkda.com sihp1018.tar.gz \
++ http://foo2zjs.rkkda.com/firmware sihp1018.tar.gz \
+ ""
+ putfw sihp1018.img sihp1018.dl
++ copyright "(c) Copyright Hewlett-Packard 2005"
+ ;;
+ lj1020|1020|hp1020)
+ gettgz \
+- http://foo2zjs.rkkda.com sihp1020.tar.gz \
++ http://foo2zjs.rkkda.com/firmware sihp1020.tar.gz \
+ ""
+ putfw sihp1020.img sihp1020.dl
++ copyright "(c) Copyright Hewlett-Packard 2005"
+ ;;
+ 2200dl|2200|minolta2200)
+ getexe \
+ ftp://ftp.minolta-qms.com/pub/crc/out_going/win2000 m22dlicc.exe \
+ "*.icm"
++ copyright "(c) Copyright Minolta-QMS 1999"
+ ;;
+ 2300dl|2300|minolta2300)
+ getexe \
+ ftp://ftp.minolta-qms.com/pub/crc/out_going/win m23dlicc.exe \
+ "*.icm"
+ gettgz \
+- http://foo2zjs.rkkda.com km2430.tar.gz \
++ http://foo2zjs.rkkda.com/icm km2430.tar.gz \
+ ""
++ copyright "(c) Copyright Minolta-QMS 2001"
+ ;;
+ 2300dl_fw)
+ # 2300DL firmware upgrade to v2.55
+@@ -180,29 +197,36 @@
+ ./msexpand $base.ic_
+ rm -f $base.ic_
+ done
++ copyright "(c) Copyright Minolta-QMS 1998"
+ ;;
+ 2430|minolta2430)
+ gettgz \
+- http://foo2zjs.rkkda.com km2430.tar.gz \
++ http://foo2zjs.rkkda.com/icm km2430.tar.gz \
+ ""
++ copyright "(c) Copyright Minolta-QMS 2003"
+ ;;
+ 2530|2490|6115|2480|minolta2530|minolta2490|minolta|xerox6115|minolta2480)
+ gettgz \
+- http://foo2lava.rkkda.com km2530.tar.gz \
++ http://foo2lava.rkkda.com/icm km2530.tar.gz \
+ ""
++ copyright "(c) Copyright Konica Minolta 2005"
++ copyright "(c) Copyright Rick Richardson 2006. All Rights Reserved"
+ ;;
+ 1600|2600n|hp1600|hp2600)
+ gettgz \
+- http://foo2hp.rkkda.com hpclj2600n.tar.gz \
++ http://foo2hp.rkkda.com/icm hpclj2600n.tar.gz \
+ ""
+ gettgz \
+- http://foo2zjs.rkkda.com km2430.tar.gz \
++ http://foo2zjs.rkkda.com/icm km2430.tar.gz \
+ "km2430_2.icm"
++ copyright "(c) Copyright Konica Minolta 2003"
++ copyright "(c) Copyright Rick Richardson 2006. All Rights Reserved"
+ ;;
+ 300|3160|6110|samsung300|samsung3160|xerox6110)
+ gettgz \
+- http://foo2qpdl.rkkda.com samclp300.tar.gz \
++ http://foo2qpdl.rkkda.com/icm samclp300.tar.gz \
+ ""
++ copyright "(c) Copyright Samsung 2006"
+ ;;
+ 600|samsung600)
+ ;;
Added: trunk/foo2zjs_20070718dfsg/debian/patches/80-getweb.in.dpatch
===================================================================
--- trunk/foo2zjs_20070718dfsg/debian/patches/80-getweb.in.dpatch (rev 0)
+++ trunk/foo2zjs_20070718dfsg/debian/patches/80-getweb.in.dpatch 2008-07-07 18:40:55 UTC (rev 143)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 80-getweb.in.dpatch by Chris Lamb <chris at chris-lamb.co.uk>
+
+## DP: Fix bashism
+
+ at DPATCH@
+diff -urNad foo2zjs-20070718dfsg.orig/getweb.in foo2zjs-20070718dfsg/getweb.in
+--- foo2zjs-20070718dfsg.orig/getweb.in 2008-05-04 00:13:37.000000000 +0100
++++ foo2zjs-20070718dfsg/getweb.in 2008-05-04 00:14:25.000000000 +0100
+@@ -236,7 +236,7 @@
+ tar zxf $HERE/$file
+ cd $HERE
+ echo "The tarball is extracted and the current directory is up to date."
+- echo -e "Remove the tarball (y/n)? \c"
++ printf "Remove the tarball (y/n)? "
+ read ans
+ if [ "$ans" = y ]; then
+ rm -f $file
More information about the Foo2zjs-commits
mailing list