version bump also solving bug 198122, changed uris

(Portage version: 2.1.3.18)

5 files changed, 141 insertions, 156 deletions

diff --git a/net-print/foo2zjs/files/digest-foo2zjs-20070424 b/net-print/foo2zjs/files/digest-foo2zjs-20070424
deleted file mode 100644
index 3cca91fab1ff..000000000000
--- a/net-print/foo2zjs/files/digest-foo2zjs-20070424
+++ /dev/null
@@ -1,30 +0,0 @@
-MD5 cae0d20d3c1d57cd3953d9b335014294 cpplxp.exe 4799488
-RMD160 bcd5ceecca248c90a0d3e99dd55c6e1eedd4de6d cpplxp.exe 4799488
-SHA256 5f4c8b6f20ccf2d525f683847f5dc24bb4c7f58131d6704047d6c9a90d6895af cpplxp.exe 4799488
-MD5 2041c2866c43666ed3de43bc2d96e540 foo2zjs-20070424.tar.gz 1444695
-RMD160 d51c6492bab14f9cc416d18fa8aa354d1f21aa81 foo2zjs-20070424.tar.gz 1444695
-SHA256 1aedafd2791bdfb1d59c0e649514142e7f93f6280b2258d71bcdd86e3551832a foo2zjs-20070424.tar.gz 1444695
-MD5 7715a289c7bb815d69e207d25310373c hpclj2600n.tar.gz 573660
-RMD160 3db577b77a9b4892022e6120e11a389c021d6939 hpclj2600n.tar.gz 573660
-SHA256 2f0adecff688c168fecb9c5950eb90c4af25e58a37ab817fb559b6019bd81dc6 hpclj2600n.tar.gz 573660
-MD5 c062f733378ac6803c18feaf1c6daf11 km2430.tar.gz 929112
-RMD160 b080a81c2c81f3ad405baccc374bd701cd9d7865 km2430.tar.gz 929112
-SHA256 d52f09b2a731974c6bd957797e89e4814e3b708ae40f5da162f872bde307b316 km2430.tar.gz 929112
-MD5 3b78a08aa968b4c1ed591947721d3e47 m22dlicc.exe 634368
-RMD160 392922135a3f517a76a2b5e8b7200c83e6104ef6 m22dlicc.exe 634368
-SHA256 1d57413f4c36941c64599dae2ac2b1f8a397e128796c2796a108be5b8fd282b3 m22dlicc.exe 634368
-MD5 d680f447a416c5f9041f27c0a1df57a0 m23dlicc.exe 170496
-RMD160 f72be93dfc5c8c9159c75d7204820f1305f47905 m23dlicc.exe 170496
-SHA256 1416cda7e2e3496ff1d121c87dd8984ad1d16ed3396096f05f4919dafd445ae4 m23dlicc.exe 170496
-MD5 aefcb7f23d4eed6f804bd65ee16616de sihp1000.tar.gz 50416
-RMD160 cebccbff789de8dd1dbbb1ce0d9916a94e028b88 sihp1000.tar.gz 50416
-SHA256 d04deae390e9acbcdf5a7fddb4ce31ae766e17a52f4d0e25b3bcd35e6fbf3b19 sihp1000.tar.gz 50416
-MD5 a0467920b53da32b3266ae6990d54b5f sihp1005.tar.gz 52297
-RMD160 5f60f2d3438fcf777009cdbf4a225b2b60899d39 sihp1005.tar.gz 52297
-SHA256 d07fb9023d34012d9b554f8596832dc3713556dcd89f29f307e2e13e699d6c39 sihp1005.tar.gz 52297
-MD5 62bf485b2d1ea3d4db0f33ed087cee3d sihp1018.tar.gz 70544
-RMD160 dd9724d2936ca80ff5f24d01cfeb80cff0fb9528 sihp1018.tar.gz 70544
-SHA256 b73fabcd0e04172a010886745d59b008d2aec17c85c7bdb4e9d92db91fa6af75 sihp1018.tar.gz 70544
-MD5 5c739d910190b5e04378f8769cc416be sihp1020.tar.gz 70139
-RMD160 dcc8f4ff216f4d85b530e7073a0c042fcdb11737 sihp1020.tar.gz 70139
-SHA256 8fa047110dc6302934f73b8a7bf8dbb9a5338002a0839662ade9580a1ff56413 sihp1020.tar.gz 70139
diff --git a/net-print/foo2zjs/files/digest-foo2zjs-20071012 b/net-print/foo2zjs/files/digest-foo2zjs-20071012
deleted file mode 100644
index 9dbe0e3cf996..000000000000
--- a/net-print/foo2zjs/files/digest-foo2zjs-20071012
+++ /dev/null
@@ -1,36 +0,0 @@
-MD5 cae0d20d3c1d57cd3953d9b335014294 cpplxp.exe 4799488
-RMD160 bcd5ceecca248c90a0d3e99dd55c6e1eedd4de6d cpplxp.exe 4799488
-SHA256 5f4c8b6f20ccf2d525f683847f5dc24bb4c7f58131d6704047d6c9a90d6895af cpplxp.exe 4799488
-MD5 bfc658bdbaa48a000a20a9fb5ddec331 foo2zjs-20071012.tar.gz 1459200
-RMD160 f697bf1b86767ed6faf74f43b4a17b56c7926e99 foo2zjs-20071012.tar.gz 1459200
-SHA256 abbbdf2f8d0cd1e648b8a95323b8dc96e336d69e5bd054392c7f5a0c972c9601 foo2zjs-20071012.tar.gz 1459200
-MD5 7715a289c7bb815d69e207d25310373c hpclj2600n.tar.gz 573660
-RMD160 3db577b77a9b4892022e6120e11a389c021d6939 hpclj2600n.tar.gz 573660
-SHA256 2f0adecff688c168fecb9c5950eb90c4af25e58a37ab817fb559b6019bd81dc6 hpclj2600n.tar.gz 573660
-MD5 c062f733378ac6803c18feaf1c6daf11 km2430.tar.gz 929112
-RMD160 b080a81c2c81f3ad405baccc374bd701cd9d7865 km2430.tar.gz 929112
-SHA256 d52f09b2a731974c6bd957797e89e4814e3b708ae40f5da162f872bde307b316 km2430.tar.gz 929112
-MD5 cb099725813ce816be4499a5f163c97d km2530.tar.gz 2045958
-RMD160 0c3b416d6f40c99fa8d3f8c4ad2ee797d41c4962 km2530.tar.gz 2045958
-SHA256 d3dc5a323b3c751d9e8b37ac9171285a724f2c91d0ce71b95674082cf6a3f8ac km2530.tar.gz 2045958
-MD5 3b78a08aa968b4c1ed591947721d3e47 m22dlicc.exe 634368
-RMD160 392922135a3f517a76a2b5e8b7200c83e6104ef6 m22dlicc.exe 634368
-SHA256 1d57413f4c36941c64599dae2ac2b1f8a397e128796c2796a108be5b8fd282b3 m22dlicc.exe 634368
-MD5 d680f447a416c5f9041f27c0a1df57a0 m23dlicc.exe 170496
-RMD160 f72be93dfc5c8c9159c75d7204820f1305f47905 m23dlicc.exe 170496
-SHA256 1416cda7e2e3496ff1d121c87dd8984ad1d16ed3396096f05f4919dafd445ae4 m23dlicc.exe 170496
-MD5 881889f76eb18e972e11b295bdfdd6c0 samclp300.tar.gz 427584
-RMD160 b83fbecc9cd8f4b00d1a620dacd90775147fef7b samclp300.tar.gz 427584
-SHA256 cecf0ade9dbe1ce3fa74f688910317367abcb2163b81ed762d0d2c8486856386 samclp300.tar.gz 427584
-MD5 aefcb7f23d4eed6f804bd65ee16616de sihp1000.tar.gz 50416
-RMD160 cebccbff789de8dd1dbbb1ce0d9916a94e028b88 sihp1000.tar.gz 50416
-SHA256 d04deae390e9acbcdf5a7fddb4ce31ae766e17a52f4d0e25b3bcd35e6fbf3b19 sihp1000.tar.gz 50416
-MD5 a0467920b53da32b3266ae6990d54b5f sihp1005.tar.gz 52297
-RMD160 5f60f2d3438fcf777009cdbf4a225b2b60899d39 sihp1005.tar.gz 52297
-SHA256 d07fb9023d34012d9b554f8596832dc3713556dcd89f29f307e2e13e699d6c39 sihp1005.tar.gz 52297
-MD5 62bf485b2d1ea3d4db0f33ed087cee3d sihp1018.tar.gz 70544
-RMD160 dd9724d2936ca80ff5f24d01cfeb80cff0fb9528 sihp1018.tar.gz 70544
-SHA256 b73fabcd0e04172a010886745d59b008d2aec17c85c7bdb4e9d92db91fa6af75 sihp1018.tar.gz 70544
-MD5 5c739d910190b5e04378f8769cc416be sihp1020.tar.gz 70139
-RMD160 dcc8f4ff216f4d85b530e7073a0c042fcdb11737 sihp1020.tar.gz 70139
-SHA256 8fa047110dc6302934f73b8a7bf8dbb9a5338002a0839662ade9580a1ff56413 sihp1020.tar.gz 70139
diff --git a/net-print/foo2zjs/files/digest-foo2zjs-20071103 b/net-print/foo2zjs/files/digest-foo2zjs-20071103
new file mode 100644
index 000000000000..a7fc770e7615
--- /dev/null
+++ b/net-print/foo2zjs/files/digest-foo2zjs-20071103
@@ -0,0 +1,39 @@
+MD5 cae0d20d3c1d57cd3953d9b335014294 cpplxp.exe 4799488
+RMD160 bcd5ceecca248c90a0d3e99dd55c6e1eedd4de6d cpplxp.exe 4799488
+SHA256 5f4c8b6f20ccf2d525f683847f5dc24bb4c7f58131d6704047d6c9a90d6895af cpplxp.exe 4799488
+MD5 2e9c6854c7cc1f7467ebdf37536134e9 foo2zjs-20071103.tar.gz 1517521
+RMD160 3dc2cddfea0494b60ebeb3d24957ce303c931b7b foo2zjs-20071103.tar.gz 1517521
+SHA256 c747a25021c519c77e7a2410857a7d4e09ae6482ca36718e22b8e7a61d46d817 foo2zjs-20071103.tar.gz 1517521
+MD5 01edbad2a3343cb12a45a8d295cf8ae7 hpclj2600n.tar.gz 573660
+RMD160 f646d2cad075231fd1be985911975dcb47fb68ea hpclj2600n.tar.gz 573660
+SHA256 6d2c37fd73c1a247895c58e119927de7ca636df800bec576513f04b325e1667b hpclj2600n.tar.gz 573660
+MD5 49898af795806e5d55283657f2bfa2fe km2430.tar.gz 929112
+RMD160 44990f1bb63eec6cbb7fb4f5f1615d5705d8740a km2430.tar.gz 929112
+SHA256 bb0151661a37b12496cfe3495dbf473a57a24b496f2b4d0e9221c297059b1ce5 km2430.tar.gz 929112
+MD5 3e49d51aa1ec1f93c84509c3ac4973d4 km2530.tar.gz 2045958
+RMD160 708ed0ef48b864823b9c91e0ec975e8bbcb80794 km2530.tar.gz 2045958
+SHA256 8f6d3786061c99ba014376ef8fc81e7954bddb1bdcc105b33488df92787cd2a4 km2530.tar.gz 2045958
+MD5 4c2091333d8154b0d48fe1c3d371ca10 lexc500.tar.gz 239577
+RMD160 4eb7b79cd706024e302c9226b6e8b946b687837c lexc500.tar.gz 239577
+SHA256 7a8ed9b0c7c6f0a505ee75daf7239dd61e84ab6f6edc032a463104ffecfdfb5c lexc500.tar.gz 239577
+MD5 3b78a08aa968b4c1ed591947721d3e47 m22dlicc.exe 634368
+RMD160 392922135a3f517a76a2b5e8b7200c83e6104ef6 m22dlicc.exe 634368
+SHA256 1d57413f4c36941c64599dae2ac2b1f8a397e128796c2796a108be5b8fd282b3 m22dlicc.exe 634368
+MD5 d680f447a416c5f9041f27c0a1df57a0 m23dlicc.exe 170496
+RMD160 f72be93dfc5c8c9159c75d7204820f1305f47905 m23dlicc.exe 170496
+SHA256 1416cda7e2e3496ff1d121c87dd8984ad1d16ed3396096f05f4919dafd445ae4 m23dlicc.exe 170496
+MD5 f9eedd5bcb2e86bd3441cf6fe271d878 samclp300.tar.gz 427584
+RMD160 d82e0ee3c2b7989ef8524a35cc03129cdd9a8a1a samclp300.tar.gz 427584
+SHA256 515de8c844ed7310b79f6ec2b5424cda2ba09b3584c9975b2957bc95d4d3520e samclp300.tar.gz 427584
+MD5 3ed374be45e0ecf516524d1776fe8431 sihp1000.tar.gz 50416
+RMD160 971a6342986b23e464b6ae7649c0fd6b0c12729f sihp1000.tar.gz 50416
+SHA256 72d10197a005a595ef2e963f15e0fb34d850f7f064d1da9cc9ae30bcec8fb233 sihp1000.tar.gz 50416
+MD5 538a7b90baf9673001ffe35b1e8bafda sihp1005.tar.gz 52297
+RMD160 96cb431d55b69245fcb9ece3e1f6757eac46c7e5 sihp1005.tar.gz 52297
+SHA256 7947ba980f223e216566ec5af25e302ae279251bdf3f6e34df5775ab4c76e8aa sihp1005.tar.gz 52297
+MD5 c555091cf6f02d404a8ad3a15497291b sihp1018.tar.gz 70544
+RMD160 0a814be797047129ae0d67cd316c8cdb5007a7dc sihp1018.tar.gz 70544
+SHA256 c772930cae4fc5c0b2a796d709e2df37aac6b3d03202372161ee3feae8d84d81 sihp1018.tar.gz 70544
+MD5 974b1b9ec7d083873706c10bc5cdea86 sihp1020.tar.gz 70139
+RMD160 7dc8c68ecaf736b5a3029eeb8891485b5d7d3654 sihp1020.tar.gz 70139
+SHA256 7982f476d72247a7e3f0bcd1939e0b4e80a1e2ed45a970477bdf19c9063ee856 sihp1020.tar.gz 70139
diff --git a/net-print/foo2zjs/files/foo2zjs-Makefile-20070424.diff b/net-print/foo2zjs/files/foo2zjs-Makefile-20071105.diff
index 52f751e63f7b..7e695c2a7cb3 100644
--- a/net-print/foo2zjs/files/foo2zjs-Makefile-20070424.diff
+++ b/net-print/foo2zjs/files/foo2zjs-Makefile-20071105.diff
@@ -1,30 +1,6 @@
-diff -Nur foo2zjs.orig/hplj.usermap foo2zjs/hplj.usermap
---- foo2zjs.orig/hplj.usermap	1970-01-01 01:00:00.000000000 +0100
-+++ foo2zjs/hplj.usermap	2007-04-24 23:35:39.000000000 +0200
-@@ -0,0 +1,4 @@
-+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
-+hplj1018 0x0003 0x03f0 0x4117 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
-+hplj1020 0x0003 0x03f0 0x2b17 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
-diff -Nur foo2zjs.orig/icc2ps/Makefile foo2zjs/icc2ps/Makefile
---- foo2zjs.orig/icc2ps/Makefile	2007-04-24 23:36:19.000000000 +0200
-+++ foo2zjs/icc2ps/Makefile	2007-04-24 23:35:39.000000000 +0200
-@@ -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 cmsio0.c cmsvirt.c
--CFLAGS=	-O3
-+CFLAGS?=	-O3
- 
- all: foo2zjs-icc2ps
- 
 diff -Nur foo2zjs.orig/Makefile foo2zjs/Makefile
