From 0f30079c273f9fed7c53a7c07d5c562b9cabaaf7afbee5b6c68655e5657eeb4d Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 10 Dec 2010 15:25:54 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/sane-backends revision 51.0 OBS-URL: https://build.opensuse.org/package/show/graphics/sane-backends?expand=0&rev=93e25e8ff280c6875640495c4df61c6f --- sane-backends.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sane-backends.spec b/sane-backends.spec index b82a935..5c2cdf0 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -31,7 +31,7 @@ Group: Hardware/Scanner AutoReqProv: on Summary: SANE (Scanner Access Now Easy) Scanner Drivers Version: 1.0.21 -Release: 7 +Release: 8 Url: http://www.sane-project.org/ # URL for Source0: https://alioth.debian.org/frs/download.php/3258/sane-backends-1.0.21.tar.gz # MD5 sum for upstream sane-backends-1.0.21.tar.gz (not our .bz2): be586a23633949cf2ecf0c9c6d769130 From 707516eeb1a6fb34d3cadb9acfbb4e63eb055aed2e4c612e75341319be9b4a65 Mon Sep 17 00:00:00 2001 From: Johannes Meixner Date: Wed, 16 Feb 2011 16:18:17 +0000 Subject: [PATCH 2/2] Accepting request 61500 from home:jsmeix:branches:graphics sane-backends 1.0.22 late version upgrade for openSUSE 11.4 (bnc#672059) OBS-URL: https://build.opensuse.org/request/show/61500 OBS-URL: https://build.opensuse.org/package/show/graphics/sane-backends?expand=0&rev=35 --- canon-backend-autoprobing.patch | 17 - epkowa.desc | 47 +- fix-genesys-create_range-type.patch | 11 - fix-xerox_mfp-color-mode.patch | 10 - models.dat | 1894 +++++++++++++++++++++++---- sane-backends-1.0.21-i18n.patch | 129 -- sane-backends-1.0.21.tar.bz2 | 3 - sane-backends-1.0.22.tar.bz2 | 3 + sane-backends.changes | 35 + sane-backends.spec | 43 +- 10 files changed, 1757 insertions(+), 435 deletions(-) delete mode 100644 canon-backend-autoprobing.patch delete mode 100644 fix-genesys-create_range-type.patch delete mode 100644 fix-xerox_mfp-color-mode.patch delete mode 100644 sane-backends-1.0.21-i18n.patch delete mode 100644 sane-backends-1.0.21.tar.bz2 create mode 100644 sane-backends-1.0.22.tar.bz2 diff --git a/canon-backend-autoprobing.patch b/canon-backend-autoprobing.patch deleted file mode 100644 index a2a186b..0000000 --- a/canon-backend-autoprobing.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- backend/canon.conf.in.save 2006-07-21 09:43:08.000000000 +0200 -+++ backend/canon.conf.in 2006-07-21 09:57:03.000000000 +0200 -@@ -1,3 +1,12 @@ --#canon.conf --/dev/scanner -+# canon.conf -+# -+# Activate exactly one of the following choices: -+# -+# Probe on all /dev/sg* devices: -+scsi -+# -+# Probe for "CANON" on all /dev/sg* devices: -+#scsi CANON -+# -+# Probe only on one fixed device: - #/dev/sg0 diff --git a/epkowa.desc b/epkowa.desc index 716d2f6..4f62d6f 100644 --- a/epkowa.desc +++ b/epkowa.desc @@ -212,6 +212,13 @@ :status :good :comment "100Base-TX/10Base-T unsupported
IEEE1394 untested" +:model "ES-D200" +:interface "USB" +:usbid "0x04b8" "0x0137" +:status :good +:comment "requires DFSG non-free esci-interpreter-gt-s80" +:url "http://www.avasys.jp/lx-bin2/linux/scan/DL1.do" + :model "ES-D400" :interface "USB" :usbid "0x04b8" "0x0136" @@ -572,6 +579,13 @@ :comment "requires DFSG non-free esci-interpreter-gt-f720
GT-S620 with TPU" :url "http://www.avasys.jp/lx-bin2/linux/scan/DL1.do" +:model "GT-F730" +:interface "USB" +:usbid "0x04b8" "0x0142" +:status :good +:comment "requires DFSG non-free esci-interpreter-perfection-v330
GT-S630 with TPU" +:url "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do" + :model "GT-S50" :interface "USB" :usbid "0x04b8" "0x0137" @@ -600,6 +614,13 @@ :comment "requires DFSG non-free esci-interpreter-gt-f720" :url "http://www.avasys.jp/lx-bin2/linux/scan/DL1.do" +:model "GT-S630" +:interface "USB" +:usbid "0x04b8" "0x0142" +:status :good +:comment "requires DFSG non-free esci-interpreter-perfection-v330" +:url "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do" + :model "GT-X700" ; product spec (JP) :interface "USB" :usbid "0x04b8" "0x0128" @@ -1058,42 +1079,56 @@ :comment "requires DFSG non-free esci-interpreter-gt-f720
overseas version of the GT-S620" :url "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do" -:model "Perfection V100 PHOTO" +:model "Perfection V33" +:interface "USB" +:usbid "0x04b8" "0x0142" +:status :good +:comment "requires DFSG non-free esci-interpreter-perfection-v330
overseas version of the GT-S630" +:url "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do" + +:model "Perfection V100 Photo" :interface "USB" :usbid "0x04b8" "0x012d" :status :good :comment "requires DFSG non-free iscan-plugin-gt-s600
overseas version of the GT-F650" :url "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do" -:model "Perfection V200 PHOTO" +:model "Perfection V200 Photo" :interface "USB" :usbid "0x04b8" "0x012e" :status :good :comment "requires DFSG non-free iscan-plugin-gt-f670
overseas version of the GT-F670" :url "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do" -:model "Perfection V300 PHOTO" +:model "Perfection V300 Photo" :interface "USB" :usbid "0x04b8" "0x0131" :status :good :comment "requires DFSG non-free esci-interpreter-gt-f720
overseas version of the GT-F720" :url "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do" -:model "Perfection V350 PHOTO" +:model "Perfection V330 Photo" +:interface "USB" +:usbid "0x04b8" "0x0142" +:status :good +:comment "requires DFSG non-free esci-interpreter-perfection-v330
overseas version of the GT-F730" +:url "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do" + +:model "Perfection V350 Photo" :interface "USB" :usbid "0x04b8" "0x012f" :status :good :comment "requires DFSG non-free iscan-plugin-gt-f700
overseas version of the GT-F700" :url "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do" -:model "Perfection V500 PHOTO" +:model "Perfection V500 Photo" :interface "USB" :usbid "0x04b8" "0x0130" :status :good :comment "requires DFSG non-free iscan-plugin-gt-x770
overseas version of the GT-X770" :url "http://www.avasys.jp/lx-bin2/linux_e/scan/DL1.do" -:model "Perfection V600 PHOTO" +:model "Perfection V600 Photo" :interface "USB" :usbid "0x04b8" "0x013a" :status :good diff --git a/fix-genesys-create_range-type.patch b/fix-genesys-create_range-type.patch deleted file mode 100644 index 842245c..0000000 --- a/fix-genesys-create_range-type.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- backend/genesys.c.orig 2010-04-05 15:18:04.000000000 +0200 -+++ backend/genesys.c 2010-05-07 13:06:07.000000000 +0200 -@@ -5436,7 +5436,7 @@ init_gamma_vector_option (Genesys_Scanne - * @param size maximum size of the range - * @return a poiter to a valid range or NULL - */ --static create_range(SANE_Fixed size) -+static SANE_Range *create_range(SANE_Fixed size) - { - SANE_Range *range=NULL; - diff --git a/fix-xerox_mfp-color-mode.patch b/fix-xerox_mfp-color-mode.patch deleted file mode 100644 index 39d003e..0000000 --- a/fix-xerox_mfp-color-mode.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- backend/xerox_mfp.c.orig 2010-04-05 15:18:05.000000000 +0200 -+++ backend/xerox_mfp.c 2010-12-09 11:13:16.000000000 +0100 -@@ -386,6 +386,7 @@ static int doc_source_to_code[] = { - - static SANE_String_Const scan_modes[] = { - SANE_VALUE_SCAN_MODE_LINEART, -+ SANE_VALUE_SCAN_MODE_HALFTONE, - SANE_VALUE_SCAN_MODE_GRAY, - SANE_VALUE_SCAN_MODE_COLOR, - NULL diff --git a/models.dat b/models.dat index 4fc53c3..0c4122d 100644 --- a/models.dat +++ b/models.dat @@ -20,7 +20,7 @@ # This file automatically generated by the HPLIP model editor (model_editor.py). # Please do NOT hand edit this file. # -# Last written on Wed, 08 Sep 2010 10:54:50 by sanjay. +# Last written on Wed, 19 Jan 2011 10:39:34 by yatheesh. # Model editor version 10.2 (Qt4). @@ -2533,8 +2533,48 @@ usb-pid=411 usb-vid=3f0 wifi-config=0 +[hp_designjet_100] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=0 +fw-download=False +icon=default_designjet.png +io-mfp-mode=0 +io-mode=0 +io-support=0 +job-storage=0 +linefeed-cal-type=0 +model1=HP Designjet 100 Printer +model2=HP Designjet 100 Plus Printer +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +r-type=0 +scan-style=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=0 +support-released=True +support-subtype=219b2b +support-type=0 +support-ver=0.0.0 +tech-class=Undefined +tech-subclass=Normal +tech-type=2 +usb-pid=0 +usb-vid=3f0 +wifi-config=0 + [envy_100_d410_series] -align-type=1 +align-type=15 clean-type=3 color-cal-type=0 copy-type=0 @@ -2608,46 +2648,6 @@ usb-pid=9911 usb-vid=3f0 wifi-config=1 -[hp_designjet_100] -align-type=0 -clean-type=0 -color-cal-type=0 -copy-type=0 -embedded-server-type=0 -fax-type=0 -fw-download=False -icon=default_designjet.png -io-mfp-mode=0 -io-mode=0 -io-support=0 -job-storage=0 -linefeed-cal-type=0 -model1=HP Designjet 100 Printer -model2=HP Designjet 100 Plus Printer -monitor-type=0 -panel-check-type=0 -pcard-type=0 -plugin=0 -plugin-reason=0 -power-settings=0 -pq-diag-type=0 -r-type=0 -scan-style=0 -scan-type=0 -status-battery-check=0 -status-dynamic-counters=0 -status-type=0 -support-released=True -support-subtype=219b2b -support-type=0 -support-ver=0.0.0 -tech-class=Undefined -tech-subclass=Normal -tech-type=2 -usb-pid=0 -usb-vid=3f0 -wifi-config=0 - [photosmart_100] align-type=1 clean-type=1 @@ -3721,7 +3721,7 @@ embedded-server-type=1 fax-type=0 fw-download=False icon=Photosmart_C5100.png -io-mfp-mode=1 +io-mfp-mode=3 io-mode=1 io-support=10 job-storage=0 @@ -4448,7 +4448,7 @@ r8-agent5-kind=2 r8-agent5-sku=862/862XL r8-agent5-type=19 scan-style=1 -scan-type=1 +scan-type=6 status-battery-check=0 status-dynamic-counters=2 status-type=2 @@ -7038,6 +7038,81 @@ usb-pid=1a02 usb-vid=3f0 wifi-config=0 +[photosmart_ink_adv_k510] +align-type=1 +clean-type=3 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=default_photosmart.png +io-mfp-mode=3 +io-mode=1 +io-support=10 +job-storage=0 +linefeed-cal-type=0 +model1=HP Photosmart Ink Adv K510 +monitor-type=0 +panel-check-type=1 +pcard-type=2 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +r-type=1 +r0-agent1-kind=3 +r0-agent1-sku=60/60XL +r0-agent1-type=1 +r0-agent2-kind=3 +r0-agent2-sku=60/60XL +r0-agent2-type=2 +r10-agent1-kind=3 +r10-agent1-sku=818/818XL/818L +r10-agent1-type=1 +r10-agent2-kind=3 +r10-agent2-sku=818/818XL/818L +r10-agent2-type=2 +r18-agent2-kind=3 +r18-agent2-sku=93/95 +r18-agent2-type=2 +r18-agent3-kind=3 +r18-agent3-sku=99 +r18-agent3-type=3 +r2-agent1-kind=3 +r2-agent1-sku=60/60XL/60L +r2-agent1-type=1 +r2-agent2-kind=3 +r2-agent2-sku=60/60XL/60L +r2-agent2-type=2 +r4-agent1-kind=3 +r4-agent1-sku=300/300XL +r4-agent1-type=1 +r4-agent2-kind=3 +r4-agent2-sku=300/300XL +r4-agent2-type=2 +r8-agent1-kind=3 +r8-agent1-sku=121/121XL +r8-agent1-type=1 +r8-agent2-kind=3 +r8-agent2-sku=121/121XL +r8-agent2-type=2 +scan-style=1 +scan-type=1 +status-battery-check=0 +status-dynamic-counters=1 +status-type=2 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=ViperPlusVIP +tech-subclass=Normal +tech-type=2 +usb-pid=9e11 +usb-vid=3f0 +wifi-config=1 + [photosmart_estn_c510_series] align-type=1 clean-type=3 @@ -12869,7 +12944,7 @@ usb-vid=3f0 wifi-config=0 [deskjet_1000_j110_series] -align-type=13 +align-type=16 clean-type=1 color-cal-type=0 copy-type=0 @@ -12931,7 +13006,7 @@ scan-style=0 scan-type=0 status-battery-check=0 status-dynamic-counters=1 -status-type=2 +status-type=10 support-released=True support-subtype=219b2b support-type=2 @@ -13611,6 +13686,108 @@ usb-pid=2b17 usb-vid=3f0 wifi-config=0 +[hp_laserjet_cp1021] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_color_laserjet_cp2025.png +io-mfp-mode=3 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet CP1021 +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=1 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE310A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE311A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE313A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CE312A +r0-agent4-type=6 +scan-style=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJZjsColor +tech-subclass=Advanced +tech-type=4 +usb-pid=b2a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_cp1022] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_color_laserjet_cp2025.png +io-mfp-mode=3 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet CP1022 +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=1 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE310A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE311A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE313A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CE312A +r0-agent4-type=6 +scan-style=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJZjsColor +tech-subclass=Advanced +tech-type=4 +usb-pid=b2a +usb-vid=3f0 +wifi-config=0 + [hp_laserjet_1022nw] align-type=0 clean-type=0 @@ -13738,8 +13915,314 @@ usb-pid=2c17 usb-vid=3f0 wifi-config=0 +[hp_laserjet_cp1023] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_color_laserjet_cp2025.png +io-mfp-mode=3 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet CP1023 +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=1 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE310A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE311A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE313A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CE312A +r0-agent4-type=6 +scan-style=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJZjsColor +tech-subclass=Advanced +tech-type=4 +usb-pid=b2a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_cp1025nw] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_color_laserjet_cp2025.png +io-mfp-mode=3 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet CP1025nw +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=1 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE310A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE311A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE313A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CE312A +r0-agent4-type=6 +scan-style=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJZjsColor +tech-subclass=Advanced +tech-type=4 +usb-pid=b2a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_cp1025] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_color_laserjet_cp2025.png +io-mfp-mode=3 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet CP1025 +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=1 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE310A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE311A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE313A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CE312A +r0-agent4-type=6 +scan-style=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJZjsColor +tech-subclass=Advanced +tech-type=4 +usb-pid=b2a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_cp1026nw] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_color_laserjet_cp2025.png +io-mfp-mode=3 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet CP1026nw +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=1 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE310A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE311A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE313A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CE312A +r0-agent4-type=6 +scan-style=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJZjsColor +tech-subclass=Advanced +tech-type=4 +usb-pid=b2a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_cp1027nw] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_color_laserjet_cp2025.png +io-mfp-mode=3 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet CP1027nw +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=1 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE310A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE311A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE313A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CE312A +r0-agent4-type=6 +scan-style=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJZjsColor +tech-subclass=Advanced +tech-type=4 +usb-pid=b2a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_cp1028nw] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=hp_color_laserjet_cp2025.png +io-mfp-mode=3 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet CP1028nw +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=1 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE310A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE311A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE313A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CE312A +r0-agent4-type=6 +scan-style=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJZjsColor +tech-subclass=Advanced +tech-type=4 +usb-pid=b2a +usb-vid=3f0 +wifi-config=0 + [deskjet_1050_j410_series] -align-type=13 +align-type=-1 clean-type=1 color-cal-type=0 copy-type=0 @@ -13747,7 +14230,7 @@ embedded-server-type=0 fax-type=0 fw-download=False icon=hp_deskjet_f4200.png -io-mfp-mode=3 +io-mfp-mode=1 io-mode=1 io-support=2 job-storage=0 @@ -13798,7 +14281,7 @@ r8-agent2-kind=3 r8-agent2-sku=121/121XL r8-agent2-type=2 scan-style=1 -scan-type=-1 +scan-type=7 status-battery-check=0 status-dynamic-counters=1 status-type=2 @@ -14799,10 +15282,9 @@ r-type=0 r0-agent1-kind=4 r0-agent1-sku=Q2612A r0-agent1-type=1 -scan-color=1 scan-src=2 scan-style=1 -scan-type=4 +scan-type=8 status-battery-check=0 status-dynamic-counters=0 status-type=8 @@ -14841,12 +15323,11 @@ power-settings=0 pq-diag-type=0 r-type=0 r0-agent1-kind=4 -r0-agent1-sku=Q2612A +r0-agent1-sku=CE285A r0-agent1-type=1 -scan-color=1 scan-src=2 scan-style=1 -scan-type=4 +scan-type=8 status-battery-check=0 status-dynamic-counters=0 status-type=8 @@ -15212,7 +15693,7 @@ scan-style=0 scan-type=0 status-battery-check=0 status-dynamic-counters=0 -status-type=0 +status-type=1 support-released=True support-subtype=219b2b support-type=2 @@ -15464,12 +15945,11 @@ power-settings=0 pq-diag-type=0 r-type=0 r0-agent1-kind=4 -r0-agent1-sku=Q2612A +r0-agent1-sku=CE285A r0-agent1-type=1 -scan-color=1 scan-src=3 scan-style=1 -scan-type=4 +scan-type=8 status-battery-check=0 status-dynamic-counters=0 status-type=8 @@ -15484,6 +15964,49 @@ usb-pid=52a usb-vid=3f0 wifi-config=0 +[hp_laserjet_professional_m1213nf_mfp] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=5 +fw-download=False +icon=hp_laserjet_3050.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Professional M1213nf Multifunction Printer +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=65 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE285A +r0-agent1-type=1 +scan-src=3 +scan-style=1 +scan-type=8 +status-battery-check=0 +status-dynamic-counters=0 +status-type=8 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJZjsMono +tech-subclass=NoAutoDuplex +tech-type=3 +usb-pid=52a +usb-vid=3f0 +wifi-config=0 + [hp_color_laserjet_cp1215] align-type=0 clean-type=0 @@ -15607,10 +16130,9 @@ r-type=0 r0-agent1-kind=4 r0-agent1-sku=Q2612A r0-agent1-type=1 -scan-color=1 scan-src=3 scan-style=1 -scan-type=4 +scan-type=8 status-battery-check=0 status-dynamic-counters=0 status-type=8 @@ -16267,16 +16789,16 @@ power-settings=0 pq-diag-type=0 r-type=0 r0-agent1-kind=4 -r0-agent1-sku=Q6000A +r0-agent1-sku=CB540A r0-agent1-type=1 r0-agent2-kind=4 -r0-agent2-sku=Q6001A +r0-agent2-sku=CB541A r0-agent2-type=4 r0-agent3-kind=4 -r0-agent3-sku=Q6002A +r0-agent3-sku=CB542A r0-agent3-type=6 r0-agent4-kind=4 -r0-agent4-sku=Q6003A +r0-agent4-sku=CB543A r0-agent4-type=5 scan-style=1 scan-type=5 @@ -16318,16 +16840,16 @@ power-settings=0 pq-diag-type=0 r-type=0 r0-agent1-kind=4 -r0-agent1-sku=Q6000A +r0-agent1-sku=CB540A r0-agent1-type=1 r0-agent2-kind=4 -r0-agent2-sku=Q6001A +r0-agent2-sku=CB541A r0-agent2-type=4 r0-agent3-kind=4 -r0-agent3-sku=Q6002A +r0-agent3-sku=CB542A r0-agent3-type=6 r0-agent4-kind=4 -r0-agent4-sku=Q6003A +r0-agent4-sku=CB543A r0-agent4-type=5 scan-style=1 scan-type=5 @@ -16862,6 +17384,414 @@ usb-pid=4d11 usb-vid=3f0 wifi-config=0 +[hp_laserjet_cm1411fn] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=7 +fw-download=False +icon=hp_color_laserjet_cm1312_mfp.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Professional CM1411fn +monitor-type=0 +panel-check-type=1 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE320A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE321A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE322A +r0-agent3-type=6 +r0-agent4-kind=4 +r0-agent4-sku=CE323A +r0-agent4-type=5 +scan-style=1 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJColor,Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=72a +usb-vid=3f0 +wifi-config=1 + +[hp_laserjet_cm1412fn] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=7 +fw-download=False +icon=hp_color_laserjet_cm1312_mfp.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Professional CM1412fn +monitor-type=0 +panel-check-type=1 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE320A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE321A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE322A +r0-agent3-type=6 +r0-agent4-kind=4 +r0-agent4-sku=CE323A +r0-agent4-type=5 +scan-style=1 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJColor,Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=72a +usb-vid=3f0 +wifi-config=1 + +[hp_laserjet_cm1413fn] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=7 +fw-download=False +icon=hp_color_laserjet_cm1312_mfp.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Professional CM1413fn +monitor-type=0 +panel-check-type=1 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE320A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE321A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE322A +r0-agent3-type=6 +r0-agent4-kind=4 +r0-agent4-sku=CE323A +r0-agent4-type=5 +scan-style=1 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJColor,Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=72a +usb-vid=3f0 +wifi-config=1 + +[hp_laserjet_cm1415fnw] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=7 +fw-download=False +icon=hp_color_laserjet_cm1312_mfp.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Professional CM1415fnw +monitor-type=0 +panel-check-type=1 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE320A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE321A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE322A +r0-agent3-type=6 +r0-agent4-kind=4 +r0-agent4-sku=CE323A +r0-agent4-type=5 +scan-style=1 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJColor,Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=72a +usb-vid=3f0 +wifi-config=1 + +[hp_laserjet_cm1415fn] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=7 +fw-download=False +icon=hp_color_laserjet_cm1312_mfp.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Professional CM1415fn +monitor-type=0 +panel-check-type=1 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE320A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE321A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE322A +r0-agent3-type=6 +r0-agent4-kind=4 +r0-agent4-sku=CE323A +r0-agent4-type=5 +scan-style=1 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJColor,Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=72a +usb-vid=3f0 +wifi-config=1 + +[hp_laserjet_cm1416fnw] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=7 +fw-download=False +icon=hp_color_laserjet_cm1312_mfp.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Professional CM1416fnw +monitor-type=0 +panel-check-type=1 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE320A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE321A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE322A +r0-agent3-type=6 +r0-agent4-kind=4 +r0-agent4-sku=CE323A +r0-agent4-type=5 +scan-style=1 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJColor,Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=72a +usb-vid=3f0 +wifi-config=1 + +[hp_laserjet_cm1417fnw] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=7 +fw-download=False +icon=hp_color_laserjet_cm1312_mfp.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Professional CM1417fnw +monitor-type=0 +panel-check-type=1 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE320A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE321A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE322A +r0-agent3-type=6 +r0-agent4-kind=4 +r0-agent4-sku=CE323A +r0-agent4-type=5 +scan-style=1 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJColor,Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=72a +usb-vid=3f0 +wifi-config=1 + +[hp_laserjet_cm1418fnw] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=7 +fw-download=False +icon=hp_color_laserjet_cm1312_mfp.png +io-mfp-mode=1 +io-mode=1 +io-support=14 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet Professional CM1418fnw +monitor-type=0 +panel-check-type=1 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE320A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE321A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE322A +r0-agent3-type=6 +r0-agent4-kind=4 +r0-agent4-sku=CE323A +r0-agent4-type=5 +scan-style=1 +scan-type=5 +status-battery-check=0 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJColor,Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=72a +usb-vid=3f0 +wifi-config=1 + [hp_color_laserjet_1500] align-type=0 clean-type=1 @@ -17483,71 +18413,13 @@ usb-pid=5017 usb-vid=3f0 wifi-config=0 -[hp_laserjet_cp1525n] -align-type=0 -clean-type=0 -color-cal-type=0 -copy-type=0 -embedded-server-type=1 -fax-type=0 -fw-download=False -icon=hp_color_laserjet_cp2025.png -io-mfp-mode=1 -io-mode=1 -io-support=6 -job-storage=0 -linefeed-cal-type=0 -model1=HP Laserjet Profesional CP1525N -model2=HP Laserjet Profesional CP1521n -model3=HP Laserjet Profesional CP1522n -model4=HP Laserjet Profesional CP1523n -model5=HP Laserjet Profesional CP1525nw -model6=HP Laserjet Profesional CP1526nw -model7=HP Laserjet Profesional CP1527nw -model8=HP Laserjet Profesional CP1528nw -monitor-type=0 -panel-check-type=1 -pcard-type=2 -plugin=0 -plugin-reason=0 -power-settings=0 -pq-diag-type=0 -r-type=0 -r0-agent1-kind=4 -r0-agent1-sku=CB540A -r0-agent1-type=1 -r0-agent2-kind=4 -r0-agent2-sku=CB541A -r0-agent2-type=4 -r0-agent3-kind=4 -r0-agent3-sku=CB542A -r0-agent3-type=5 -r0-agent4-kind=4 -r0-agent4-sku=CB543A -r0-agent4-type=6 -scan-style=0 -scan-type=0 -status-battery-check=0 -status-dynamic-counters=0 -status-type=10 -support-released=True -support-subtype=219b2b -support-type=2 -support-ver=3.10.9 -tech-class=Postscript -tech-subclass=Normal -tech-type=4 -usb-pid=22a -usb-vid=3f0 -wifi-config=0 - [hp_laserjet_m1522nf_mfp] align-type=0 clean-type=0 color-cal-type=0 copy-type=0 embedded-server-type=1 -fax-type=4 +fax-type=0 fw-download=False icon=HP_LaserJet_m1522.png io-mfp-mode=1 @@ -17667,6 +18539,186 @@ usb-pid=0 usb-vid=3f0 wifi-config=0 +[hp_laserjet_m1536dnf_mfp] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=7 +fw-download=False +icon=HP_LaserJet_m1522.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet M1536dnf MFP +model2=HP LaserJet M1537dnf MFP +model3=HP LaserJet M1538dnf MFP +model4=HP LaserJet M1539dnf MFP +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE278A +r0-agent1-type=1 +scan-style=1 +scan-type=5 +status-battery-check=2 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=-4fc8 +support-type=2 +support-ver=3.11.1 +tech-class=LJMono,Postscript +tech-subclass=Normal +tech-type=3 +usb-pid=12a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_m1537dnf_mfp] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=7 +fw-download=False +icon=HP_LaserJet_m1522.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet M1536dnf MFP +model2=HP LaserJet M1537dnf MFP +model3=HP LaserJet M1538dnf MFP +model4=HP LaserJet M1539dnf MFP +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE278A +r0-agent1-type=1 +scan-style=1 +scan-type=5 +status-battery-check=2 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=-4fc8 +support-type=2 +support-ver=3.11.1 +tech-class=LJMono,Postscript +tech-subclass=Normal +tech-type=3 +usb-pid=12a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_m1538dnf_mfp] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=7 +fw-download=False +icon=HP_LaserJet_m1522.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet M1536dnf MFP +model2=HP LaserJet M1537dnf MFP +model3=HP LaserJet M1538dnf MFP +model4=HP LaserJet M1539dnf MFP +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE278A +r0-agent1-type=1 +scan-style=1 +scan-type=5 +status-battery-check=2 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=-4fc8 +support-type=2 +support-ver=3.11.1 +tech-class=LJMono,Postscript +tech-subclass=Normal +tech-type=3 +usb-pid=12a +usb-vid=3f0 +wifi-config=0 + +[hp_laserjet_m1539dnf_mfp] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=7 +fw-download=False +icon=HP_LaserJet_m1522.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP LaserJet M1536dnf MFP +model2=HP LaserJet M1537dnf MFP +model3=HP LaserJet M1538dnf MFP +model4=HP LaserJet M1539dnf MFP +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=1 +plugin-reason=64 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE278A +r0-agent1-type=1 +scan-style=1 +scan-type=5 +status-battery-check=2 +status-dynamic-counters=0 +status-type=10 +support-released=True +support-subtype=-4fc8 +support-type=2 +support-ver=3.11.1 +tech-class=LJMono,Postscript +tech-subclass=Normal +tech-type=3 +usb-pid=12a +usb-vid=3f0 +wifi-config=0 + [hp_laserjet_professional_p1566] align-type=0 clean-type=0 @@ -18345,7 +19397,7 @@ usb-vid=3f0 wifi-config=0 [deskjet_2000_j210_series] -align-type=13 +align-type=16 clean-type=1 color-cal-type=0 copy-type=0 @@ -18407,7 +19459,7 @@ scan-style=0 scan-type=0 status-battery-check=0 status-dynamic-counters=1 -status-type=2 +status-type=10 support-released=True support-subtype=219b2b support-type=2 @@ -18485,6 +19537,81 @@ usb-pid=0 usb-vid=3f0 wifi-config=0 +[deskjet_ink_adv_2010_k010] +align-type=16 +clean-type=1 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=0 +fw-download=False +icon=default_deskjet.png +io-mfp-mode=3 +io-mode=1 +io-support=2 +job-storage=0 +linefeed-cal-type=0 +model1=HP Deskjet Ink Adv 2010 K010 +monitor-type=0 +panel-check-type=1 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +r-type=1 +r0-agent1-kind=3 +r0-agent1-sku=61/61XL/61b +r0-agent1-type=1 +r0-agent2-kind=3 +r0-agent2-sku=61/61XL +r0-agent2-type=2 +r10-agent1-kind=3 +r10-agent1-sku=802/802XL/802b +r10-agent1-type=1 +r10-agent2-kind=3 +r10-agent2-sku=802/802XL +r10-agent2-type=2 +r18-agent2-kind=3 +r18-agent2-sku=93/95 +r18-agent2-type=2 +r18-agent3-kind=3 +r18-agent3-sku=99 +r18-agent3-type=3 +r2-agent1-kind=3 +r2-agent1-sku=61/61XL/61b +r2-agent1-type=1 +r2-agent2-kind=3 +r2-agent2-sku=61/61XL +r2-agent2-type=2 +r4-agent1-kind=3 +r4-agent1-sku=301/301XL/301b +r4-agent1-type=1 +r4-agent2-kind=3 +r4-agent2-sku=301/301XL +r4-agent2-type=2 +r8-agent1-kind=3 +r8-agent1-sku=122/122XL/122b +r8-agent1-type=1 +r8-agent2-kind=3 +r8-agent2-sku=122/122XL +r8-agent2-type=2 +scan-style=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=1 +status-type=2 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=Pyramid +tech-subclass=NoAutoDuplex,NoCDDVD +tech-type=2 +usb-pid=9b11 +usb-vid=3f0 +wifi-config=0 + [hp_laserjet_p2014] align-type=0 clean-type=0 @@ -19068,7 +20195,7 @@ usb-vid=3f0 wifi-config=0 [deskjet_2050_j510_series] -align-type=13 +align-type=-1 clean-type=1 color-cal-type=0 copy-type=0 @@ -19076,7 +20203,7 @@ embedded-server-type=0 fax-type=0 fw-download=False icon=hp_deskjet_f4200.png -io-mfp-mode=3 +io-mfp-mode=1 io-mode=1 io-support=2 job-storage=0 @@ -19127,7 +20254,7 @@ r8-agent2-kind=3 r8-agent2-sku=121/121XL r8-agent2-type=2 scan-style=1 -scan-type=0 +scan-type=7 status-battery-check=0 status-dynamic-counters=1 status-type=2 @@ -19310,6 +20437,81 @@ usb-pid=5c17 usb-vid=3f0 wifi-config=0 +[deskjet_ink_adv_2060_k110] +align-type=-1 +clean-type=1 +color-cal-type=0 +copy-type=0 +embedded-server-type=0 +fax-type=0 +fw-download=False +icon=default_deskjet.png +io-mfp-mode=1 +io-mode=1 +io-support=2 +job-storage=0 +linefeed-cal-type=0 +model1=HP Deskjet Ink Adv 2060 K110 +monitor-type=0 +panel-check-type=1 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +r-type=1 +r0-agent1-kind=3 +r0-agent1-sku=61/61XL/61b +r0-agent1-type=1 +r0-agent2-kind=3 +r0-agent2-sku=61/61XL +r0-agent2-type=2 +r10-agent1-kind=3 +r10-agent1-sku=802/802XL/802b +r10-agent1-type=1 +r10-agent2-kind=3 +r10-agent2-sku=802/802XL +r10-agent2-type=2 +r18-agent2-kind=3 +r18-agent2-sku=93/95 +r18-agent2-type=2 +r18-agent3-kind=3 +r18-agent3-sku=99 +r18-agent3-type=3 +r2-agent1-kind=3 +r2-agent1-sku=61/61XL/61b +r2-agent1-type=1 +r2-agent2-kind=3 +r2-agent2-sku=61/61XL +r2-agent2-type=2 +r4-agent1-kind=3 +r4-agent1-sku=301/301XL/301b +r4-agent1-type=1 +r4-agent2-kind=3 +r4-agent2-sku=301/301XL +r4-agent2-type=2 +r8-agent1-kind=3 +r8-agent1-sku=122/122XL/122b +r8-agent1-type=1 +r8-agent2-kind=3 +r8-agent2-sku=122/122XL +r8-agent2-type=2 +scan-style=1 +scan-type=7 +status-battery-check=0 +status-dynamic-counters=1 +status-type=2 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=Pyramid +tech-subclass=NoAutoDuplex,NoCDDVD +tech-type=2 +usb-pid=9a11 +usb-vid=3f0 +wifi-config=0 + [apollo_2100] align-type=0 clean-type=0 @@ -23430,7 +24632,7 @@ usb-vid=3f0 wifi-config=0 [deskjet_3000_j310_series] -align-type=13 +align-type=16 clean-type=1 color-cal-type=0 copy-type=0 @@ -23492,7 +24694,7 @@ scan-style=0 scan-type=0 status-battery-check=0 status-dynamic-counters=1 -status-type=2 +status-type=10 support-released=True support-subtype=219b2b support-type=2 @@ -23894,7 +25096,7 @@ usb-vid=3f0 wifi-config=0 [deskjet_3050_j610_series] -align-type=13 +align-type=15 clean-type=1 color-cal-type=0 copy-type=0 @@ -28432,6 +29634,100 @@ usb-pid=0 usb-vid=3f0 wifi-config=0 +[deskjet_f4200_series] +align-type=13 +clean-type=1 +color-cal-type=3 +copy-type=0 +embedded-server-type=0 +fax-type=0 +fw-download=False +icon=hp_deskjet_f4200.png +io-mfp-mode=3 +io-mode=1 +io-support=2 +job-storage=0 +linefeed-cal-type=0 +model1=HP Deskjet F4224 All-in-One Printer +model10=HP Deskjet F4275 All-in-One Printer +model11=HP Deskjet F4275 All-in-One Printer +model12=HP Deskjet F4280 All-in-One Printer +model13=HP Deskjet F4283 All-in-One Printer +model14=HP Deskjet F4288 All-in-One Printer +model15=HP Deskjet F4292 All-in-One Printer +model16=HP Deskjet F4293 All-in-One Printer +model17=HP Deskjet F4294 All-in-One Printer +model2=HP Deskjet F4230 All-in-One Printer +model3=HP Deskjet F4235 All-in-One Printer +model4=HP Deskjet F4238 All-in-One Printer +model5=HP Deskjet F4240 All-in-One Printer +model6=HP Deskjet F4250 All-in-One Printer +model7=HP Deskjet F4272 All-in-One Printer +model8=HP Deskjet F4273 All-in-One Printer +model9=HP Deskjet F4274 All-in-One Printer +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +r-type=1 +r0-agent1-kind=3 +r0-agent1-sku=60/60XL/60b +r0-agent1-type=1 +r0-agent2-kind=3 +r0-agent2-sku=60/60XL +r0-agent2-type=2 +r10-agent1-kind=3 +r10-agent1-sku=818/818XL/818b +r10-agent1-type=1 +r10-agent2-kind=3 +r10-agent2-sku=818/818XL +r10-agent2-type=2 +r18-agent1-kind=3 +r18-agent1-sku=92/98 +r18-agent1-type=1 +r18-agent2-kind=3 +r18-agent2-sku=93/95 +r18-agent2-type=2 +r18-agent3-kind=3 +r18-agent3-sku=99 +r18-agent3-type=3 +r2-agent1-kind=3 +r2-agent1-sku=60/60XL/60b +r2-agent1-type=1 +r2-agent2-kind=3 +r2-agent2-sku=60/60XL +r2-agent2-type=2 +r4-agent1-kind=3 +r4-agent1-sku=300/300XL/300b +r4-agent1-type=1 +r4-agent2-kind=3 +r4-agent2-sku=300/300XL +r4-agent2-type=2 +r8-agent1-kind=3 +r8-agent1-sku=121/121XL/121b +r8-agent1-type=1 +r8-agent2-kind=3 +r8-agent2-sku=121/121XL +r8-agent2-type=2 +scan-style=1 +scan-type=1 +status-battery-check=0 +status-dynamic-counters=1 +status-type=2 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=2.8.5 +tech-class=DJGenericVIP +tech-subclass=Normal +tech-type=2 +usb-pid=2504 +usb-vid=3f0 +wifi-config=0 + [officejet_4200_series] align-type=5 clean-type=2 @@ -28720,100 +30016,6 @@ usb-pid=7b04 usb-vid=3f0 wifi-config=0 -[deskjet_f4200_series] -align-type=13 -clean-type=1 -color-cal-type=3 -copy-type=0 -embedded-server-type=0 -fax-type=0 -fw-download=False -icon=hp_deskjet_f4200.png -io-mfp-mode=3 -io-mode=1 -io-support=2 -job-storage=0 -linefeed-cal-type=0 -model1=HP Deskjet F4224 All-in-One Printer -model10=HP Deskjet F4275 All-in-One Printer -model11=HP Deskjet F4275 All-in-One Printer -model12=HP Deskjet F4280 All-in-One Printer -model13=HP Deskjet F4283 All-in-One Printer -model14=HP Deskjet F4288 All-in-One Printer -model15=HP Deskjet F4292 All-in-One Printer -model16=HP Deskjet F4293 All-in-One Printer -model17=HP Deskjet F4294 All-in-One Printer -model2=HP Deskjet F4230 All-in-One Printer -model3=HP Deskjet F4235 All-in-One Printer -model4=HP Deskjet F4238 All-in-One Printer -model5=HP Deskjet F4240 All-in-One Printer -model6=HP Deskjet F4250 All-in-One Printer -model7=HP Deskjet F4272 All-in-One Printer -model8=HP Deskjet F4273 All-in-One Printer -model9=HP Deskjet F4274 All-in-One Printer -monitor-type=0 -panel-check-type=0 -pcard-type=0 -plugin=0 -plugin-reason=0 -power-settings=0 -pq-diag-type=0 -r-type=1 -r0-agent1-kind=3 -r0-agent1-sku=60/60XL/60b -r0-agent1-type=1 -r0-agent2-kind=3 -r0-agent2-sku=60/60XL -r0-agent2-type=2 -r10-agent1-kind=3 -r10-agent1-sku=818/818XL/818b -r10-agent1-type=1 -r10-agent2-kind=3 -r10-agent2-sku=818/818XL -r10-agent2-type=2 -r18-agent1-kind=3 -r18-agent1-sku=92/98 -r18-agent1-type=1 -r18-agent2-kind=3 -r18-agent2-sku=93/95 -r18-agent2-type=2 -r18-agent3-kind=3 -r18-agent3-sku=99 -r18-agent3-type=3 -r2-agent1-kind=3 -r2-agent1-sku=60/60XL/60b -r2-agent1-type=1 -r2-agent2-kind=3 -r2-agent2-sku=60/60XL -r2-agent2-type=2 -r4-agent1-kind=3 -r4-agent1-sku=300/300XL/300b -r4-agent1-type=1 -r4-agent2-kind=3 -r4-agent2-sku=300/300XL -r4-agent2-type=2 -r8-agent1-kind=3 -r8-agent1-sku=121/121XL/121b -r8-agent1-type=1 -r8-agent2-kind=3 -r8-agent2-sku=121/121XL -r8-agent2-type=2 -scan-style=1 -scan-type=1 -status-battery-check=0 -status-dynamic-counters=1 -status-type=2 -support-released=True -support-subtype=219b2b -support-type=2 -support-ver=2.8.5 -tech-class=DJGenericVIP -tech-subclass=Normal -tech-type=2 -usb-pid=2504 -usb-vid=3f0 -wifi-config=0 - [deskjet_f4210_series] align-type=6 clean-type=1 @@ -31089,6 +32291,57 @@ usb-pid=0 usb-vid=3f0 wifi-config=0 +[hp_color_laserjet_cm4540_mfp] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=-1 +embedded-server-type=1 +fax-type=-1 +fw-download=False +icon=HP_LaserJet_9000_MFP.png +io-mfp-mode=3 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP Color LaserJet CM4540 Multifunction Printer +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE260A / CE264X +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CF031A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CF032A +r0-agent3-type=6 +r0-agent4-kind=4 +r0-agent4-sku=CF033A +r0-agent4-type=5 +scan-style=0 +scan-type=-1 +status-battery-check=0 +status-dynamic-counters=0 +status-type=3 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJColor,Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=9917 +usb-vid=3f0 +wifi-config=0 + [hp_color_laserjet_4550] align-type=0 clean-type=0 @@ -34175,6 +35428,57 @@ usb-pid=7211 usb-vid=3f0 wifi-config=0 +[hp_color_laserjet_cp5520_series] +align-type=0 +clean-type=0 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=0 +fw-download=False +icon=default_printer.png +io-mfp-mode=3 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=HP Color LaserJet CP5520 Series Printer +monitor-type=0 +panel-check-type=0 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +r-type=0 +r0-agent1-kind=4 +r0-agent1-sku=CE270A +r0-agent1-type=1 +r0-agent2-kind=4 +r0-agent2-sku=CE271A +r0-agent2-type=4 +r0-agent3-kind=4 +r0-agent3-sku=CE273A +r0-agent3-type=5 +r0-agent4-kind=4 +r0-agent4-sku=CE272A +r0-agent4-type=6 +scan-style=0 +scan-type=0 +status-battery-check=0 +status-dynamic-counters=0 +status-type=3 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=LJColor,Postscript +tech-subclass=Normal +tech-type=4 +usb-pid=9b17 +usb-vid=3f0 +wifi-config=0 + [hp_color_laserjet_5550] align-type=0 clean-type=0 @@ -36744,12 +38048,12 @@ usb-vid=3f0 wifi-config=0 [officejet_6500_e710n-z] -align-type=1 +align-type=15 clean-type=3 color-cal-type=0 copy-type=0 embedded-server-type=1 -fax-type=-1 +fax-type=6 fw-download=False icon=officejet_k550.png io-mfp-mode=1 @@ -36857,6 +38161,120 @@ usb-pid=5412 usb-vid=3f0 wifi-config=1 +[officejet_6500_e710a-f] +align-type=15 +clean-type=3 +color-cal-type=0 +copy-type=0 +embedded-server-type=1 +fax-type=6 +fw-download=False +icon=officejet_k550.png +io-mfp-mode=1 +io-mode=1 +io-support=6 +job-storage=0 +linefeed-cal-type=0 +model1=Officejet 6500 E710 +monitor-type=0 +panel-check-type=1 +pcard-type=0 +plugin=0 +plugin-reason=0 +power-settings=0 +pq-diag-type=0 +r-type=1 +r0-agent1-kind=2 +r0-agent1-sku=04/04XL +r0-agent1-type=1 +r0-agent2-kind=2 +r0-agent2-sku=04/04XL +r0-agent2-type=4 +r0-agent3-kind=2 +r0-agent3-sku=04/04XL +r0-agent3-type=5 +r0-agent4-kind=2 +r0-agent4-sku=04/04XL +r0-agent4-type=6 +r0-agent5-kind=2 +r0-agent5-sku=04/04XL +r0-agent5-type=16 +r1-agent1-kind=2 +r1-agent1-sku=04/04XL +r1-agent1-type=1 +r1-agent2-kind=2 +r1-agent2-sku=04/04XL +r1-agent2-type=4 +r1-agent3-kind=2 +r1-agent3-sku=04/04XL +r1-agent3-type=5 +r1-agent4-kind=2 +r1-agent4-sku=04/04XL +r1-agent4-type=6 +r1-agent5-kind=2 +r1-agent5-sku=04/04XL +r1-agent5-type=16 +r2-agent1-kind=2 +r2-agent1-sku=360/360XL +r2-agent1-type=1 +r2-agent2-kind=2 +r2-agent2-sku=360/360XL +r2-agent2-type=4 +r2-agent3-kind=2 +r2-agent3-sku=360/360XL +r2-agent3-type=5 +r2-agent4-kind=2 +r2-agent4-sku=360/360XL +r2-agent4-type=6 +r2-agent5-kind=2 +r2-agent5-sku=360/360XL +r2-agent5-type=16 +r4-agent1-kind=2 +r4-agent1-sku=155/155XL +r4-agent1-type=1 +r4-agent2-kind=2 +r4-agent2-sku=155/155XL +r4-agent2-type=4 +r4-agent3-kind=2 +r4-agent3-sku=155/155XL +r4-agent3-type=5 +r4-agent4-kind=2 +r4-agent4-sku=155/155XL +r4-agent4-type=6 +r4-agent5-kind=2 +r4-agent5-sku=155/155XL +r4-agent5-type=16 +r8-agent1-kind=2 +r8-agent1-sku=808/808XL +r8-agent1-type=1 +r8-agent2-kind=2 +r8-agent2-sku=808/808XL +r8-agent2-type=4 +r8-agent3-kind=2 +r8-agent3-sku=808/808XL +r8-agent3-type=5 +r8-agent4-kind=2 +r8-agent4-sku=808/808XL +r8-agent4-type=6 +r8-agent5-kind=2 +r8-agent5-sku=808/808XL +r8-agent5-type=16 +scan-style=0 +scan-type=7 +status-battery-check=0 +status-dynamic-counters=2 +status-type=10 +support-released=True +support-subtype=219b2b +support-type=2 +support-ver=3.11.1 +tech-class=Python +tech-subclass=NoCDDVD,NoAutoDuplex +tech-type=2 +usb-pid=5512 +usb-vid=3f0 +wifi-config=0 + [officejet_6500_e709n] align-type=1 clean-type=1 @@ -39950,12 +41368,12 @@ usb-vid=3f0 wifi-config=0 [officejet_7500_e910] -align-type=1 +align-type=15 clean-type=1 color-cal-type=0 copy-type=0 embedded-server-type=0 -fax-type=-1 +fax-type=6 fw-download=False icon=officejet_k550.png io-mfp-mode=1 @@ -42419,12 +43837,12 @@ usb-vid=3f0 wifi-config=0 [officejet_pro_8500_a910] -align-type=13 +align-type=15 clean-type=1 color-cal-type=0 copy-type=0 embedded-server-type=1 -fax-type=-1 +fax-type=0 fw-download=False icon=officejet_k550.png io-mfp-mode=1 @@ -43872,6 +45290,8 @@ wifi-config=0 # 12 : Carrier # 13 : Auto AiO # 14 : LIDIL DJ D1600 +# 15 : Low End Data Model (automatic and semiautomatic) +# 16 : Low End Data Model (manual) # # # clean-type @@ -43932,6 +45352,7 @@ wifi-config=0 # 4 : B&W SOAP # 5 : B&W MARVELL # 6 : B&W LEDM +# 7 : B&W LEDMSOAP # # # fw-download @@ -44105,6 +45526,7 @@ wifi-config=0 # 5 : SOAP2 # 6 : Duplex SCL # 7 : LEDM +# 8 : Marvell2 # # # status-battery-check @@ -44229,7 +45651,9 @@ wifi-config=0 # HPLIP device sub-class(es) # (TYPE_LIST) # 300dpiOnly +# 4800x1200dpi # 4x6FullBleed +# Advanced # Apollo2000 # Apollo2200 # Apollo2500 diff --git a/sane-backends-1.0.21-i18n.patch b/sane-backends-1.0.21-i18n.patch deleted file mode 100644 index f0e95c3..0000000 --- a/sane-backends-1.0.21-i18n.patch +++ /dev/null @@ -1,129 +0,0 @@ -diff -Nur sane-backends-1.0.21/po/LINGUAS sane-backends-1.0.21.mod/po/LINGUAS ---- sane-backends-1.0.21/po/LINGUAS 1969-12-31 19:00:00.000000000 -0500 -+++ sane-backends-1.0.21.mod/po/LINGUAS 2010-04-27 03:38:23.000000000 -0400 -@@ -0,0 +1,21 @@ -+# List of languages -+# try to keep this list ordered -+bg -+cs -+da -+de -+en_GB -+eo -+es -+fi -+fr -+gl -+it -+ja -+nb -+nl -+pl -+pt -+ru -+sv -+uk -diff -Nur sane-backends-1.0.21/po/POTFILES sane-backends-1.0.21.mod/po/POTFILES ---- sane-backends-1.0.21/po/POTFILES 1969-12-31 19:00:00.000000000 -0500 -+++ sane-backends-1.0.21.mod/po/POTFILES 2010-04-27 03:38:16.000000000 -0400 -@@ -0,0 +1,100 @@ -+# List of source files containing translatable strings -+# paths relative to po -+../include/sane/saneopts.h -+../backend/sane_strstatus.c -+ -+../backend/artec_eplus48u.c -+ -+../backend/avision.h -+ -+../backend/canon630u.c -+../backend/canon.c -+../backend/canon-sane.c -+ -+../backend/canon_dr.c -+../backend/canon_dr.h -+ -+../backend/cardscan.c -+../backend/cardscan.h -+ -+../backend/epjitsu.c -+../backend/epjitsu.h -+ -+../backend/epson.c -+../backend/epson.h -+../backend/epson2.c -+../backend/epson2.h -+ -+../backend/fujitsu.c -+../backend/fujitsu.h -+ -+../backend/genesys.c -+ -+../backend/kodak.c -+../backend/kodak.h -+ -+../backend/gt68xx.c -+../backend/gt68xx_low.h -+ -+../backend/hp3500.c -+../backend/hp3900_sane.c -+../backend/hp5400_sane.c -+../backend/hp5590.c -+../backend/hp-option.c -+../backend/hp-option.h -+ -+../backend/leo.c -+../backend/leo.h -+ -+../backend/lexmark.c -+ -+../backend/ma1509.c -+ -+../backend/matsushita.c -+../backend/matsushita.h -+ -+../backend/microtek2.c -+../backend/microtek2.h -+ -+../backend/mustek.c -+../backend/mustek_usb.c -+../backend/mustek_usb2.c -+ -+../backend/niash.c -+ -+../backend/pixma.c -+../backend/pixma_sane_options.c -+ -+../backend/plustek.c -+../backend/plustek_pp.c -+ -+../backend/pnm.c -+ -+../backend/rts8891.c -+ -+../backend/sceptre.c -+../backend/sceptre.h -+ -+../backend/sm3840.c -+ -+../backend/snapscan.c -+../backend/snapscan-options.c -+ -+../backend/stv680.c -+../backend/stv680.h -+ -+../backend/teco1.c -+../backend/teco1.h -+../backend/teco2.c -+../backend/teco2.h -+../backend/teco3.c -+../backend/teco3.h -+ -+../backend/test.c -+ -+../backend/u12.c -+ -+../backend/umax1220u.c -+../backend/umax.c -+../backend/umax_pp.c -+ diff --git a/sane-backends-1.0.21.tar.bz2 b/sane-backends-1.0.21.tar.bz2 deleted file mode 100644 index b63bddd..0000000 --- a/sane-backends-1.0.21.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:042428a962f43562b7f1d31948ab0b14a7eec55373ccb7b5b174fa1d8d7275a2 -size 3911050 diff --git a/sane-backends-1.0.22.tar.bz2 b/sane-backends-1.0.22.tar.bz2 new file mode 100644 index 0000000..b75ef92 --- /dev/null +++ b/sane-backends-1.0.22.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21830b6a0c315fef423ad8b7e96bfacff462085f49d43863e2e7139e242e535c +size 4065208 diff --git a/sane-backends.changes b/sane-backends.changes index f8840f6..ebfa13a 100644 --- a/sane-backends.changes +++ b/sane-backends.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Wed Feb 16 15:31:21 CET 2011 - jsmeix@suse.de + +- Upgraded to sane-backends version 1.0.22: + New backends: + kvs20xx (Panasonic KV-S20xx), magicolor (Konica-Minolta). + Significant enhancements to several backends. + More than 80 new scanner models supported. + Support many more networked scanners. + Added -A option to scanimage. + Improved build system. + Improved USB support. + Improved udev rules. + Documentation updates. + Bugfixes. + Note: + This is one more release of the SANE 1.0 series, compare + the below entry dated "Thu Feb 28 13:56:15 CET 2008". +- sane-backends-1.0.21-i18n.patch, + fix-genesys-create_range-type.patch, + fix-xerox_mfp-color-mode.patch, and + canon-backend-autoprobing.patch are obsolete since + sane-backends-1.0.22 because it is fixed in the source. +- Adapted how we derive our libsane.rules file from the + generated one which uses now "ATTRS" (instead of "SYSFS"), + see the below entry dated "Tue Oct 21 13:12:42 CEST 2008". +- Updated models.dat to the one from the current HPLIP 3.11.1. +- Added only those new models from epkowa.desc in the + sane-backends 1.0.22 sources which 'requires DFSG non-free' + plugin software to our epkowa.desc source file so that the + supported models in our epkowa.desc source file still match + to what is supported by our iscan-free package but more users + of models which require the proprietary software from Avasys + will be informed via yast2-scanner. + ------------------------------------------------------------------- Thu Dec 9 11:48:58 CET 2010 - jsmeix@suse.de diff --git a/sane-backends.spec b/sane-backends.spec index 5c2cdf0..2481e10 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -20,7 +20,6 @@ Name: sane-backends BuildRequires: libgphoto2-devel libjpeg-devel net-snmp-devel pkg-config texlive-latex - %if 0%{?suse_version} > 1130 BuildRequires: libieee1284-devel %else @@ -30,7 +29,7 @@ License: GPLv2 ; GPLv2+ ; LGPLv2.1+ ; Public Domain, Freeware Group: Hardware/Scanner AutoReqProv: on Summary: SANE (Scanner Access Now Easy) Scanner Drivers -Version: 1.0.21 +Version: 1.0.22 Release: 8 Url: http://www.sane-project.org/ # URL for Source0: https://alioth.debian.org/frs/download.php/3258/sane-backends-1.0.21.tar.gz @@ -123,19 +122,19 @@ Patch10: fix-mustek_pp_ccd300.c.patch # Patch14 is an upstream patch which adds two files required to build translations # which are missing in the upstream sane-backends-1.0.21 source tar ball. # URL for Patch14: https://alioth.debian.org/frs/download.php/3261/sane-backends-1.0.21-i18n.patch -Patch14: sane-backends-1.0.21-i18n.patch +# Patch14 is obsolete since sane-backends-1.0.22 because it is fixed in the source. # Patch15 fix-genesys-create_range-type.patch lets in genesys.c the create_range function # be of type 'SANE_Range *' to fix 'assignment makes pointer from integer' bugs # wherever the create_range function is called # see https://alioth.debian.org/tracker/index.php?func=detail&aid=312492&group_id=30186&atid=410366 -Patch15: fix-genesys-create_range-type.patch +# which is obsolete since sane-backends-1.0.22 because it is fixed in the source. # Patch16 fix-xerox_mfp-color-mode.patch adds SANE_VALUE_SCAN_MODE_HALFTONE in xerox_mfp.c # to fix a regression in sane-backends-1.0.21 where the xerox_mfp works only in grayscale mode # see https://bugzilla.novell.com/show_bug.cgi?id=658017 -Patch16: fix-xerox_mfp-color-mode.patch +# which is obsolete since sane-backends-1.0.22 because it is fixed in the source. # Patch100... is SUSE specific stuff: -# Patch100 lets the "canon" backend do scanner auto-recognition: -Patch100: canon-backend-autoprobing.patch +# Patch100 canon-backend-autoprobing.patch lets the "canon" backend do scanner auto-recognition +# which is obsolete since sane-backends-1.0.22 because it is fixed in the source. # Patch102 builds libsane-* modules as libtool modules: # SANE backends (i.e. driver modules) are regular shared libraries. # Nothing is linked directly with a /usr/lib/sane/libsane-.so module. @@ -164,11 +163,12 @@ PreReq: coreutils, /bin/sed, /bin/grep %ifarch ppc64 Obsoletes: sane-64bit %endif -# -# Suse Linux and openSUSE have the package name 'sane' for 'sane-backends'. -# Therefore this RPM provides 'sane' and it also obsoletes it: -Provides: sane -Obsoletes: sane +# Up to SLE10 there was the package name 'sane' for 'sane-backends'. +# Therefore this RPM provides 'sane' and it also obsoletes it. +# The %{version} s needed in both Provides and Obsoletes +# to avoid a RPMLINT warning that the package obsoletes itself: +Provides: sane = %{version} +Obsoletes: sane < %{version} # Skip testing devel dependencies required by libtool .la files by the following comment: # skip-check-libtool-deps @@ -336,9 +336,6 @@ Authors: %prep %setup -q # Apply upstream patches first of all: -# Patch14 is an upstream patch for sane-backends-1.0.21 -# which adds two files required to build translations: -%patch14 -p1 # Then apply non-upstream patches: # Patch2 fixes too small arrays in backend/niash.c: %patch2 @@ -346,13 +343,7 @@ Authors: %patch8 # Patch10 fixes undefined 'foo = ++foo modulo bar' operations in mustek_pp_ccd300.c: %patch10 -# Patch15 lets in genesys.c the create_range function be of type 'SANE_Range *': -%patch15 -# Patch16 adds SANE_VALUE_SCAN_MODE_HALFTONE in xerox_mfp.c: -%patch16 # Patch100... is SUSE specific stuff: -# Patch100 lets the "canon" backend do scanner auto-recognition: -%patch100 # Patch103 installs tools/umax_pp as /usr/bin/umax_pp: %patch103 # Patch104 removes descriptions-external/hpoj.desc from doc/Makefile.am @@ -546,12 +537,13 @@ install -m644 autoconfig.rules %{buildroot}%{_sysconfdir}/udev/rules.d/56-sane-b # should usually require the same kind of security. # Regarding SUBSYSTEM=="usb" see the Novell/Suse Bugzilla bug # https://bugzilla.novell.com/show_bug.cgi?id=294161#c11 -# Regarding SYSFS{} versus ATTR{} see the Novell/Suse Bugzilla bug +# Regarding SYSFS{} or ATTRS{} versus ATTR{} see the Novell/Suse Bugzilla bug # https://bugzilla.novell.com/show_bug.cgi?id=436085#c0 # Disable all ENV{DEVTYPE} lines because we (Suse/Novell) do not need them. sed -i -e 's/GROUP="scanner"/GROUP="lp"/' tools/udev/libsane.rules sed -i -e '/^SUBSYSTEM/s/"usb_device"/"usb"/' tools/udev/libsane.rules sed -i -e 's/SYSFS/ATTR/g' tools/udev/libsane.rules +sed -i -e 's/ATTRS/ATTR/g' tools/udev/libsane.rules sed -i -e 's/^ENV{DEVTYPE}/# ENV{DEVTYPE}/' tools/udev/libsane.rules # Disable entries for USB scanners which are "unsupported" # but keep the entries for models for which the support status @@ -574,12 +566,15 @@ sed -i -e 's/^ENV{DEVTYPE}/# ENV{DEVTYPE}/' tools/udev/libsane.rules # see https://bugzilla.novell.com/show_bug.cgi?id=439193#c6 cat /dev/null >unsupportedUSBIDs for USBID in $( grep '||[^|]*|0x[0-9A-Fa-f][0-9A-Fa-f]*:0x[0-9A-Fa-f][0-9A-Fa-f]*|unsupported|' scanner.database | cut -s -d '|' -f 7 | sort -f -u ) -do grep -o "|$USBID|.*|" scanner.database | egrep -q 'complete|good|basic|minimal|untested' || echo $USBID >>unsupportedUSBIDs +do grep -o "|$USBID|.*|" scanner.database | grep -E -q 'complete|good|basic|minimal|untested' || echo $USBID >>unsupportedUSBIDs done # Ignore case when using sed to avoid possible problems # with upper case letters in the USB IDs: for m in $( sed -e 's/0x/./ig' -e 's/:/.,.ATTR.idProduct.==/' unsupportedUSBIDs ) -do sed -i -e "/^ATTR.idVendor.==$m/Is/^ATTR/# ATTR/" tools/udev/libsane.rules +do if grep -q "^ATTR.idVendor.==$m" tools/udev/libsane.rules + then echo "Disabling unsupported model matching ATTR.idVendor.==$m" + sed -i -e "/^ATTR.idVendor.==$m/Is/^ATTR/# ATTR/" tools/udev/libsane.rules + fi done # Newer udev versions complain about NAME="%k" usage with warning messages like # 'udevd[1234]: NAME="%k" is superfluous and breaks kernel supplied names...'