- updated

Changed files:
    foo2zjs-hplj1000.patch -> 1.2
    foo2zjs-udev-rules.patch -> 1.2

diff --git a/foo2zjs-hplj1000.patch b/foo2zjs-hplj1000.patch
index 75e67a6dbeb4ecc4b88918698cb1433dbeaaf7c2..b69ecf09bdc674e670e3700081a301362600422a 100644 (file)
--- a/foo2zjs-hplj1000.patch
+++ b/foo2zjs-hplj1000.patch
@@ -1,11 +1,11 @@
 --- hplj1000.orig      2007-03-06 23:00:06.000000000 +0000
 +++ hplj1000   2007-03-06 22:14:44.000000000 +0000
-@@ -40,7 +40,7 @@
+@@ -47,7 +47,7 @@
+ #    [snip]
+ #    # Mount all other filesystems (except for NFS and /proc, which is already
  #
- # Program used to determine USB id information
- #
--USBID=/bin/usb_printerid
-+USBID=/usr/bin/usb_printerid
+-PRINTERID=/bin/usb_printerid
++PRINTERID=/usr/bin/usb_printerid
  
  #
  #     Figure out how to log our messages
@@ -15,8 +15,8 @@
  #
 -case "$0" in
 +case "$1" in
- *1000)
-     MODEL=1000
+ *P1005)
+     MODEL=P1005
      USB1=0x03f0       #Vendor
 @@ -91,42 +91,6 @@
      exit

diff --git a/foo2zjs-udev-rules.patch b/foo2zjs-udev-rules.patch
index 22c79e90dbe23aaabd1fe32cedea5a646afa9c39..41c2dabda5a556df6aca8185870fb33ab72b4651 100644 (file)
--- a/foo2zjs-udev-rules.patch
+++ b/foo2zjs-udev-rules.patch
@@ -1,15 +1,38 @@
---- hplj10xx.rules.orig        2007-01-25 15:49:10.000000000 +0000
-+++ hplj10xx.rules     2007-03-06 22:31:55.000000000 +0000
-@@ -1,8 +1,8 @@
+--- hplj10xx.rules.org 2008-04-23 15:46:24.598792282 +0200
++++ hplj10xx.rules     2008-04-23 15:46:47.896572716 +0200
+@@ -1,28 +1,28 @@
  #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+="/usr/bin/hplj10xx hplj1000" 
+ KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+       SYSFS{product}=="hp LaserJet 1000", NAME="usb/%k", \
+-      SYMLINK+="hplj1000-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1000" 
++      SYMLINK+="hplj1000-%n", MODE="0666", RUN+="/usr/bin/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+="/usr/bin/hplj10xx hplj1005" 
+ KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+       SYSFS{product}=="hp LaserJet 1005 series", NAME="usb/%k", \
+-      SYMLINK+="hplj1005-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1005" 
++      SYMLINK+="hplj1005-%n", MODE="0666", RUN+="/usr/bin/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+="/usr/bin/hplj10xx hplj1018" 
+ KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+       SYSFS{product}=="HP LaserJet 1018", NAME="usb/%k", \
+-      SYMLINK+="hplj1018-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1018" 
++      SYMLINK+="hplj1018-%n", MODE="0666", RUN+="/usr/bin/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" 
-+KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", SYSFS{product}=="HP LaserJet 1020", NAME="usb/%k", SYMLINK+="hplj1020%e", MODE="0666", RUN+="/usr/bin/hplj10xx  hplj1020" 
+ KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+       SYSFS{product}=="HP LaserJet 1020", NAME="usb/%k", \
+-      SYMLINK+="hplj1020-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1020" 
++      SYMLINK+="hplj1020-%n", MODE="0666", RUN+="/usr/bin/hplj1020" 
+ #Own udev rule for HP Laserjet P1005
+ KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+       SYSFS{product}=="HP LaserJet P1005", NAME="usb/%k", \
+-      SYMLINK+="hpljP1005-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1005" 
++      SYMLINK+="hpljP1005-%n", MODE="0666", RUN+="/usr/bin/hpljP1005" 
+ #Own udev rule for HP Laserjet P1006
+ KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+       SYSFS{product}=="HP LaserJet P1006", NAME="usb/%k", \
+-      SYMLINK+="hpljP1006-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1006" 
++      SYMLINK+="hpljP1006-%n", MODE="0666", RUN+="/usr/bin/hpljP1006" 
+ #Own udev rule for HP Laserjet P1505
+ KERNEL=="lp*", BUS=="usb", SYSFS{idVendor}=="03f0", \
+       SYSFS{product}=="HP LaserJet P1505", NAME="usb/%k", \
+-      SYMLINK+="hpljP1505-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1505" 
++      SYMLINK+="hpljP1505-%n", MODE="0666", RUN+="/usr/bin/hpljP1505"