---- foo2zjs.orig/Makefile	2007-04-24 23:36:19.000000000 +0200
-+++ foo2zjs/Makefile	2007-04-24 23:36:09.000000000 +0200
+--- foo2zjs.orig/Makefile	2007-11-05 11:08:51.000000000 +0100
++++ foo2zjs/Makefile	2007-11-05 11:10:49.000000000 +0100
 @@ -8,7 +8,7 @@
  
  # Installation prefix...
@@ -34,7 +10,7 @@ diff -Nur foo2zjs.orig/Makefile foo2zjs/Makefile
  
  # Pathnames for this package...
  BIN=$(PREFIX)/bin
-@@ -22,7 +22,7 @@
+@@ -23,7 +23,7 @@
  DOCDIR=$(PREFIX)/share/doc/foo2zjs/
  
  # Pathnames for referenced packages...
@@ -43,7 +19,7 @@ diff -Nur foo2zjs.orig/Makefile foo2zjs/Makefile
  
  # User ID's
  LPuid=-olp
-@@ -192,7 +192,7 @@
+@@ -210,7 +210,7 @@
  endif
  
  # Compiler flags
@@ -52,7 +28,7 @@ diff -Nur foo2zjs.orig/Makefile foo2zjs/Makefile
  #CFLAGS +=	-g
  
  #
