Accepting request 48201 from home:a_jaeger:branches:openSUSE:Factory

Change BuildRequires for sane-backends devel split (see SR#48199). OBS-URL: https://build.opensuse.org/request/show/48201 OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=14
2010-09-15 14:06:47 +00:00 · 2010-09-15 14:06:47 +00:00 · fcada75f28
commit fcada75f28
parent 297b83868e
8 changed files with 257 additions and 1951 deletions
--- a/change-udev-rules.diff
+++ b/change-udev-rules.diff
@ -1,32 +1,22 @@
--- data/rules/55-hpmud.rules.orig	2009-08-04 23:36:57.000000000 +0200
-+++ data/rules/55-hpmud.rules	2009-08-07 11:44:27.000000000 +0200
-@@ -12,136 +12,182 @@
+--- data/rules/55-hpmud.rules.orig	2010-02-25 00:06:35.000000000 +0100
+++ data/rules/55-hpmud.rules	2010-04-01 12:18:54.000000000 +0200
+@@ -12,138 +12,180 @@
 #   3. This rules file is an attempt at being compatable with all distros. Feel free to make your own changes and if you feel your
 #      changes are not distro specific please send your patch to us. 2/11/2009, D Suffield
 #
 +# Novell/Suse changed:
 +#
-+# OWNER="lp" to OWNER="root"
-+# because OWNER="lp" is insecure because print job are processed by the user lp
-+# so that a malicious print job might be able to change owner and permissions
-+# of the device nodes and also a user who is allowed to set up a print queue
-+# can set up a special queue with his selfmade driver which changes the
-+# owner and permissions for all device nodes where in contrast OWNER="root"
-+# is more secure because then only root itself can change owner and permissions.
-+# This change is not distro specific and therefore there is a upstream bug report
-+# https://bugs.launchpad.net/hplip/+bug/410196
+# SYSFS{idVendor} to ATTR{idVendor} and
+# SYSFS{idProduct to ATTR{idProduct}
+# because SYSFS is deprecated and ATTR works for openSUSE.
 +#
-+# MODE="0660" to MODE="0664"
+# MODE="660" to MODE="0664"
 +# because it is sufficiently secure to let any user read the device nodes
 +# because HPLIP opens the device nodes exclusively so that sniffing
 +# of print jobs or scanner image data should not be possible and
 +# read permissions for any user is required in particular for USB devices
 +# so that any user can see the USB devices when he runs the command "lsusb".
 +#
-+# SYSFS{idVendor} to ATTR{idVendor} and
-+# SYSFS{idProduct to ATTR{idProduct}
-+# because SYSFS is deprecated and ATTR works for openSUSE.
-+#
 +# Added ENV{sane_hpaio}="yes" to all entries for USB devices
 +# to get the SANE driver "hpaio" automatically activated in any case
 +# (only scanners in HP parallel port all-in-one devices are ignored)
@ -38,9 +28,17 @@
 +# and then all what the driver does is to scan the USB device information
 +# to find devices which belong to the driver and if nothing found it exits.
 +# Additionally see https://bugzilla.novell.com/show_bug.cgi?id=469721#c9
+#
+# Added ENV{libsane_matched}="yes" to all entries for USB devices
+# to get normal user access permissions via udev, see
+# https://bugzilla.novell.com/show_bug.cgi?id=542473#c14
+#
+# Added same rule to disable USB autosuspend
+# as in /etc/udev/rules.d/55-libsane.rules
+#
 
 ACTION!="add", GOTO="hpmud_rules_end"
-SUBSYSTEM=="ppdev", OWNER="lp", GROUP="lp", MODE="0660"
+-SUBSYSTEM=="ppdev", OWNER="root", GROUP="lp", MODE="0660"
 +SUBSYSTEM=="ppdev", OWNER="root", GROUP="lp", MODE="0664"
 SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="hplip_pid_test"
 SUBSYSTEM!="usb_device", GOTO="hpmud_rules_end"
@ -48,197 +46,222 @@
 LABEL="hplip_pid_test"
 
 # Check for AiO products (0x03f0xx11).
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??11", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="??11", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??11", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="??11", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 
 # Check for Photosmart products without wildcard since cameras and scanners also used (0x03f0xx02). 
 # The xx02 pid has been retired so this explicit list should not change.
 # photosmart_d2300_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c302", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="c302", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c302", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="c302", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_100
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3802", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="3802", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3802", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="3802", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_1115
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3402", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="3402", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3402", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="3402", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_1215
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3202", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="3202", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3202", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="3202", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_1218
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3302", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="3302", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3302", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="3302", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_130
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3902", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="3902", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3902", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="3902", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_1315
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3602", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="3602", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3602", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="3602", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_140_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1002", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="1002", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1002", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="1002", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_230
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3502", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="3502", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3502", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="3502", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_240_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1102", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="1102", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1102", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="1102", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_320_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1202", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="1202", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1202", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="1202", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_330_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1602", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="1602", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1602", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="1602", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_370_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1302", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="1302", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1302", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="1302", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_380_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1702", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="1702", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1702", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="1702", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_420_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1502", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="1502", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1502", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="1502", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_470_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1802", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="1802", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1802", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="1802", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_7150
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3a02", OWNER="lp", GROUP="lp", MODE="660"
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3b02", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="3a02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="3b02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3a02", OWNER="root", GROUP="lp", MODE="660"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3b02", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="3a02", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="3b02", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_7200_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b002", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="b002", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b002", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="b002", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_7345
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2002", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="2002", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2002", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="2002", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_7350 
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3c02", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="3c02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3c02", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="3c02", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_7400_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b802", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="b802", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b802", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="b802", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_7550
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3e02", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="3e02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="3e02", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="3e02", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_7600_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b202", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="b202", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b202", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="b202", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_7700_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b402", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="b402", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b402", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="b402", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_7800_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c002", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="c002", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c002", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="c002", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_7900_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b602", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="b602", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="b602", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="b602", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_8000_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c102", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="c102", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c102", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="c102", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_8100_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="ba02", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="ba02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="ba02", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="ba02", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_8200_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c202", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="c202", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c202", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="c202", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_8400_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="bb02", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="bb02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="bb02", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="bb02", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_8700_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="bc02", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="bc02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="bc02", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="bc02", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_a310_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1d02", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="1d02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1d02", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="1d02", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_a320_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1e02", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="1e02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1e02", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="1e02", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_a430_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1902", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="1902", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1902", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="1902", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_a440_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1f02", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="1f02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1f02", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="1f02", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_a510_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1a02", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="1a02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1a02", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="1a02", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_a520_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2602", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="2602", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2602", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="2602", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_a530_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2b02", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="2b02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2b02", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="2b02", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_a610_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1b02", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="1b02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1b02", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="1b02", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_a620_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2702", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="2702", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2702", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="2702", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_a630_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2c02", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="2c02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2c02", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="2c02", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_a710_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1c02", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="1c02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1c02", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="1c02", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_a820_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2902", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="2902", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="2902", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="2902", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_d5060_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c802", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="c802", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c802", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="c802", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_d5100_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c402", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="c402", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c402", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="c402", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_d6100_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c502", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="c502", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c502", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="c502", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_d7100_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c602", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="c602", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c602", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="c602", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_d7300_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c702", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="c702", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="c702", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="c702", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_pro_b8300_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="be02", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="be02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="be02", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="be02", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_b8800_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="d002", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="d002", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="d002", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="d002", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # photosmart_pro_b9100_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="bd02", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="bd02", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="bd02", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="bd02", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # Photosmart_B8500_series
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="d102", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="d102", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="d102", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="d102", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
+ # Photosmart_A640_series
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="7902", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="7902", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 
 # Check for Business Inkjet products (0x03f0xx12).
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??12", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="??12", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??12", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="??12", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # Check for Deskjet products (0x03f0xx04).
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??04", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="??04", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??04", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="??04", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 # Check for LaserJet products (0x03f0xx17).
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", OWNER="lp", GROUP="lp", MODE="660"
-+ATTR{idVendor}=="03f0", ATTR{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="664", ENV{sane_hpaio}="yes"
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="660"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes"
 
 # 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
 #
 +# Novell/Suse re-enabled it
-+# because it is just how it works with SANE regardless what
-+# the gods of the FHS may think how it should work.
-+# Files in /etc/ are config files which exist there
-+# to be adapted as needed during runtime of the system.
+# because it is how it works with SANE regardless what FHS think how it should work.
+# Files in /etc/ are config files which can be adapted as needed during runtime.
 +# Adapting /etc/sane.d/dll.conf only during package install time is insufficient
 +# because a device may be not connected by the admin during package install time
 +# but later during runtime by the system's end-user (e.g. on a company workstation).
-+# In contrast e.g. files in /usr/ are not to be changed during
-+# runtime of the system (because /usr/ could be mounted read-only).
 +#
 # If sane-bankends is installed add hpaio backend support to dll.conf if needed.
 -# ENV{sane_hpaio}=="yes", RUN+="/bin/sh -c 'grep -q ^#hpaio /etc/sane.d/dll.conf;if [ $$? -eq 0 ];then sed -i -e s/^#hpaio/hpaio/ /etc/sane.d/dll.conf;else grep -q ^hpaio /etc/sane.d/dll.conf;if [ $$? -ne 0 ];then echo hpaio >>/etc/sane.d/dll.conf;fi;fi'"
 +ENV{sane_hpaio}=="yes", RUN+="/bin/sh -c 'grep -q ^#hpaio /etc/sane.d/dll.conf;if [ $$? -eq 0 ];then sed -i -e s/^#hpaio/hpaio/ /etc/sane.d/dll.conf;else grep -q ^hpaio /etc/sane.d/dll.conf;if [ $$? -ne 0 ];then echo hpaio >>/etc/sane.d/dll.conf;fi;fi'"
+
+# The following rule will disable USB autosuspend for the device
+ENV{libsane_matched}=="yes", RUN+="/bin/sh -c 'test -e /sys/$env{DEVPATH}/power/level && echo on > /sys/$env{DEVPATH}/power/level'"
 
 LABEL="hpmud_rules_end"
-+
+--- data/rules/56-hpmud_support.rules.orig	2010-02-25 00:06:35.000000000 +0100
+++ data/rules/56-hpmud_support.rules	2010-04-01 11:58:11.000000000 +0200
+@@ -1,14 +1,14 @@
+ # HPLIP udev rules file. Notify console user if plugin support is required for this device.
+ 
+-ACTION!="add", GOTO="hpmud_rules_end"
+-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="pid_test"
+-SUBSYSTEM!="usb_device", GOTO="hpmud_rules_end"
+ACTION!="add", GOTO="hpmud_support_rules_end"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="hpmud_support_pid_test"
+SUBSYSTEM!="usb_device", GOTO="hpmud_support_rules_end"
+ 
+-LABEL="pid_test"
+LABEL="hpmud_support_pid_test"
+ 
+ # Check for LaserJet products (0x03f0xx17).
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes"
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="??17", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes"
+ 
+ ENV{hp_test}=="yes", RUN+="bin/sh -c '/usr/bin/hp-mkuri -c &'"
+ 
+-LABEL="hpmud_rules_end"
+\ No newline at end of file
+LABEL="hpmud_support_rules_end"
--- a/65
+++ b/65
@ -1,65 +0,0 @@
-#! /bin/bash
-#
-# Johannes Meixner <jsmeix@suse.de>, 2004, 2005, 2006, 2007, 2008
-# Till Kamppeter <till.kamppeter@gmail.com>, 2008
-
-#set -x
-
-export PATH="/sbin:/usr/sbin:/usr/bin:/bin"
-export LC_ALL="POSIX"
-export LANG="POSIX"
-umask 022
-
-MY_NAME=${0##*/}
-
-# Input:
-
-# Create temporary files:
-TMP_DATA=$(mktemp -u /tmp/$MY_NAME.XXXXXX)
-cat /dev/null >$TMP_DATA
-
-# Extract HPLIP USB ID classes (the digits in entries like SYSFS{idProduct}=="??12")
-# and generate all possible HPLIP USB device IDs, see
-# https://bugs.launchpad.net/bugs/195782
-test -n "$1" && RULES_FILE="$1" || RULES_FILE="hpmud.rules"
-test -r $RULES_FILE || { echo "$MY_NAME error: Cannot read file '$RULES_FILE'." 1>&2 ; exit 3 ; }
-for CLASS in $( sed -n -e '/idVendor}=="03f0"/s/.*idProduct}=="??\([0-9A-Za-z]*\)".*/\1/p' $RULES_FILE )
-do for A in 0 1 2 3 4 5 6 7 8 9 a b c d e f
-   do for B in 0 1 2 3 4 5 6 7 8 9 a b c d e f
-      do echo "0x$A$B$CLASS" >>$TMP_DATA
-      done
-   done
-done
-
-# Output:
-
-# Output header:
-echo '<?xml version="1.0" encoding="ISO-8859-1"?>'
-echo '<deviceinfo version="0.2">'
-echo '  <device>'
-
-# Output model specific HP USB device entries:
-exec <$TMP_DATA
-while read PRODUCT
-do echo
-   echo '    <match key="info.subsystem" string="usb">'
-   echo '      <match key="usb.vendor_id" int="0x03f0">'
-   echo -n '        <match key="usb.product_id" int="'
-   echo -n "$PRODUCT"
-   echo '">'
-   echo '          <append key="info.capabilities" type="strlist">scanner</append>'
-   echo '        </match>'
-   echo '      </match>'
-   echo '    </match>'
-done
-
-# Output footer:
-echo
-echo '  </device>'
-echo '</deviceinfo>'
-
-# Remove the temporary file
-rm $TMP_DATA
-
-exit 0
-
--- a/hpcups-ppds-3.9.8-reorder.tar.bz2
+++ b/hpcups-ppds-3.9.8-reorder.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9f79530d4a467b4337854913cabfba510b5dfd26821ef65f76aba7cfda794c17
-size 1574033
--- a/hpcups.drv.in-3.9.8-reorder.patch
+++ b/hpcups.drv.in-3.9.8-reorder.patch
--- a/hplip-3.10.2.tar.bz2
+++ b/hplip-3.10.2.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:510a8d123f89b77d8e43c5714856e54985a4f777b99f9202bdeedf2c2cfd9e27
+size 19593734
--- a/hplip-3.9.8.tar.bz2
+++ b/hplip-3.9.8.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e68f9b8e68393e3bbf93ecb2e441278efda9ba502bdeaa3ecb49a380dd79d164
-size 13956971
--- a/hplip.changes
+++ b/hplip.changes
@ -1,3 +1,50 @@
+-------------------------------------------------------------------
+Wed Sep 15 08:58:09 UTC 2010 - aj@suse.de
+
+- Change BuildRequires for sane-backends devel split.
+
+-------------------------------------------------------------------
+Thu Apr  1 12:40:47 CEST 2010 - jsmeix@suse.de
+
+- Updated to version 3.10.2:
+  The hpcups driver is again updated to better align with
+  the product specifications for various printer models.
+  Several more supported all-in-one devices.
+  Several bug fixies (no Suse bugs).
+  For details see
+  http://hplipopensource.com/hplip-web/release_notes.html
+- Updated to version 3.9.12:
+  The hpcups driver is updated to better align with the
+  product specifications for various printer models.
+  Several more supported printers.
+  Several bug fixies (no Suse bugs).
+  For details see
+  http://hplipopensource.com/hplip-web/release_notes.html
+- Updated to version 3.9.10:
+  The hpcups driver has been re-written. It does no longer do
+  bi-directional IO. Printer specific settings are no longer
+  hard coded, but are controlled by the PPD file.
+  Many more supported printers and all-in-one devices.
+  Several bug fixies (no Suse bugs).
+  For details see
+  http://hplipopensource.com/hplip-web/release_notes.html
+- hpcups.drv.in-3.9.8-reorder.patch and
+  hpcups-ppds-3.9.8-reorder.tar.bz2 are obsolete
+  because it is fixed in the source.
+- create_hal_global_fdi_from_hpmud_rules is obsolete
+  because HAL is no longer used to manage ACLs
+  (see Novell/Suse Bugzilla bnc#542473 comment#13).
+- change-udev-rules.diff fixes now also 56-hpmud_support.rules
+  (see for example Novell/Suse Bugzilla bnc#577035) and
+  it should trigger udev's generic ACL support for SANE
+  via 'ENV{libsane_matched}="yes"' in 55-hpmud.rules
+  (see Novell/Suse Bugzilla bnc#542473 comment#14).
+  Perhaps the latter could be better achieved with the
+  configure option --enable-udev-acl-rules (default=no)
+  which installs 40-hplip.rules instead of 55-hpmud.rules
+  but this was not at all tested up to now and it is
+  likely not backward compatible (e.g. for openSUSE 11.2).
+
 -------------------------------------------------------------------
 Thu Oct 15 15:52:41 CEST 2009 - jsmeix@suse.de

--- a/hplip.spec
+++ b/hplip.spec
@ -1,7 +1,7 @@
 #
-# spec file for package hplip (Version 3.9.8)
+# spec file for package hplip (Version 3.10.2)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -19,32 +19,25 @@


 Name:           hplip
-BuildRequires:  cups cups-devel dbus-1-devel fdupes libdrm-devel libgphoto2-devel libjpeg-devel libqt4-devel libusb-devel net-snmp-devel pkgconfig python-devel python-openssl python-qt4 python-xml readline-devel sane-backends update-desktop-files
+BuildRequires:  cups cups-devel dbus-1-devel fdupes libdrm-devel libgphoto2-devel libjpeg-devel libqt4-devel libusb-devel net-snmp-devel pkgconfig python-devel python-openssl python-qt4 python-xml readline-devel update-desktop-files
+%if 0%{?suse_version} > 1130
+BuildRequires:  sane-backends-devel
+%else
+BuildRequires:  sane-backends
+%endif
 Summary:        HP's Printing, Scanning, and Faxing Software
 # HPLIP has reached 1.0 status. With this release a date encoded revision number is used:
 # x.y.m : x = major release number, y = year (eg: 6 = 2006), m = month (eg: 6a = second release in June)
 # Official releases have a 3 digit number and release candidates have a 4 digit number: x.y.m.rc
-Version:        3.9.8
-Release:        3
+Version:        3.10.2
+Release:        1
 Group:          Hardware/Printing
-License:        BSD 3-clause (or similar) ; GPL v2 or later ; MIT License (or similar)
+License:        BSD3c(or similar) ; GPLv2+ ; MIT License (or similar)
 Url:            http://hplipopensource.com
 # Source0...Source9 is for sources from HP:
-# URL for Source0: http://surfnet.dl.sourceforge.net/sourceforge/hplip/hplip-3.9.8.tar.gz
+# URL for Source0: http://downloads.sourceforge.net/project/hplip/hplip/3.10.2/hplip-3.10.2.tar.gz?use_mirror=freefr
 Source0:        %{name}-%{version}.tar.bz2
-# Source1 hpcups-ppds-3.9.8-reorder.tar.bz2 contains the static PPDs which are fixed
-# according to what hpcups.drv.in-3.9.8-reorder.patch fixes for dynamic PPDs.
-# I got it on 14 Aug 2009 as mail attachment from linus.araque@hp.com:
-Source1:        hpcups-ppds-3.9.8-reorder.tar.bz2
 # Patch0...Patch9 is for patches from HP:
-# URL for Patch0: http://surfnet.dl.sourceforge.net/sourceforge/hplip/hpcups.drv.in-3.9.8-reorder.patch
-# Patch0 hpcups.drv.in-3.9.8-reorder.patch addresses two issues in the 3.9.8 hpcups.drv.in file.
-# 1. Re-orders common paper sizes so that normal, fullbleed and duplex papers sizes are grouped together in the PPD.
-# 2. Changed the LJColor device class from RGBW to RGB color space. The K band was not being printed by hpcups.
-# Because we build it only with the static PPDs, hpcups.drv.in-3.9.8-reorder.patch
-# is actually not needed for us, nevertheless I like to provide this patch
-# to have it in our source RPM to be in full compliance to upstream.
-Patch0:         hpcups.drv.in-3.9.8-reorder.patch
 # Patch10...Patch99 is for Suse patches for the sources from HP:
 # Patch10 fixes "... is used uninitialized ..." warnings:
 Patch10:        fix-uninitialized-variables.diff
@ -58,20 +51,17 @@ Source100:      %{name}.desktop
 Source101:      hp-toolbox.wrapper
 # Source102 is a small man page for /usr/bin/hpijs:
 Source102:      hpijs.1.gz
-# Source103 was the init script for hpssd which is obsolete since version 2.8.4
-# Source104 is a script which outputs a global HAL fdi file
-# for all HP USB devices which belong to HPLIP:
-Source104:      create_hal_global_fdi_from_hpmud_rules
+# Source103 was the init script for hpssd which is obsolete since version 2.8.4.
+# Source104 was a script which outputs a global HAL fdi file which is obsolete
+# since openSUSE 11.2 where HAL is no longer used to manage ACLs,
+# see https://bugzilla.novell.com/show_bug.cgi?id=542473#c13
 # Source105 hplip.SuSEfirewall2 provides support
 # to open UDP ports 5353(mdns) and 427(svrloc) for mDNS support
 # according to the init-suse-firewall in the tar ball
 # (compare also Novell/Suse Bugzilla bnc#498429):
 Source105:      hplip.SuSEfirewall2
 # Patch100... is for special Suse patches:
-# Patch101 changes in the udev rules file the mode from "0666" to "0664"
-# and for parallel port devices the owner from "lp" to "root" to avoid
-# that the permissions can be changed e.g. by any CUPS filter script
-# or CUPS backend (both run as user "lp"):
+# Patch101 changes the udev rules files 55-hpmud.rules and 56-hpmud_support.rules:
 Patch101:       change-udev-rules.diff
 # Install into this non-root directory (required when norootforbuild is used):
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@ -173,7 +163,7 @@ Authors:
    Till Kamppeter

 %package hpijs
-License:        BSD 3-clause (or similar) ; GPL v2 or later ; MIT License (or similar)
+License:        BSD3c(or similar) ; GPLv2+ ; MIT License (or similar)
 Summary:        Only plain printing with HPLIP printer drivers
 Group:          Hardware/Printing
 # Since Nov 14 2007 ghostscript-library does no longer require /usr/bin/hpijs
@ -255,17 +245,11 @@ Authors:
 %prep
 # Be quiet when unpacking:
 %setup -q
-# Unpack the fixed static PPDs in Source1 hpcups-ppds-3.9.8-reorder.tar.bz2
-# which overwrite the original static PPDs in Source0:
-tar -x --overwrite --no-overwrite-dir -j -f %{SOURCE1}
-# Patch0 hpcups.drv.in-3.9.8-reorder.patch
-# addresses two issues in the 3.9.8 hpcups.drv.in file:
-%patch0
 # Patch10 fix-uninitialized-variables.diff
 # fixes "... is used uninitialized ..." warnings:
 %patch10
 # Patch101 change-udev-rules.diff
-# changes in the udev rules file the mode from "0666" to "0664":
+# changes the udev rules files 55-hpmud.rules and 56-hpmud_support.rules:
 %patch101

 %build
@ -312,9 +296,10 @@ export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
            --enable-foomatic-ppd-install \
            --enable-foomatic-rip-hplip-install \
            --with-hpppddir=%{_datadir}/cups/model/manufacturer-PPDs/%{name} \
-            --with-cupsbackenddir=%{_libdir}/cups/backend \
-            --with-cupsfilterdir=%{_libdir}/cups/filter \
-            --with-drvdir=%{_libdir}/cups/driver \
+            --with-cupsbackenddir=/usr/lib/cups/backend \
+            --with-cupsfilterdir=/usr/lib/cups/filter \
+            --with-drvdir=/usr/lib/cups/driver \
+            --with-mimedir=%{_sysconfdir}/cups \
            --with-docdir=%{_defaultdocdir}/%{name}
 make

@ -323,7 +308,9 @@ make install DESTDIR=%{buildroot}
 # Remove the installed /etc/sane.d/dll.conf
 # because this is provided by the sane-backends package:
 rm %{buildroot}%{_sysconfdir}/sane.d/dll.conf
-# Make some general tests and adjustments for all PPDs (see manufacturer-PPDs.spec):
+# Remove the installed HAL fdi file because HAL is no longer used (HAL is deprecated):
+rm %{buildroot}%{_datadir}/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
+# Begin "General tests and adjustments for all PPDs" (see manufacturer-PPDs.spec):
 pushd %{buildroot}%{_datadir}/cups/model/manufacturer-PPDs/%{name}
 gunzip *.ppd.gz
 # Add a line-feed to the end of all PPDs to fix those PPDs where it is missing.
@ -385,13 +372,8 @@ do egrep -v '^\*UIConstraints:|^\*NonUIConstraints:' $p | cupstestppd - || true
   gzip $p
 done
 popd
-# End of the general tests and adjustments for all PPDs.
-# Run the script which outputs a global HAL fdi file for all HP USB devices which belong to HPLIP
-# and install its output as /usr/share/hal/fdi/information/20thirdparty/70-hpmud.fdi
-bash %{SOURCE104} data/rules/55-hpmud.rules >70-hpmud.fdi
-install -d %{buildroot}%{_datadir}/hal/fdi/information/20thirdparty
-install -m644 70-hpmud.fdi %{buildroot}%{_datadir}/hal/fdi/information/20thirdparty/70-hpmud.fdi
-# Desktop menue entry stuff:
+# End of "General tests and adjustments for all PPDs".
+# Begin "Desktop menue entry stuff":
 # Install the wrapper for hp-toolbox:
 install -m 755 %{SOURCE101} %{buildroot}%{_bindir}/hp-toolbox.wrapper
 # Install /usr/share/hplip/data/images/64x64/hp_logo.png as desktop icon file
@ -406,6 +388,7 @@ rm %{buildroot}%{_datadir}/applications/%{name}*.desktop
 # Let suse_update_desktop_file add X-SuSE-translate key to /etc/xdg/autostart/hplip-systray.desktop
 # so that we can update its translations with translation-only packages.
 %suse_update_desktop_file %{buildroot}/etc/xdg/autostart/hplip-systray.desktop
+# End of "Desktop menue entry stuff".
 # Install the man page for /usr/bin/hpijs:
 install -d %{buildroot}%{_mandir}/man1
 install -m 644 %{SOURCE102} %{buildroot}%{_mandir}/man1/
@ -482,14 +465,6 @@ exit 0
 %dir %{_sysconfdir}/udev/rules.d
 %config %{_sysconfdir}/udev/rules.d/55-hpmud.rules
 %config %{_sysconfdir}/udev/rules.d/56-hpmud_support.rules
-%dir %{_datadir}/hal
-%dir %{_datadir}/hal/fdi
-%dir %{_datadir}/hal/fdi/information
-%dir %{_datadir}/hal/fdi/information/20thirdparty
-%{_datadir}/hal/fdi/information/20thirdparty/70-hpmud.fdi
-%dir %{_datadir}/hal/fdi/preprobe
-%dir %{_datadir}/hal/fdi/preprobe/10osvendor
-%{_datadir}/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
 %{_bindir}/hp-align
 %{_bindir}/hp-check
 %{_bindir}/hp-clean
@ -526,11 +501,11 @@ exit 0
 %{_libdir}/python%{py_ver}/site-packages/scanext.*
 %dir %{_libdir}/sane
 %{_libdir}/sane/libsane-hpaio.*
-%dir %{_libdir}/cups
-%dir %{_libdir}/cups/backend
-%{_libdir}/cups/backend/hpfax
-%dir %{_libdir}/cups/filter
-%{_libdir}/cups/filter/hpcupsfax
+%dir /usr/lib/cups
+%dir /usr/lib/cups/backend
+/usr/lib/cups/backend/hpfax
+%dir /usr/lib/cups/filter
+/usr/lib/cups/filter/hpcupsfax
 %dir /var/lib/hp
 /var/lib/hp/hplip.state
 %doc %{_defaultdocdir}/%{name}/
@ -543,18 +518,21 @@ exit 0
 %files hpijs
 %defattr(-, root, root)
 %config %{_sysconfdir}/hp/
+%config %{_sysconfdir}/cups/pstotiff.convs
+%config %{_sysconfdir}/cups/pstotiff.types
 %{_bindir}/hpijs
 %doc %{_mandir}/man1/hpijs.1.gz
 %{_libdir}/libhpip.*
 %{_libdir}/libhpmud.*
-%dir %{_libdir}/cups
-%dir %{_libdir}/cups/backend
-%{_libdir}/cups/backend/hp
-%dir %{_libdir}/cups/filter
-%{_libdir}/cups/filter/foomatic-rip-hplip
-%{_libdir}/cups/filter/hpcac
-%{_libdir}/cups/filter/hpcups
-%{_libdir}/cups/filter/hplipjs
+%dir /usr/lib/cups
+%dir /usr/lib/cups/backend
+/usr/lib/cups/backend/hp
+%dir /usr/lib/cups/filter
+/usr/lib/cups/filter/foomatic-rip-hplip
+/usr/lib/cups/filter/hpcac
+/usr/lib/cups/filter/hpcups
+/usr/lib/cups/filter/hplipjs
+/usr/lib/cups/filter/pstotiff
 %dir %{_datadir}/cups
 %dir %{_datadir}/cups/model
 %dir %{_datadir}/cups/model/manufacturer-PPDs