diff options
author | Stefan Schweizer <genstef@gentoo.org> | 2006-05-03 11:53:27 +0000 |
---|---|---|
committer | Stefan Schweizer <genstef@gentoo.org> | 2006-05-03 11:53:27 +0000 |
commit | 16e18ee4ed93c3fea8abf24ce797a34b30314523 (patch) | |
tree | 510c143d8aa9417d37082368b8cbe9d1dbe0c420 /net-print/foo2zjs/files | |
parent | Added ~alpha keyword wrt bug #131039 (diff) | |
download | gentoo-2-16e18ee4ed93c3fea8abf24ce797a34b30314523.tar.gz gentoo-2-16e18ee4ed93c3fea8abf24ce797a34b30314523.tar.bz2 gentoo-2-16e18ee4ed93c3fea8abf24ce797a34b30314523.zip |
version bump, adds hplj 1018 support, remove old
(Portage version: 2.1_pre10-r2)
(Signed Manifest commit)
Diffstat (limited to 'net-print/foo2zjs/files')
-rw-r--r-- | net-print/foo2zjs/files/digest-foo2zjs-20050925 | 5 | ||||
-rw-r--r-- | net-print/foo2zjs/files/digest-foo2zjs-20051228 | 4 | ||||
-rw-r--r-- | net-print/foo2zjs/files/digest-foo2zjs-20060118 | 4 | ||||
-rw-r--r-- | net-print/foo2zjs/files/foo2zjs-Makefile-20050925.diff | 119 | ||||
-rw-r--r-- | net-print/foo2zjs/files/foo2zjs-Makefile-20051228.diff | 131 | ||||
-rw-r--r-- | net-print/foo2zjs/files/foo2zjs-Makefile-20060118.diff | 132 | ||||
-rw-r--r-- | net-print/foo2zjs/files/foo2zjs-udevfwld-20050925.diff | 265 | ||||
-rw-r--r-- | net-print/foo2zjs/files/foo2zjs-udevfwld-20051228.diff | 183 | ||||
-rw-r--r-- | net-print/foo2zjs/files/foo2zjs-udevfwld-20060118.diff | 183 |
9 files changed, 0 insertions, 1026 deletions
diff --git a/net-print/foo2zjs/files/digest-foo2zjs-20050925 b/net-print/foo2zjs/files/digest-foo2zjs-20050925 deleted file mode 100644 index ed4f556a48c8..000000000000 --- a/net-print/foo2zjs/files/digest-foo2zjs-20050925 +++ /dev/null @@ -1,5 +0,0 @@ -MD5 d680f447a416c5f9041f27c0a1df57a0 m23dlicc.exe 170496 -MD5 3b78a08aa968b4c1ed591947721d3e47 m22dlicc.exe 634368 -MD5 cae0d20d3c1d57cd3953d9b335014294 cpplxp.exe 4799488 -MD5 36ca0680a7b22c9b5cd1f8b34ab48cd8 foo2zjs-20050319.tar.gz 972297 -MD5 7242e44d7c863ffe7aae98639868209b foo2zjs-hplj1020-20050426.diff.bz2 124846 diff --git a/net-print/foo2zjs/files/digest-foo2zjs-20051228 b/net-print/foo2zjs/files/digest-foo2zjs-20051228 deleted file mode 100644 index 2431e5d53b07..000000000000 --- a/net-print/foo2zjs/files/digest-foo2zjs-20051228 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 cae0d20d3c1d57cd3953d9b335014294 cpplxp.exe 4799488 -MD5 8f0d3c704203d10e5b475836c14cff75 foo2zjs-20051228.tar.gz 1143435 -MD5 3b78a08aa968b4c1ed591947721d3e47 m22dlicc.exe 634368 -MD5 d680f447a416c5f9041f27c0a1df57a0 m23dlicc.exe 170496 diff --git a/net-print/foo2zjs/files/digest-foo2zjs-20060118 b/net-print/foo2zjs/files/digest-foo2zjs-20060118 deleted file mode 100644 index 2207b268e915..000000000000 --- a/net-print/foo2zjs/files/digest-foo2zjs-20060118 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 cae0d20d3c1d57cd3953d9b335014294 cpplxp.exe 4799488 -MD5 516899d94f718e1c5d2f3b2f16ec09bf foo2zjs-20060118.tar.gz 2029712 -MD5 3b78a08aa968b4c1ed591947721d3e47 m22dlicc.exe 634368 -MD5 d680f447a416c5f9041f27c0a1df57a0 m23dlicc.exe 170496 diff --git a/net-print/foo2zjs/files/foo2zjs-Makefile-20050925.diff b/net-print/foo2zjs/files/foo2zjs-Makefile-20050925.diff deleted file mode 100644 index 81eafe050fb7..000000000000 --- a/net-print/foo2zjs/files/foo2zjs-Makefile-20050925.diff +++ /dev/null @@ -1,119 +0,0 @@ -diff -Nuarp foo2zjs.orig/Makefile foo2zjs/Makefile ---- foo2zjs.orig/Makefile 2005-09-25 11:44:11.000000000 +0200 -+++ foo2zjs/Makefile 2005-09-25 12:13:55.000000000 +0200 -@@ -6,8 +6,8 @@ EUID := $(shell id -u) - VERSION=0.0 - - # Installation prefix... --PREFIX=/usr/local --PREFIX=/usr -+PREFIX=$(DESTDIR)/usr/local -+PREFIX=$(DESTDIR)/usr - - # Pathnames for this package... - BIN=$(PREFIX)/bin -@@ -17,7 +17,7 @@ MANDIR=$(PREFIX)/share/man - DOCDIR=$(PREFIX)/share/doc/foo2zjs/ - - # Pathnames for referenced packages... --FOODB=/usr/share/foomatic/db/source -+FOODB=$(PREFIX)/share/foomatic/db/source - - # User ID's - LPuid=-olp -@@ -115,9 +115,6 @@ ifeq ($(UNAME),Linux) - endif - endif - --# Compiler flags --CFLAGS += -O2 -Wall -- - # - # Rules to create test documents - # -@@ -212,6 +209,7 @@ install: all install-prog install-icc2ps - # On Suse 9.0, run "yast" - - install-prog: -+ [ -d $(BIN) ] || install -d -m 755 $(BIN)/ - # - # Install driver, wrapper, and development tools - # -@@ -239,6 +237,7 @@ install-foo: - # - @if [ -d $(FOODB) ]; then \ - for dir in driver printer opt; do \ -+ [ -d $(FOODB)/$$dir/ ] || install -d -m 755 $(FOODB)/$$dir/; \ - echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \ - install -c -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \ - done \ -@@ -256,9 +255,9 @@ install-foo: - # - # Clear foomatic cache and rebuild database if needed - # -- rm -rf /var/cache/foomatic/*/* -- if [ -d /var/cache/foomatic/compiled ]; then \ -- cd /var/cache/foomatic/compiled; \ -+ rm -rf $(DESTDIR)/var/cache/foomatic/*/* -+ if [ -d $(DESTDIR)/var/cache/foomatic/compiled ]; then \ -+ cd $(DESTDIR)/var/cache/foomatic/compiled; \ - foomatic-combo-xml -O >overview.xml; \ - fi - -@@ -306,15 +305,13 @@ install-extra: - # foo2oak ICM files (if any) - install $(LPuid) $(LPgid) -m 775 -d $(SHAREOAK)/icm/ - --USBDIR=/etc/hotplug/usb -+USBDIR=$(DESTDIR)/etc/hotplug/usb - install-hotplug: - [ -d $(USBDIR) ] || install -d -m 755 $(USBDIR)/ - install -c -m 755 hplj1000 $(USBDIR)/ - ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1005 - ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1020 -- $(USBDIR)/hplj1000 install-usermap -- $(USBDIR)/hplj1005 install-usermap -- $(USBDIR)/hplj1020 install-usermap -+ install -c -m 755 hplj.usermap $(USBDIR)/ - - clean: - -rm -f foo2zjs zjsdecode -@@ -466,7 +463,7 @@ xxx.zm: FRC - ppd: - ./getweb ppd - --MODEL=/usr/share/cups/model -+MODEL=$(PREFIX)/share/cups/model - install-ppd: - # - # Install PPD files for CUPS -@@ -523,7 +520,6 @@ install-doc: doc - install -c -m 644 README $(DOCDIR) - install -c -m 644 ChangeLog $(DOCDIR) - --GROFF=/usr/local/test/bin/groff - GROFF=groff - manual.pdf: $(MANPAGES) - -$(GROFF) -t -man $(MANPAGES) | ps2pdf - $@ -diff -Nuarp foo2zjs.orig/hplj.usermap foo2zjs/hplj.usermap ---- foo2zjs.orig/hplj.usermap 1970-01-01 01:00:00.000000000 +0100 -+++ foo2zjs/hplj.usermap 2005-09-25 12:13:45.000000000 +0200 -@@ -0,0 +1,3 @@ -+hplj1000 0x0003 0x03f0 0x0517 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -+hplj1005 0x0003 0x03f0 0x1317 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -+hplj1020 0x0003 0x03f0 0x2B17 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -diff -Nuarp foo2zjs.orig/icc2ps/Makefile foo2zjs/icc2ps/Makefile ---- foo2zjs.orig/icc2ps/Makefile 2003-08-08 03:38:13.000000000 +0200 -+++ foo2zjs/icc2ps/Makefile 2005-09-25 12:05:47.000000000 +0200 -@@ -1,10 +1,9 @@ --PREFIX= /usr -+PREFIX= $(DESTDIR)/usr - BIN= $(PREFIX)/bin - SRC= icc2ps.c xgetopt.c - LIB= cmscam97.c cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \ - cmslut.c cmsmatsh.c cmsmtrx.c cmsnamed.c cmspack.c cmspcs.c cmsps2.c \ - cmssamp.c cmswtpnt.c cmsxform.c --CFLAGS= -O3 - - all: foo2zjs-icc2ps - diff --git a/net-print/foo2zjs/files/foo2zjs-Makefile-20051228.diff b/net-print/foo2zjs/files/foo2zjs-Makefile-20051228.diff deleted file mode 100644 index 38a07e9c3949..000000000000 --- a/net-print/foo2zjs/files/foo2zjs-Makefile-20051228.diff +++ /dev/null @@ -1,131 +0,0 @@ -diff -Naupr foo2zjs.orig/hplj.usermap foo2zjs/hplj.usermap ---- foo2zjs.orig/hplj.usermap 1970-01-01 01:00:00.000000000 +0100 -+++ foo2zjs/hplj.usermap 2005-12-28 19:33:22.000000000 +0100 -@@ -0,0 +1,3 @@ -+hplj1000 0x0003 0x03f0 0x0517 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -+hplj1005 0x0003 0x03f0 0x1317 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -+hplj1020 0x0003 0x03f0 0x2B17 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -diff -Naupr foo2zjs.orig/icc2ps/Makefile foo2zjs/icc2ps/Makefile ---- foo2zjs.orig/icc2ps/Makefile 2005-12-28 19:32:58.000000000 +0100 -+++ foo2zjs/icc2ps/Makefile 2005-12-28 19:33:22.000000000 +0100 -@@ -1,10 +1,9 @@ --PREFIX= /usr -+PREFIX= $(DESTDIR)/usr - BIN= $(PREFIX)/bin - SRC= icc2ps.c xgetopt.c - LIB= cmscam97.c cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \ - cmslut.c cmsmatsh.c cmsmtrx.c cmsnamed.c cmspack.c cmspcs.c cmsps2.c \ - cmssamp.c cmswtpnt.c cmsxform.c --CFLAGS= -O3 - - all: foo2zjs-icc2ps - -diff -Naupr foo2zjs.orig/Makefile foo2zjs/Makefile ---- foo2zjs.orig/Makefile 2005-12-28 19:32:58.000000000 +0100 -+++ foo2zjs/Makefile 2005-12-28 19:36:03.000000000 +0100 -@@ -6,8 +6,8 @@ EUID := $(shell id -u) - VERSION=0.0 - - # Installation prefix... --PREFIX=/usr/local --PREFIX=/usr -+PREFIX=$(DESTDIR)/usr/local -+PREFIX=$(DESTDIR)/usr - - # Pathnames for this package... - BIN=$(PREFIX)/bin -@@ -18,7 +18,7 @@ MANDIR=$(PREFIX)/share/man - DOCDIR=$(PREFIX)/share/doc/foo2zjs/ - - # Pathnames for referenced packages... --FOODB=/usr/share/foomatic/db/source -+FOODB=$(PREFIX)/share/foomatic/db/source - - # User ID's - LPuid=-olp -@@ -126,9 +126,6 @@ ifeq ($(UNAME),Linux) - endif - endif - --# Compiler flags --CFLAGS += -O2 -Wall -- - # - # Rules to create test documents - # -@@ -245,11 +242,13 @@ install: all install-prog install-icc2ps - # On Ubunto 5.10, run "gnome-cups-manager" - - install-prog: -+ [ -d $(BIN) ] || install -d -m 755 $(BIN)/ -+ [ -d $(DESTDIR)/bin/ ] || install -d -m 755 $(DESTDIR)/bin/ - # - # Install driver, wrapper, and development tools - # - install -c $(PROGS) $(SHELLS) $(BIN)/ -- install -c $(BINPROGS) /bin/ -+ install -c $(BINPROGS) $(DESTDIR)/bin/ - # - # Install gamma correction files. These are just templates, - # and don't actually do anything right now. If anybody wants -@@ -274,6 +273,7 @@ install-foo: - # - @if [ -d $(FOODB) ]; then \ - for dir in driver printer opt; do \ -+ [ -d $(FOODB)/$$dir/ ] || install -d -m 755 $(FOODB)/$$dir/; \ - echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \ - install -c -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \ - done \ -@@ -291,9 +291,9 @@ install-foo: - # - # Clear foomatic cache and rebuild database if needed - # -- rm -rf /var/cache/foomatic/*/* -- if [ -d /var/cache/foomatic/compiled ]; then \ -- cd /var/cache/foomatic/compiled; \ -+ rm -rf $(DESTDIR)/var/cache/foomatic/*/* -+ if [ -d $(DESTDIR)/var/cache/foomatic/compiled ]; then \ -+ cd $(DESTDIR)/var/cache/foomatic/compiled; \ - foomatic-combo-xml -O >overview.xml; \ - fi - -@@ -357,7 +357,7 @@ install-extra: - fi; \ - done - --MODEL=/usr/share/cups/model -+MODEL=$(PREFIX)/share/cups/model - install-ppd: - # - # Install PPD files for CUPS -@@ -369,20 +369,13 @@ install-ppd: - done; \ - fi - --USBDIR=/etc/hotplug/usb --UDEVDIR=/etc/udev/rules.d --RULES=hplj10xx.rules -+USBDIR=$(DESTDIR)/etc/hotplug/usb - install-hotplug: - [ -d $(USBDIR) ] || install -d -m 755 $(USBDIR)/ - install -c -m 755 hplj1000 $(USBDIR)/ - ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1005 - ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1020 -- $(USBDIR)/hplj1000 install-usermap -- $(USBDIR)/hplj1005 install-usermap -- $(USBDIR)/hplj1020 install-usermap -- if [ -d $(UDEVDIR) ]; then \ -- install -c -m 644 $(RULES) $(UDEVDIR)/11-$(RULES); \ -- fi -+ install -c -m 755 hplj.usermap $(USBDIR)/ - - uninstall: - -rm -f /etc/hotplug/usb/hplj1000 -@@ -606,7 +599,6 @@ install-doc: doc - install -c -m 644 README $(DOCDIR) - install -c -m 644 ChangeLog $(DOCDIR) - --GROFF=/usr/local/test/bin/groff - GROFF=groff - manual.pdf: $(MANPAGES) - -$(GROFF) -t -man $(MANPAGES) | ps2pdf - $@ diff --git a/net-print/foo2zjs/files/foo2zjs-Makefile-20060118.diff b/net-print/foo2zjs/files/foo2zjs-Makefile-20060118.diff deleted file mode 100644 index 9af984830336..000000000000 --- a/net-print/foo2zjs/files/foo2zjs-Makefile-20060118.diff +++ /dev/null @@ -1,132 +0,0 @@ -diff -Naupr foo2zjs.orig/hplj.usermap foo2zjs/hplj.usermap ---- foo2zjs.orig/hplj.usermap 1970-01-01 01:00:00.000000000 +0100 -+++ foo2zjs/hplj.usermap 2006-01-21 10:41:45.000000000 +0100 -@@ -0,0 +1,3 @@ -+hplj1000 0x0003 0x03f0 0x0517 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -+hplj1005 0x0003 0x03f0 0x1317 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -+hplj1020 0x0003 0x03f0 0x2b17 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 -diff -Naupr foo2zjs.orig/icc2ps/Makefile foo2zjs/icc2ps/Makefile ---- foo2zjs.orig/icc2ps/Makefile 2006-01-21 10:41:35.000000000 +0100 -+++ foo2zjs/icc2ps/Makefile 2006-01-21 10:41:45.000000000 +0100 -@@ -1,10 +1,10 @@ --PREFIX= /usr -+PREFIX= $(DESTDIR)/usr - BIN= $(PREFIX)/bin - SRC= icc2ps.c xgetopt.c - LIB= cmscam97.c cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \ - cmslut.c cmsmatsh.c cmsmtrx.c cmsnamed.c cmspack.c cmspcs.c cmsps2.c \ - cmssamp.c cmswtpnt.c cmsxform.c --CFLAGS= -O3 -+CFLAGS?= -O3 - - all: foo2zjs-icc2ps - -diff -Naupr foo2zjs.orig/Makefile foo2zjs/Makefile ---- foo2zjs.orig/Makefile 2006-01-21 10:41:35.000000000 +0100 -+++ foo2zjs/Makefile 2006-01-21 10:48:37.000000000 +0100 -@@ -7,7 +7,7 @@ VERSION=0.0 - - # Installation prefix... - PREFIX=/usr/local --PREFIX=/usr -+PREFIX=$(DESTDIR)/usr - - # Pathnames for this package... - BIN=$(PREFIX)/bin -@@ -18,7 +18,7 @@ MANDIR=$(PREFIX)/share/man - DOCDIR=$(PREFIX)/share/doc/foo2zjs/ - - # Pathnames for referenced packages... --FOODB=/usr/share/foomatic/db/source -+FOODB=$(PREFIX)/share/foomatic/db/source - - # User ID's - LPuid=-olp -@@ -148,7 +148,7 @@ ifeq ($(UNAME),Linux) - endif - - # Compiler flags --CFLAGS += -O2 -Wall -+CFLAGS ?= -O2 -Wall - - # - # Rules to create test documents -@@ -277,12 +277,14 @@ install: all install-prog install-icc2ps - # On Ubunto 5.10, run "gnome-cups-manager" - - install-prog: -+ [ -d $(BIN) ] || install -d -m 755 $(BIN)/ -+ [ -d $(DESTDIR)/bin/ ] || install -d -m 755 $(DESTDIR)/bin/ - # - # Install driver, wrapper, and development tools - # - install -c $(PROGS) $(SHELLS) $(BIN)/ - if [ "$(BINPROGS)" != "" ]; then \ -- install -c $(BINPROGS) /bin/; \ -+ install -c $(BINPROGS) $(DESTDIR)/bin/; \ - fi - # - # Install gamma correction files. These are just templates, -@@ -308,6 +310,7 @@ install-foo: - # - @if [ -d $(FOODB) ]; then \ - for dir in driver printer opt; do \ -+ [ -d $(FOODB)/$$dir/ ] || install -d -m 755 $(FOODB)/$$dir/; \ - echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \ - install -c -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \ - done \ -@@ -325,9 +328,9 @@ install-foo: - # - # Clear foomatic cache and rebuild database if needed - # -- rm -rf /var/cache/foomatic/*/* -- if [ -d /var/cache/foomatic/compiled ]; then \ -- cd /var/cache/foomatic/compiled; \ -+ rm -rf $(DESTDIR)/var/cache/foomatic/*/* -+ if [ -d $(DESTDIR)/var/cache/foomatic/compiled ]; then \ -+ cd $(DESTDIR)/var/cache/foomatic/compiled; \ - foomatic-combo-xml -O >overview.xml; \ - fi - -@@ -391,8 +394,8 @@ install-extra: - fi; \ - done - --MODEL=/usr/share/cups/model --LOCALMODEL=/usr/local/share/cups/model -+MODEL=$(PREFIX)/share/cups/model -+#LOCALMODEL=/usr/local/share/cups/model - install-ppd: - # - # Install PPD files for CUPS -@@ -409,20 +412,13 @@ install-ppd: - done; \ - fi - --USBDIR=/etc/hotplug/usb --UDEVDIR=/etc/udev/rules.d --RULES=hplj10xx.rules -+USBDIR=$(DESTDIR)/etc/hotplug/usb - install-hotplug: - [ -d $(USBDIR) ] || install -d -m 755 $(USBDIR)/ - install -c -m 755 hplj1000 $(USBDIR)/ - ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1005 - ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1020 -- $(USBDIR)/hplj1000 install-usermap -- $(USBDIR)/hplj1005 install-usermap -- $(USBDIR)/hplj1020 install-usermap -- if [ -d $(UDEVDIR) ]; then \ -- install -c -m 644 $(RULES) $(UDEVDIR)/11-$(RULES); \ -- fi -+ install -c -m 755 hplj.usermap $(USBDIR)/ - - cups: FRC - if [ -x /etc/init.d/cups ]; then \ -@@ -667,7 +663,6 @@ install-doc: doc - install -c -m 644 README $(DOCDIR) - install -c -m 644 ChangeLog $(DOCDIR) - --GROFF=/usr/local/test/bin/groff - GROFF=groff - manual.pdf: $(MANPAGES) - -$(GROFF) -t -man $(MANPAGES) | ps2pdf - $@ diff --git a/net-print/foo2zjs/files/foo2zjs-udevfwld-20050925.diff b/net-print/foo2zjs/files/foo2zjs-udevfwld-20050925.diff deleted file mode 100644 index ae4b3f954a76..000000000000 --- a/net-print/foo2zjs/files/foo2zjs-udevfwld-20050925.diff +++ /dev/null @@ -1,265 +0,0 @@ -diff -Nuarp foo2zjs.orig/58-foo2zjs.rules foo2zjs/58-foo2zjs.rules ---- foo2zjs.orig/58-foo2zjs.rules 1970-01-01 01:00:00.000000000 +0100 -+++ foo2zjs/58-foo2zjs.rules 2005-09-25 12:56:11.000000000 +0200 -@@ -0,0 +1,3 @@ -+BUS=="usb", KERNEL=="lp[0-9]*", SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="0517", RUN+="/sbin/foo2zjs-loadfw 1000" -+BUS=="usb", KERNEL=="lp[0-9]*", SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1317", RUN+="/sbin/foo2zjs-loadfw 1005" -+BUS=="usb", KERNEL=="lp[0-9]*", SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2b17", RUN+="/sbin/foo2zjs-loadfw 1020" -diff -Nuarp foo2zjs.orig/INSTALL foo2zjs/INSTALL ---- foo2zjs.orig/INSTALL 2005-09-25 12:16:59.000000000 +0200 -+++ foo2zjs/INSTALL 2005-09-25 12:53:05.000000000 +0200 -@@ -86,15 +86,23 @@ HP LASERJET 1000/1005 NOTES - - # make install-hotplug - -+ On Linux with USB connected printer and udev: -+ If you are running Linux and the printer is connected via USB, you -+ can arrange for the firmware to be automatically downloaded to the -+ printer by performing one more installation step: -+ -+ # make install-udev -+ This udev-loading is more reliable than the hotplug-loading -+ - On another OS or with a parallel port connected printer: - - You must send a firmware file to the printer each time you power it - up. If you downloaded the extra files for the HP above, a typical - command line to load the firmware would be: - -- cat /usr/share/foo2zjs/firmware/sihp1000.dl > /dev/usb/lp0 -+ cat /lib/firmware/sihp1000.dl > /dev/lp0 - or: -- cat /usr/share/foo2zjs/firmware/sihp1005.dl > /dev/usb/lp0 -+ cat /lib/firmware/sihp1005.dl > /dev/lp0 - - NOTE: The original HP files are named '*.img'. Sometimes HP supplies - these files ready-to-download to the printer, sometimes they are raw -diff -Nuarp foo2zjs.orig/INSTALL.in foo2zjs/INSTALL.in ---- foo2zjs.orig/INSTALL.in 2005-09-25 12:16:59.000000000 +0200 -+++ foo2zjs/INSTALL.in 2005-09-25 12:52:50.000000000 +0200 -@@ -86,15 +86,23 @@ HP LASERJET 1000/1005 NOTES - - # make install-hotplug - -+ On Linux with USB connected printer and udev: -+ If you are running Linux and the printer is connected via USB, you -+ can arrange for the firmware to be automatically downloaded to the -+ printer by performing one more installation step: -+ -+ # make install-udev -+ This udev-loading is more reliable than the hotplug-loading -+ - On another OS or with a parallel port connected printer: - - You must send a firmware file to the printer each time you power it - up. If you downloaded the extra files for the HP above, a typical - command line to load the firmware would be: - -- cat /usr/share/foo2zjs/firmware/sihp1000.dl > /dev/usb/lp0 -+ cat /lib/firmware/sihp1000.dl > /dev/lp0 - or: -- cat /usr/share/foo2zjs/firmware/sihp1005.dl > /dev/usb/lp0 -+ cat /lib/firmware/sihp1005.dl > /dev/lp0 - - NOTE: The original HP files are named '*.img'. Sometimes HP supplies - these files ready-to-download to the printer, sometimes they are raw -diff -Nuarp foo2zjs.orig/Makefile foo2zjs/Makefile ---- foo2zjs.orig/Makefile 2005-09-25 12:16:59.000000000 +0200 -+++ foo2zjs/Makefile 2005-09-25 13:39:35.000000000 +0200 -@@ -9,6 +9,10 @@ VERSION=0.0 - PREFIX=$(DESTDIR)/usr/local - PREFIX=$(DESTDIR)/usr - -+# USB_PRINTERID is also installed there because it is needed by the FWloader -+FWLOADERDIR=$(DESTDIR)/sbin -+FIRMWAREDIR=$(DESTDIR)/lib/firmware -+ - # Pathnames for this package... - BIN=$(PREFIX)/bin - SHAREZJS=$(PREFIX)/share/foo2zjs -@@ -214,6 +218,13 @@ install-prog: - # Install driver, wrapper, and development tools - # - install -c $(PROGS) $(SHELLS) $(BIN)/ -+ -+ [ -d $(FWLOADERDIR) ] || install -d -m 755 $(FWLOADERDIR)/ -+ # -+ # We need usb_printerid before /usr is mounted. -+ # -+ [ -x $(BIN)/usb_printerid ] && mv $(BIN)/usb_printerid $(FWLOADERDIR)/usb_printerid -+ - # - # Install gamma correction files. These are just templates, - # and don't actually do anything right now. If anybody wants -@@ -293,15 +304,15 @@ install-extra: - fi; \ - done - # foo2zjs Firmware files (if any) -- install $(LPuid) $(LPgid) -m 775 -d $(SHAREZJS)/firmware/ -+ install $(LPuid) $(LPgid) -m 775 -d $(FIRMWAREDIR)/ - for i in sihp*.img; do \ - if [ -f $$i ]; then \ - base=`basename $$i .img`; \ - ./arm2hpdl $$i >$$base.dl; \ -- install -c -m 644 $$base.dl $(SHAREZJS)/firmware/; \ -+ install -c -m 644 $$base.dl $(FIRMWAREDIR)/; \ - fi; \ - done -- install -c -m 644 hp1020.img $(SHAREZJS)/firmware/sihp1020.dl -+ install -c -m 644 hp1020.img $(FIRMWAREDIR)/sihp1020.dl - # foo2oak ICM files (if any) - install $(LPuid) $(LPgid) -m 775 -d $(SHAREOAK)/icm/ - -@@ -313,6 +324,13 @@ install-hotplug: - ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1020 - install -c -m 755 hplj.usermap $(USBDIR)/ - -+UDEVDIR=$(DESTDIR)/etc/udev/rules.d -+install-udev: -+ [ -d $(FWLOADERDIR) ] || install -d -m 755 $(FWLOADERDIR) -+ install -c -m 755 foo2zjs-loadfw $(FWLOADERDIR) -+ [ -d $(UDEVDIR) ] || install -d -m 755 $(UDEVDIR)/ -+ install -c -m 755 58-foo2zjs.rules $(UDEVDIR) -+ - clean: - -rm -f foo2zjs zjsdecode - -rm -f *.zc *.zm -diff -Nuarp foo2zjs.orig/foo2zjs-loadfw foo2zjs/foo2zjs-loadfw ---- foo2zjs.orig/foo2zjs-loadfw 1970-01-01 01:00:00.000000000 +0100 -+++ foo2zjs/foo2zjs-loadfw 2005-09-25 12:57:45.000000000 +0200 -@@ -0,0 +1,117 @@ -+#!/bin/sh -+ -+# foo2zjs-loadfw: -+# -+# Hotplug script for HP1000/1005/1020 USB laser printers. The model number -+# that this script deals with is determined from the udev env. -+# -+# Used to download firmware automatically into the printer when it -+# is powered up or plugged into the USB port. -+# -+# The inspiration fo this script is from: -+# Oscar Santacreu. Alicante-Spain (2002) -+# Mike Morgan (2004) -+# Modified by Stefan Schweizer (2005) to work as a udev-RUN-script -+ -+# -+# Directory to find downloadable HP firmware files sihpMMMM.dl -+# -+FWDIR=/lib/firmware -+ -+# -+# Program used to determine USB id information -+# -+USBID=/sbin/usb_printerid -+ -+# -+# Figure out how to log our messages -+# -+if [ -t 1 ]; then -+ # Running from a tty... -+ log() { -+ echo "$0: $@" -+ } -+elif [ -x /usr/bin/logger ]; then -+ # Have logger... -+ log() { -+ logger -t "$0" -- "$@" -+ } -+else -+ # No logger... -+ log() { -+ echo "$0: $@" >> /var/log/messages -+ } -+fi -+ -+# -+# Figure out the model number from the name of this script -+# -+case "$1" in -+1000) -+ MODEL=1000 -+ MODELNAME="hp LaserJet $MODEL" -+ ;; -+1005) -+ MODEL=1005 -+ MODELNAME="hp LaserJet $MODEL" -+ ;; -+1020) -+ MODEL=1020 -+ MODELNAME="HP LaserJet $MODEL" -+ ;; -+*) -+ log "Only HP LaserJet 1000, 1005 and 1020 are supported" -+ log "You need to supply one of these on the cmdline: $0 10**" -+ exit -+ ;; -+esac -+ -+if [ -z "$DEVNAME" ]; then -+ if [ -n "$2" ]; then -+ DEVNAME=$2 -+ else -+ log "You need to either have $DEVNAME set in the environment or supply it on the cmdline, like:" -+ log "$0 10** /dev/usb/lp0" -+ exit 1 -+ fi -+fi -+ -+# -+# Procedure to load a single device with firmware -+# -+load1() { -+ fw="$FWDIR/sihp$MODEL.dl" -+ if [ ! -f "$fw" ]; then -+ log "Missing HP LaserJet $MODEL firmware file $fw" -+ log "...read foo2zjs installation instructions and run ./getweb $MODEL" -+ return 1 -+ fi -+ -+ log "loading HP LaserJet $MODEL firmware $fw to $DEVNAME ..." -+ if cat $fw > $DEVNAME; then -+ log "... download successful." -+ else -+ log "... download failed." -+ fi -+ return 0 -+} -+ -+# -+# OK, now download firmware to any printers that need it -+# -+if [ -x $USBID ]; then -+ if $USBID $DEVNAME | grep "$MODELNAME" 2> /dev/null; then -+ # This is a LaserJet 100x -+ if $USBID $DEVNAME | grep 'FWVER' 2> /dev/null; then -+ log "HP LaserJet $MODEL firmware already loaded into $DEVNAME" -+ else -+ # Firmware is not yet loaded -+ load1 "$DEVNAME" -+ fi -+ else -+ log "No supported printer found." -+ fi -+else -+ log "HP LaserJet $MODEL firmware was not downloaded..." -+ log "...couldn't find $USBID" -+fi -diff -Nuarp foo2zjs.orig/hplj1000 foo2zjs/hplj1000 ---- foo2zjs.orig/hplj1000 2005-09-25 12:16:59.000000000 +0200 -+++ foo2zjs/hplj1000 2005-09-25 12:47:29.000000000 +0200 -@@ -30,12 +30,12 @@ DEV="" - # - # Directory to find downloadable HP firmware files sihpMMMM.dl - # --FWDIR=/usr/share/foo2zjs/firmware -+FWDIR=/lib/firmware - - # - # Program used to determine USB id information - # --USBID=/usr/bin/usb_printerid -+USBID=/sbin/usb_printerid - - # - # Figure out how to log our messages diff --git a/net-print/foo2zjs/files/foo2zjs-udevfwld-20051228.diff b/net-print/foo2zjs/files/foo2zjs-udevfwld-20051228.diff deleted file mode 100644 index 7498c6cf4695..000000000000 --- a/net-print/foo2zjs/files/foo2zjs-udevfwld-20051228.diff +++ /dev/null @@ -1,183 +0,0 @@ -diff -Nuarp foo2zjs.orig/58-foo2zjs.rules foo2zjs/58-foo2zjs.rules ---- foo2zjs.orig/58-foo2zjs.rules 1970-01-01 01:00:00.000000000 +0100 -+++ foo2zjs/58-foo2zjs.rules 2005-09-25 12:56:11.000000000 +0200 -@@ -0,0 +1,3 @@ -+BUS=="usb", KERNEL=="lp[0-9]*", SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="0517", RUN+="/sbin/foo2zjs-loadfw 1000" -+BUS=="usb", KERNEL=="lp[0-9]*", SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1317", RUN+="/sbin/foo2zjs-loadfw 1005" -+BUS=="usb", KERNEL=="lp[0-9]*", SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2b17", RUN+="/sbin/foo2zjs-loadfw 1020" -diff -Nuarp foo2zjs.orig/foo2zjs-loadfw foo2zjs/foo2zjs-loadfw ---- foo2zjs.orig/foo2zjs-loadfw 1970-01-01 01:00:00.000000000 +0100 -+++ foo2zjs/foo2zjs-loadfw 2005-09-25 12:57:45.000000000 +0200 -@@ -0,0 +1,117 @@ -+#!/bin/sh -+ -+# foo2zjs-loadfw: -+# -+# Hotplug script for HP1000/1005/1020 USB laser printers. The model number -+# that this script deals with is determined from the udev env. -+# -+# Used to download firmware automatically into the printer when it -+# is powered up or plugged into the USB port. -+# -+# The inspiration fo this script is from: -+# Oscar Santacreu. Alicante-Spain (2002) -+# Mike Morgan (2004) -+# Modified by Stefan Schweizer (2005) to work as a udev-RUN-script -+ -+# -+# Directory to find downloadable HP firmware files sihpMMMM.dl -+# -+FWDIR=/lib/firmware -+ -+# -+# Program used to determine USB id information -+# -+USBID=/bin/usb_printerid -+ -+# -+# Figure out how to log our messages -+# -+if [ -t 1 ]; then -+ # Running from a tty... -+ log() { -+ echo "$0: $@" -+ } -+elif [ -x /usr/bin/logger ]; then -+ # Have logger... -+ log() { -+ logger -t "$0" -- "$@" -+ } -+else -+ # No logger... -+ log() { -+ echo "$0: $@" >> /var/log/messages -+ } -+fi -+ -+# -+# Figure out the model number from the name of this script -+# -+case "$1" in -+1000) -+ MODEL=1000 -+ MODELNAME="hp LaserJet $MODEL" -+ ;; -+1005) -+ MODEL=1005 -+ MODELNAME="hp LaserJet $MODEL" -+ ;; -+1020) -+ MODEL=1020 -+ MODELNAME="HP LaserJet $MODEL" -+ ;; -+*) -+ log "Only HP LaserJet 1000, 1005 and 1020 are supported" -+ log "You need to supply one of these on the cmdline: $0 10**" -+ exit -+ ;; -+esac -+ -+if [ -z "$DEVNAME" ]; then -+ if [ -n "$2" ]; then -+ DEVNAME=$2 -+ else -+ log "You need to either have $DEVNAME set in the environment or supply it on the cmdline, like:" -+ log "$0 10** /dev/usb/lp0" -+ exit 1 -+ fi -+fi -+ -+# -+# Procedure to load a single device with firmware -+# -+load1() { -+ fw="$FWDIR/sihp$MODEL.dl" -+ if [ ! -f "$fw" ]; then -+ log "Missing HP LaserJet $MODEL firmware file $fw" -+ log "...read foo2zjs installation instructions and run ./getweb $MODEL" -+ return 1 -+ fi -+ -+ log "loading HP LaserJet $MODEL firmware $fw to $DEVNAME ..." -+ if cat $fw > $DEVNAME; then -+ log "... download successful." -+ else -+ log "... download failed." -+ fi -+ return 0 -+} -+ -+# -+# OK, now download firmware to any printers that need it -+# -+if [ -x $USBID ]; then -+ if $USBID $DEVNAME | grep "$MODELNAME" 2> /dev/null; then -+ # This is a LaserJet 100x -+ if $USBID $DEVNAME | grep 'FWVER' 2> /dev/null; then -+ log "HP LaserJet $MODEL firmware already loaded into $DEVNAME" -+ else -+ # Firmware is not yet loaded -+ load1 "$DEVNAME" -+ fi -+ else -+ log "No supported printer found." -+ fi -+else -+ log "HP LaserJet $MODEL firmware was not downloaded..." -+ log "...couldn't find $USBID" -+fi -diff -ur foo2zjs.orig/hplj1000 foo2zjs/hplj1000 ---- foo2zjs.orig/hplj1000 2005-12-28 17:56:27.000000000 +0100 -+++ foo2zjs/hplj1000 2005-12-28 18:30:13.000000000 +0100 -@@ -35,7 +35,7 @@ - # - # Directory to find downloadable HP firmware files sihpMMMM.dl - # --FWDIR=/usr/share/foo2zjs/firmware -+FWDIR=/lib/firmware - - # - # Program used to determine USB id information -diff -ur foo2zjs.orig/Makefile foo2zjs/Makefile ---- foo2zjs.orig/Makefile 2005-12-28 17:56:27.000000000 +0100 -+++ foo2zjs/Makefile 2005-12-28 18:28:23.000000000 +0100 -@@ -9,6 +9,10 @@ - PREFIX=$(DESTDIR)/usr/local - PREFIX=$(DESTDIR)/usr - -+# USB_PRINTERID is also installed there because it is needed by the FWloader -+FWLOADERDIR=$(DESTDIR)/sbin -+FIRMWAREDIR=$(DESTDIR)/lib/firmware -+ - # Pathnames for this package... - BIN=$(PREFIX)/bin - SHAREZJS=$(PREFIX)/share/foo2zjs -@@ -338,12 +342,12 @@ - fi; \ - done - # foo2zjs Firmware files (if any) -- install $(LPuid) $(LPgid) -m 775 -d $(SHAREZJS)/firmware/ -+ install $(LPuid) $(LPgid) -m 775 -d $(FIRMWAREDIR)/ - for i in sihp*.img; do \ - if [ -f $$i ]; then \ - base=`basename $$i .img`; \ - ./arm2hpdl $$i >$$base.dl; \ -- install -c -m 644 $$base.dl $(SHAREZJS)/firmware/; \ -+ install -c -m 644 $$base.dl $(FIRMWAREDIR)/; \ - fi; \ - done - # foo2oak ICM files (if any) -@@ -397,6 +401,13 @@ - -rm -f /usr/bin/foo2hp2600-wrapper - -rm -f /usr/bin/foo2zjs-icc2ps - -+UDEVDIR=$(DESTDIR)/etc/udev/rules.d -+install-udev: -+ [ -d $(FWLOADERDIR) ] || install -d -m 755 $(FWLOADERDIR) -+ install -c -m 755 foo2zjs-loadfw $(FWLOADERDIR) -+ [ -d $(UDEVDIR) ] || install -d -m 755 $(UDEVDIR)/ -+ install -c -m 755 58-foo2zjs.rules $(UDEVDIR) -+ - clean: - -rm -f $(PROGS) $(BINPROGS) $(SHELLS) - -rm -f *.zc *.zm diff --git a/net-print/foo2zjs/files/foo2zjs-udevfwld-20060118.diff b/net-print/foo2zjs/files/foo2zjs-udevfwld-20060118.diff deleted file mode 100644 index efd01c165bf3..000000000000 --- a/net-print/foo2zjs/files/foo2zjs-udevfwld-20060118.diff +++ /dev/null @@ -1,183 +0,0 @@ -diff -Naupr foo2zjs.orig/58-foo2zjs.rules foo2zjs/58-foo2zjs.rules ---- foo2zjs.orig/58-foo2zjs.rules 1970-01-01 01:00:00.000000000 +0100 -+++ foo2zjs/58-foo2zjs.rules 2006-01-21 10:52:12.000000000 +0100 -@@ -0,0 +1,3 @@ -+BUS=="usb", KERNEL=="lp[0-9]*", SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="0517", RUN+="/sbin/foo2zjs-loadfw 1000" -+BUS=="usb", KERNEL=="lp[0-9]*", SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1317", RUN+="/sbin/foo2zjs-loadfw 1005" -+BUS=="usb", KERNEL=="lp[0-9]*", SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2b17", RUN+="/sbin/foo2zjs-loadfw 1020" -diff -Naupr foo2zjs.orig/foo2zjs-loadfw foo2zjs/foo2zjs-loadfw ---- foo2zjs.orig/foo2zjs-loadfw 1970-01-01 01:00:00.000000000 +0100 -+++ foo2zjs/foo2zjs-loadfw 2006-01-21 10:52:12.000000000 +0100 -@@ -0,0 +1,117 @@ -+#!/bin/sh -+ -+# foo2zjs-loadfw: -+# -+# Hotplug script for HP1000/1005/1020 USB laser printers. The model number -+# that this script deals with is determined from the udev env. -+# -+# Used to download firmware automatically into the printer when it -+# is powered up or plugged into the USB port. -+# -+# The inspiration fo this script is from: -+# Oscar Santacreu. Alicante-Spain (2002) -+# Mike Morgan (2004) -+# Modified by Stefan Schweizer (2005) to work as a udev-RUN-script -+ -+# -+# Directory to find downloadable HP firmware files sihpMMMM.dl -+# -+FWDIR=/lib/firmware -+ -+# -+# Program used to determine USB id information -+# -+USBID=/bin/usb_printerid -+ -+# -+# Figure out how to log our messages -+# -+if [ -t 1 ]; then -+ # Running from a tty... -+ log() { -+ echo "$0: $@" -+ } -+elif [ -x /usr/bin/logger ]; then -+ # Have logger... -+ log() { -+ logger -t "$0" -- "$@" -+ } -+else -+ # No logger... -+ log() { -+ echo "$0: $@" >> /var/log/messages -+ } -+fi -+ -+# -+# Figure out the model number from the name of this script -+# -+case "$1" in -+1000) -+ MODEL=1000 -+ MODELNAME="hp LaserJet $MODEL" -+ ;; -+1005) -+ MODEL=1005 -+ MODELNAME="hp LaserJet $MODEL" -+ ;; -+1020) -+ MODEL=1020 -+ MODELNAME="HP LaserJet $MODEL" -+ ;; -+*) -+ log "Only HP LaserJet 1000, 1005 and 1020 are supported" -+ log "You need to supply one of these on the cmdline: $0 10**" -+ exit -+ ;; -+esac -+ -+if [ -z "$DEVNAME" ]; then -+ if [ -n "$2" ]; then -+ DEVNAME=$2 -+ else -+ log "You need to either have $DEVNAME set in the environment or supply it on the cmdline, like:" -+ log "$0 10** /dev/usb/lp0" -+ exit 1 -+ fi -+fi -+ -+# -+# Procedure to load a single device with firmware -+# -+load1() { -+ fw="$FWDIR/sihp$MODEL.dl" -+ if [ ! -f "$fw" ]; then -+ log "Missing HP LaserJet $MODEL firmware file $fw" -+ log "...read foo2zjs installation instructions and run ./getweb $MODEL" -+ return 1 -+ fi -+ -+ log "loading HP LaserJet $MODEL firmware $fw to $DEVNAME ..." -+ if cat $fw > $DEVNAME; then -+ log "... download successful." -+ else -+ log "... download failed." -+ fi -+ return 0 -+} -+ -+# -+# OK, now download firmware to any printers that need it -+# -+if [ -x $USBID ]; then -+ if $USBID $DEVNAME | grep "$MODELNAME" 2> /dev/null; then -+ # This is a LaserJet 100x -+ if $USBID $DEVNAME | grep 'FWVER' 2> /dev/null; then -+ log "HP LaserJet $MODEL firmware already loaded into $DEVNAME" -+ else -+ # Firmware is not yet loaded -+ load1 "$DEVNAME" -+ fi -+ else -+ log "No supported printer found." -+ fi -+else -+ log "HP LaserJet $MODEL firmware was not downloaded..." -+ log "...couldn't find $USBID" -+fi -diff -Naupr foo2zjs.orig/hplj1000 foo2zjs/hplj1000 ---- foo2zjs.orig/hplj1000 2006-01-21 10:41:35.000000000 +0100 -+++ foo2zjs/hplj1000 2006-01-21 10:52:12.000000000 +0100 -@@ -35,7 +35,7 @@ DEV="" - # - # Directory to find downloadable HP firmware files sihpMMMM.dl - # --FWDIR=/usr/share/foo2zjs/firmware -+FWDIR=/lib/firmware - - # - # Program used to determine USB id information -diff -Naupr foo2zjs.orig/Makefile foo2zjs/Makefile ---- foo2zjs.orig/Makefile 2006-01-21 10:56:01.000000000 +0100 -+++ foo2zjs/Makefile 2006-01-21 10:55:20.000000000 +0100 -@@ -9,6 +9,10 @@ VERSION=0.0 - PREFIX=/usr/local - PREFIX=$(DESTDIR)/usr - -+# USB_PRINTERID is also installed there because it is needed by the FWloader -+FWLOADERDIR=$(DESTDIR)/sbin -+FIRMWAREDIR=$(DESTDIR)/lib/firmware -+ - # Pathnames for this package... - BIN=$(PREFIX)/bin - SHAREZJS=$(PREFIX)/share/foo2zjs -@@ -376,12 +380,12 @@ install-extra: - fi; \ - done - # foo2zjs Firmware files (if any) -- install $(LPuid) $(LPgid) -m 775 -d $(SHAREZJS)/firmware/ -+ install $(LPuid) $(LPgid) -m 775 -d $(FIRMWAREDIR)/ - for i in sihp*.img; do \ - if [ -f $$i ]; then \ - base=`basename $$i .img`; \ - ./arm2hpdl $$i >$$base.dl; \ -- install -c -m 644 $$base.dl $(SHAREZJS)/firmware/; \ -+ install -c -m 644 $$base.dl $(FIRMWAREDIR)/; \ - fi; \ - done - # foo2oak ICM files (if any) -@@ -420,6 +424,13 @@ install-hotplug: - ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1020 - install -c -m 755 hplj.usermap $(USBDIR)/ - -+UDEVDIR=$(DESTDIR)/etc/udev/rules.d -+install-udev: -+ [ -d $(FWLOADERDIR) ] || install -d -m 755 $(FWLOADERDIR)/ -+ install -c -m 755 foo2zjs-loadfw $(FWLOADERDIR)/ -+ [ -d $(UDEVDIR) ] || install -d -m 755 $(UDEVDIR)/ -+ install -c -m 755 58-foo2zjs.rules $(UDEVDIR)/ -+ - cups: FRC - if [ -x /etc/init.d/cups ]; then \ - /etc/init.d/cups restart; \ |