-@@ -396,12 +396,14 @@
+@@ -478,12 +478,14 @@
      
  
  install-prog:
@@ -68,7 +44,7 @@ diff -Nur foo2zjs.orig/Makefile foo2zjs/Makefile
  	fi
  	#
  	# Install gamma correction files.  These are just templates,
-@@ -429,6 +431,7 @@
+@@ -511,6 +513,7 @@
  	#
  	@if [ -d $(FOODB) ]; then \
  	    for dir in driver printer opt; do \
@@ -76,7 +52,7 @@ diff -Nur foo2zjs.orig/Makefile foo2zjs/Makefile
  		echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
  		install -c -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
  	    done \
-@@ -446,10 +449,10 @@
+@@ -528,10 +531,10 @@
  	#
  	# Clear foomatic cache and rebuild database if needed
  	#
@@ -91,15 +67,14 @@ diff -Nur foo2zjs.orig/Makefile foo2zjs/Makefile
  	    foomatic-combo-xml -O >overview.xml; \
  	fi
  
-@@ -528,19 +531,14 @@
+@@ -629,20 +632,14 @@
  	    fi; \
  	done
  
 -MODEL=/usr/share/cups/model
--LOCALMODEL=/usr/local/share/cups/model
--PPD=/usr/share/ppd
 +MODEL=$(PREFIX)/share/cups/model
