[Foo2zjs-commits] r213 - in trunk/foo2zjs_20090908dfsg/debian: . patches
Luca Capello
gismo at alioth.debian.org
Sat Mar 13 20:04:22 UTC 2010
Author: gismo
Date: 2010-03-13 20:04:17 +0000 (Sat, 13 Mar 2010)
New Revision: 213
Added:
trunk/foo2zjs_20090908dfsg/debian/foo2zjs.postinst
trunk/foo2zjs_20090908dfsg/debian/patches/70-lib-firwmare-hp.patch
Modified:
trunk/foo2zjs_20090908dfsg/debian/changelog
trunk/foo2zjs_20090908dfsg/debian/foo2zjs.dirs
trunk/foo2zjs_20090908dfsg/debian/patches/series
trunk/foo2zjs_20090908dfsg/debian/rules
Log:
debian/*: (Closes: #517957) use /lib/firmware/hp/ for firmwares
Modified: trunk/foo2zjs_20090908dfsg/debian/changelog
===================================================================
--- trunk/foo2zjs_20090908dfsg/debian/changelog 2010-03-13 18:52:03 UTC (rev 212)
+++ trunk/foo2zjs_20090908dfsg/debian/changelog 2010-03-13 20:04:17 UTC (rev 213)
@@ -4,6 +4,11 @@
* debian/control:
+ Build-Depends: on quilt to manage patches.
+ Recommends: unzip for 'getexe' function in getweb script.
+ * debian/foo2zjs.dirs:
+ + add /lib/firmware/hp/.
+ - remove now useless /usr/share/foo2zjs/tmp/.
+ * debian/foo2zjs.postinst:
+ + move user-downloaded firmwares to /lib/firwmare/hp/.
* debian/patches/*:
+ convert to quilt and refresh.
* debian/patches/60-getweb.in.patch:
@@ -11,10 +16,13 @@
+ new 'puticm' function to install ICM files.
+ extract firmware for HP LaserJet P1006/1008/1505 printers as well.
- remove wrong 'putfw' call for Minolta 2200 DL.
+ * debian/patches/70-lib-firmware-hp.patch:
+ + firmware directory is /lib/firmware/hp/ (Closes: #517957).
* debian/README.source:
+ adapt to quilt.
* debian/rules:
+ adapt to quilt.
+ - remove touch call for /usr/share/foo2zjs/tmp/.placeholder.
[ Michael Koch ]
* Removed Luca Bedogni from Uploaders as he is MIA (Closes: 550268).
Modified: trunk/foo2zjs_20090908dfsg/debian/foo2zjs.dirs
===================================================================
--- trunk/foo2zjs_20090908dfsg/debian/foo2zjs.dirs 2010-03-13 18:52:03 UTC (rev 212)
+++ trunk/foo2zjs_20090908dfsg/debian/foo2zjs.dirs 2010-03-13 20:04:17 UTC (rev 213)
@@ -1,7 +1,7 @@
+lib/firmware/hp
usr/bin
usr/sbin
usr/share/applications
-usr/share/foo2zjs/tmp
usr/share/man/man1
usr/share/pixmaps
usr/share/ppd
Added: trunk/foo2zjs_20090908dfsg/debian/foo2zjs.postinst
===================================================================
--- trunk/foo2zjs_20090908dfsg/debian/foo2zjs.postinst (rev 0)
+++ trunk/foo2zjs_20090908dfsg/debian/foo2zjs.postinst 2010-03-13 20:04:17 UTC (rev 213)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = configure ]; then
+ mv /usr/share/foo2zjs/firmware/*.dl /lib/firmware/hp/ 2>/dev/null
+fi
+
+#DEBHELPER#
Added: trunk/foo2zjs_20090908dfsg/debian/patches/70-lib-firwmare-hp.patch
===================================================================
--- trunk/foo2zjs_20090908dfsg/debian/patches/70-lib-firwmare-hp.patch (rev 0)
+++ trunk/foo2zjs_20090908dfsg/debian/patches/70-lib-firwmare-hp.patch 2010-03-13 20:04:17 UTC (rev 213)
@@ -0,0 +1,53 @@
+--- foo2zjs-20090908dfsg.orig/getweb.in
++++ foo2zjs-20090908dfsg/getweb.in
+@@ -114,7 +114,7 @@
+ putfw() {
+ inputname=$1
+ outputname=$2
+- $ARM2HPDL $inputname > /usr/share/foo2zjs/firmware/$outputname
++ $ARM2HPDL $inputname > /lib/firmware/hp/$outputname
+ rm $inputname
+ }
+
+--- foo2zjs-20090908dfsg.orig/hplj1000
++++ foo2zjs-20090908dfsg/hplj1000
+@@ -35,7 +35,7 @@
+ #
+ # Directory to find downloadable HP firmware files sihpMMMM.dl
+ #
+-FWDIR=/usr/share/foo2zjs/firmware
++FWDIR=/lib/firmware/hp
+
+ #
+ # Program used to determine USB printer id information
+--- foo2zjs-20090908dfsg.orig/usb_printerid.1in
++++ foo2zjs-20090908dfsg/usb_printerid.1in
+@@ -26,7 +26,7 @@
+ MFG:Hewlett-Packard;MDL:HP LaserJet 1020;CMD:ACL;CLS:PRINTER;\e
+ DES:HP LaserJet 1020;
+
+-# cp /usr/share/foo2zjs/firmware/sihp1020.dl /dev/usb/lp0
++# cp /lib/firmware/hp/sihp1020.dl /dev/usb/lp0
+
+ # usb_printerid /dev/usb/lp0
+ GET_DEVICE_ID string:
+@@ -37,7 +37,7 @@
+
+ .SH FILES
+ .BR /usr/bin/usb_printerid,
+-.BR /usr/share/foo2*/firmware/*
++.BR /lib/firmware/hp/*
+ .SH SEE ALSO
+ .BR arm2hpdl (1)
+ .SH "AUTHOR"
+--- foo2zjs-20090908dfsg.orig/arm2hpdl.1in
++++ foo2zjs-20090908dfsg/arm2hpdl.1in
+@@ -31,7 +31,7 @@
+
+ .SH FILES
+ .BR /usr/bin/arm2hpdl,
+-.BR /usr/share/foo2*/firmware/
++.BR /lib/firmware/hp/*
+ .SH SEE ALSO
+ .BR foo2zjs (1)
+ .SH "AUTHOR"
Modified: trunk/foo2zjs_20090908dfsg/debian/patches/series
===================================================================
--- trunk/foo2zjs_20090908dfsg/debian/patches/series 2010-03-13 18:52:03 UTC (rev 212)
+++ trunk/foo2zjs_20090908dfsg/debian/patches/series 2010-03-13 20:04:17 UTC (rev 213)
@@ -5,6 +5,7 @@
40-path-correction.patch
60-getweb.in.patch
60-hplj1000.patch
+70-lib-firwmare-hp.patch
70-printer-profile.patch
80-getweb.in.patch
90-manpages.patch
Modified: trunk/foo2zjs_20090908dfsg/debian/rules
===================================================================
--- trunk/foo2zjs_20090908dfsg/debian/rules 2010-03-13 18:52:03 UTC (rev 212)
+++ trunk/foo2zjs_20090908dfsg/debian/rules 2010-03-13 20:04:17 UTC (rev 213)
@@ -63,7 +63,6 @@
install -D -m 644 hplj10xx.rules $(CURDIR)/debian/foo2zjs/lib/udev/rules.d/85-hplj10xx.rules
install -m 755 hplj1000 $(CURDIR)/debian/foo2zjs/usr/sbin/hplj1000
install -m 755 getweb $(CURDIR)/debian/foo2zjs/usr/bin/getweb
- 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