summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Pielmeier <billie@gentoo.org>2011-02-01 19:24:19 +0000
committerDaniel Pielmeier <billie@gentoo.org>2011-02-01 19:24:19 +0000
commitceac93ccd9da3bab7771f50c364fb42415d1d1fb (patch)
tree45e1c6f2bbe5c7254c19a675a0754fecf0a78495 /net-print/hplip/files
parentversion bump (diff)
downloadgentoo-2-ceac93ccd9da3bab7771f50c364fb42415d1d1fb.tar.gz
gentoo-2-ceac93ccd9da3bab7771f50c364fb42415d1d1fb.tar.bz2
gentoo-2-ceac93ccd9da3bab7771f50c364fb42415d1d1fb.zip
Revision bump. Remove old. Fixes bug #353330. Thanks to Ben Sagal for reporting.
(Portage version: 2.1.9.35/cvs/Linux i686)
Diffstat (limited to 'net-print/hplip/files')
-rw-r--r--net-print/hplip/files/hplip-3.11.1-udev-attrs.patch15
1 files changed, 8 insertions, 7 deletions
diff --git a/net-print/hplip/files/hplip-3.11.1-udev-attrs.patch b/net-print/hplip/files/hplip-3.11.1-udev-attrs.patch
index 7f64e5e0ba13..b14b662f127a 100644
--- a/net-print/hplip/files/hplip-3.11.1-udev-attrs.patch
+++ b/net-print/hplip/files/hplip-3.11.1-udev-attrs.patch
@@ -1,6 +1,6 @@
diff -Naur hplip-3.11.1-old/data/rules/55-hpmud.rules hplip-3.11.1/data/rules/55-hpmud.rules
---- hplip-3.11.1-old/data/rules/55-hpmud.rules 2011-01-24 21:01:48.803135668 +0100
-+++ hplip-3.11.1/data/rules/55-hpmud.rules 2011-01-24 21:03:47.279802334 +0100
+--- hplip-3.11.1-old/data/rules/55-hpmud.rules 2011-02-01 20:01:44.004639335 +0100
++++ hplip-3.11.1/data/rules/55-hpmud.rules 2011-02-01 20:04:12.654639335 +0100
@@ -21,128 +21,128 @@
LABEL="hplip_pid_test"
@@ -191,15 +191,16 @@ diff -Naur hplip-3.11.1-old/data/rules/55-hpmud.rules hplip-3.11.1/data/rules/55
# Removed the following rule because FHS states that /etc should be reserved for static files only. This
# functionality should be done in a deb/rpm post install script. 2/11/2009, D Suffield
diff -Naur hplip-3.11.1-old/data/rules/56-hpmud_support.rules hplip-3.11.1/data/rules/56-hpmud_support.rules
---- hplip-3.11.1-old/data/rules/56-hpmud_support.rules 2011-01-24 21:01:48.803135668 +0100
-+++ hplip-3.11.1/data/rules/56-hpmud_support.rules 2011-01-24 21:02:52.919802334 +0100
-@@ -8,8 +8,10 @@
+--- hplip-3.11.1-old/data/rules/56-hpmud_support.rules 2011-02-01 20:01:44.004639335 +0100
++++ hplip-3.11.1/data/rules/56-hpmud_support.rules 2011-02-01 20:05:47.421306000 +0100
+@@ -7,9 +7,9 @@
+ LABEL="pid_test"
# Check for LaserJet products (0x03f0xx17).
- SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", RUN+="/bin/sh -c 'hp_model=%E{ID_MODEL} /usr/bin/hp-mkuri -c &'"
# Check for LaserJet products (0x03f0xx2a).
- SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??2a", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??2a", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", RUN+="/bin/sh -c 'hp_model=%E{ID_MODEL} /usr/bin/hp-mkuri -c &'"
ENV{hp_test}=="yes", RUN+="bin/sh -c '/usr/bin/hp-mkuri -c &'"