-+#LOCALMODEL=/usr/local/share/cups/model
+ LOCALMODEL=/usr/local/share/cups/model
+-PPD=/usr/share/ppd
 +PPD=$(PREFIX)/share/ppd
  install-ppd:
  	#
@@ -111,10 +86,11 @@ diff -Nur foo2zjs.orig/Makefile foo2zjs/Makefile
 -	    find $(PPD) -name '*foo2xqx*' | xargs rm -f; \
 -	    find $(PPD) -name '*foo2lava*' | xargs rm -f; \
 -	    find $(PPD) -name '*foo2qpdl*' | xargs rm -f; \
+-	    find $(PPD) -name '*foo2slx*' | xargs rm -f; \
              [ -d $(PPD)/foo2zjs ] || mkdir $(PPD)/foo2zjs; \
  	    cd PPD; \
  	    for ppd in *.ppd; do \
-@@ -559,10 +557,8 @@
+@@ -661,10 +658,8 @@
  	    done; \
  	fi
  
@@ -127,7 +103,7 @@ diff -Nur foo2zjs.orig/Makefile foo2zjs/Makefile
  
  install-hotplug-test:
  	#
-@@ -580,18 +576,18 @@
+@@ -682,18 +677,18 @@
  	#
  
  install-hotplug-prog:
@@ -153,7 +129,7 @@ diff -Nur foo2zjs.orig/Makefile foo2zjs/Makefile
  
  cups:	FRC
  	if [ -x /etc/init.d/cups ]; then \
-@@ -916,7 +912,6 @@
+@@ -1033,7 +1028,6 @@
  	install -c -m 644 README $(DOCDIR)
  	install -c -m 644 ChangeLog $(DOCDIR)
  
@@ -161,3 +137,27 @@ diff -Nur foo2zjs.orig/Makefile foo2zjs/Makefile
  GROFF=groff
  manual.pdf: $(MANPAGES)
  	-$(GROFF) -t -man $(MANPAGES) | ps2pdf - $@
+diff -Nur foo2zjs.orig/hplj.usermap foo2zjs/hplj.usermap
+--- foo2zjs.orig/hplj.usermap	1970-01-01 01:00:00.000000000 +0100
++++ foo2zjs/hplj.usermap	2007-11-05 11:09:10.000000000 +0100
+@@ -0,0 +1,4 @@
++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
++hplj1018 0x0003 0x03f0 0x4117 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
++hplj1020 0x0003 0x03f0 0x2b17 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
+diff -Nur foo2zjs.orig/icc2ps/Makefile foo2zjs/icc2ps/Makefile
+--- foo2zjs.orig/icc2ps/Makefile	2007-11-05 11:08:51.000000000 +0100
++++ foo2zjs/icc2ps/Makefile	2007-11-05 11:09:10.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 cmsio0.c cmsvirt.c
+-CFLAGS=	-O3
++CFLAGS?=	-O3
+ 
+ all: foo2zjs-icc2ps
+ 
diff --git a/net-print/foo2zjs/files/foo2zjs-udevfwld-20070424.diff b/net-print/foo2zjs/files/foo2zjs-udevfwld-20071105.diff
index 1478d68e0ac4..e83ef1441e99 100644
--- a/net-print/foo2zjs/files/foo2zjs-udevfwld-20070424.diff
+++ b/net-print/foo2zjs/files/foo2zjs-udevfwld-20071105.diff
@@ -1,6 +1,44 @@
+diff -Nur foo2zjs.orig/Makefile foo2zjs/Makefile
+--- foo2zjs.orig/Makefile	2007-11-05 11:12:09.000000000 +0100
++++ foo2zjs/Makefile	2007-11-05 11:13:51.000000000 +0100
+@@ -10,6 +10,10 @@
+ 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
+@@ -588,12 +592,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)
+@@ -687,6 +691,8 @@
+ UDEVDIR=$(DESTDIR)/etc/udev/rules.d
+ RULES=hplj10xx.rules
+ 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 644 $(RULES) $(UDEVDIR)/11-$(RULES)
+ 
 diff -Nur foo2zjs.orig/foo2zjs-loadfw foo2zjs/foo2zjs-loadfw
 --- foo2zjs.orig/foo2zjs-loadfw	1970-01-01 01:00:00.000000000 +0100
-+++ foo2zjs/foo2zjs-loadfw	2007-04-24 23:21:12.000000000 +0200
++++ foo2zjs/foo2zjs-loadfw	2007-11-05 11:13:51.000000000 +0100
 @@ -0,0 +1,127 @@
 +#!/bin/sh
 +
@@ -130,8 +168,8 @@ diff -Nur foo2zjs.orig/foo2zjs-loadfw foo2zjs/foo2zjs-loadfw
 +    log "...couldn't find $USBID"
 +fi
 diff -Nur foo2zjs.orig/hplj1000 foo2zjs/hplj1000
---- foo2zjs.orig/hplj1000	2007-04-24 23:14:56.000000000 +0200
-+++ foo2zjs/hplj1000	2007-04-24 23:18:43.000000000 +0200
+--- foo2zjs.orig/hplj1000	2007-11-05 11:12:09.000000000 +0100
++++ foo2zjs/hplj1000	2007-11-05 11:13:51.000000000 +0100
 @@ -35,7 +35,7 @@
  #
  # Directory to find downloadable HP firmware files sihpMMMM.dl
@@ -142,56 +180,30 @@ diff -Nur foo2zjs.orig/hplj1000 foo2zjs/hplj1000
  #
  # Program used to determine USB id information
 diff -Nur foo2zjs.orig/hplj10xx.rules foo2zjs/hplj10xx.rules
---- foo2zjs.orig/hplj10xx.rules	2007-04-24 23:14:56.000000000 +0200
-+++ foo2zjs/hplj10xx.rules	2007-04-24 23:24:19.000000000 +0200
-@@ -1,8 +1,4 @@
+--- foo2zjs.orig/hplj10xx.rules	2007-11-05 11:12:09.000000000 +0100
++++ foo2zjs/hplj10xx.rules	2007-11-05 11:13:57.000000000 +0100
+@@ -1,16 +1,8 @@
 -#Own udev rule for HP Laserjet 1000
--KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{product}=="hp LaserJet 1000", NAME="usb/%k", SYMLINK+="hplj1000%e", MODE="0666", RUN+="/etc/hotplug/usb/hplj1000" 
+-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+-	SYSFS{product}=="hp LaserJet 1000", NAME="usb/%k", \
+-	SYMLINK+="hplj1000%e", MODE="0666", RUN+="/etc/hotplug/usb/hplj1000" 
 -#Own udev rule for HP Laserjet 1005
--KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{product}=="hp LaserJet 1005 series", NAME="usb/%k", SYMLINK+="hplj1005%e", MODE="0666", RUN+="/etc/hotplug/usb/hplj1005" 
+-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+-	SYSFS{product}=="hp LaserJet 1005 series", NAME="usb/%k", \
+-	SYMLINK+="hplj1005%e", MODE="0666", RUN+="/etc/hotplug/usb/hplj1005" 
 -#Own udev rule for HP Laserjet 1018
--KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{product}=="HP LaserJet 1018", NAME="usb/%k", SYMLINK+="hplj1018%e", MODE="0666", RUN+="/etc/hotplug/usb/hplj1018" 
+-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+-	SYSFS{product}=="HP LaserJet 1018", NAME="usb/%k", \
+-	SYMLINK+="hplj1018%e", MODE="0666", RUN+="/etc/hotplug/usb/hplj1018" 
 -#Own udev rule for HP Laserjet 1020
--KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{product}=="HP LaserJet 1020", NAME="usb/%k", SYMLINK+="hplj1020%e", MODE="0666", RUN+="/etc/hotplug/usb/hplj1020" 
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="0517", RUN+="/sbin/foo2zjs-loadfw 1000 $tempnode"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1317", RUN+="/sbin/foo2zjs-loadfw 1005 $tempnode"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="4117", RUN+="/sbin/foo2zjs-loadfw 1018 $tempnode"
-+ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="2b17", RUN+="/sbin/foo2zjs-loadfw 1020 $tempnode"
-diff -Nur foo2zjs.orig/Makefile foo2zjs/Makefile
---- foo2zjs.orig/Makefile	2007-04-24 23:14:56.000000000 +0200
-+++ foo2zjs/Makefile	2007-04-24 23:18:43.000000000 +0200
-@@ -10,6 +10,10 @@
- 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
-@@ -506,12 +510,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)
-@@ -586,6 +590,8 @@
- UDEVDIR=$(DESTDIR)/etc/udev/rules.d
- RULES=hplj10xx.rules
- 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 644 $(RULES) $(UDEVDIR)/11-$(RULES)
- 
+-KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+-	SYSFS{product}=="HP LaserJet 1020", NAME="usb/%k", \
+-	SYMLINK+="hplj1020%e", MODE="0666", RUN+="/etc/hotplug/usb/hplj1020" 
++ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
++	ATTRS{idProduct}=="0517", RUN+="/sbin/foo2zjs-loadfw 1000 $tempnode"
++ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
++	ATTRS{idProduct}=="1317", RUN+="/sbin/foo2zjs-loadfw 1005 $tempnode"
++ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
++	ATTRS{idProduct}=="4117", RUN+="/sbin/foo2zjs-loadfw 1018 $tempnode"
++ACTION=="add", KERNEL=="lp*", SUBSYSTEM=="usb", ATTRS{idVendor}=="03f0", \
++	ATTRS{idProduct}=="2b17", RUN+="/sbin/foo2zjs-loadfw 1020 $tempnode"