From 59a013ae25d409a35fb27ff6e0a372469a1a6339 Mon Sep 17 00:00:00 2001 From: fpdpbuilder_pel7x64builder0 Date: Mon, 10 Dec 2018 10:07:39 +0100 Subject: [PATCH] hplip package creation Signed-off-by: fpdpbuilder_pel7x64builder0 --- SOURCES/hpcups-update-ppds.sh | 107 ++ SOURCES/hplip-avahi-parsing.patch | 19 + SOURCES/hplip-bad-low-ink-warning.patch | 39 + SOURCES/hplip-clear-old-state-reasons.patch | 17 + SOURCES/hplip-deviceIDs-drv.patch | 767 ++++++++ SOURCES/hplip-deviceIDs-ppd.patch | 11 + SOURCES/hplip-dj990c-margin.patch | 15 + .../hplip-do-not-crash-on-usb-failure.patch | 114 ++ SOURCES/hplip-hpcups-sigpipe.patch | 29 + SOURCES/hplip-hpijs-marker-supply.patch | 32 + SOURCES/hplip-log-stderr.patch | 37 + SOURCES/hplip-logdir.patch | 24 + SOURCES/hplip-no-asm.patch | 36 + SOURCES/hplip-no-write-bytecode.patch | 27 + SOURCES/hplip-ppd-ImageableArea.patch | 459 +++++ SOURCES/hplip-pstotiff-is-rubbish.patch | 65 + SOURCES/hplip-retry-open.patch | 16 + SOURCES/hplip-scan-tmp.patch | 25 + SOURCES/hplip-silence-ioerror.patch | 12 + SOURCES/hplip-snmp-quirks.patch | 21 + SOURCES/hplip-strncpy.patch | 48 + SOURCES/hplip-strstr-const.patch | 50 + SOURCES/hplip-stuck-plugin.patch | 144 ++ SOURCES/hplip-udev-rules.patch | 23 + SOURCES/hplip-ui-optional.patch | 27 + SPECS/hplip.spec | 1586 +++++++++++++++++ 26 files changed, 3750 insertions(+) create mode 100644 SOURCES/hpcups-update-ppds.sh create mode 100644 SOURCES/hplip-avahi-parsing.patch create mode 100644 SOURCES/hplip-bad-low-ink-warning.patch create mode 100644 SOURCES/hplip-clear-old-state-reasons.patch create mode 100644 SOURCES/hplip-deviceIDs-drv.patch create mode 100644 SOURCES/hplip-deviceIDs-ppd.patch create mode 100644 SOURCES/hplip-dj990c-margin.patch create mode 100644 SOURCES/hplip-do-not-crash-on-usb-failure.patch create mode 100644 SOURCES/hplip-hpcups-sigpipe.patch create mode 100644 SOURCES/hplip-hpijs-marker-supply.patch create mode 100644 SOURCES/hplip-log-stderr.patch create mode 100644 SOURCES/hplip-logdir.patch create mode 100644 SOURCES/hplip-no-asm.patch create mode 100644 SOURCES/hplip-no-write-bytecode.patch create mode 100644 SOURCES/hplip-ppd-ImageableArea.patch create mode 100644 SOURCES/hplip-pstotiff-is-rubbish.patch create mode 100644 SOURCES/hplip-retry-open.patch create mode 100644 SOURCES/hplip-scan-tmp.patch create mode 100644 SOURCES/hplip-silence-ioerror.patch create mode 100644 SOURCES/hplip-snmp-quirks.patch create mode 100644 SOURCES/hplip-strncpy.patch create mode 100644 SOURCES/hplip-strstr-const.patch create mode 100644 SOURCES/hplip-stuck-plugin.patch create mode 100644 SOURCES/hplip-udev-rules.patch create mode 100644 SOURCES/hplip-ui-optional.patch create mode 100644 SPECS/hplip.spec diff --git a/SOURCES/hpcups-update-ppds.sh b/SOURCES/hpcups-update-ppds.sh new file mode 100644 index 0000000..2e97ef5 --- /dev/null +++ b/SOURCES/hpcups-update-ppds.sh @@ -0,0 +1,107 @@ +#!/bin/bash + +## Copyright (C) 2010 Red Hat, Inc. +## Authors: +## Tim Waugh + +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. + +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. + +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +## Purpose: Update hpcups PPDs when necessary. + +sock=/var/run/cups/cups.sock +running=$(LC_ALL=C lpstat -h "$sock" -r 2>/dev/null) +if [ "$?" -ne 0 ] +then + # No lpstat in path + exit 0 +fi + +if [ -z "${running##*not*}" ] +then + # scheduler is not running + exit 0 +fi + +trap 'rm -f "$tmpdir"/models; rmdir "$tmpdir"; exit 0' \ + 0 HUP INT QUIT ILL ABRT PIPE TERM + +debug=true +tmpdir="$(mktemp -d)" +for ppd in /etc/cups/ppd/*.ppd +do + [ -r "$ppd" ] || continue + queue="${ppd#/etc/cups/ppd/}" + queue="${queue%.ppd}" + lpstat -h "$sock" -p "$queue" &>/dev/null || continue + + # We have PPD associated with a queue. Find out its NickName + $debug && echo "Examining $queue" + nickname="$(grep '^\*NickName:' "$ppd")" + nickname="${nickname#*\"}" # strip text up to and incl first double quote + nickname="${nickname%\"*}" # strip final double quote + $debug && echo "NickName is: $nickname" + + # Is it an hpcups PPD? + [ -z "${nickname##*, hpcups*}" ] || continue + $debug && echo "hpcups: true" + + # No: need to regenerate the PPD. + if [ ! -f "$tmpdir/models" ] + then + # Get list of driver URIs and NickNames + lpinfo -h "$sock" --include-schemes=drv -m 2>/dev/null >"$tmpdir/models" + fi + + # Strip hpcups version from NickName + nickname="${nickname%, hpcups*}" + $debug && echo "Stripped NickName: $nickname" + while read line + do + uri=${line%% *} + nn="${line#$uri }" + [ -z "${nn##*, hpcups*}" ] || continue + + nn="${nn%, hpcups*}" + if [ "$nn" == "$nickname" ] + then + $debug && echo "Match found, URI: $uri" + + # Unfortunately CUPS will reset the page size when we + # change the PPD, due to the weird page size names that + # HPLIP uses. Try to maintain the existing page size. + size="$(grep '^\*DefaultPageSize:' "$ppd")" + size="${size##* }" # strip until after first ' ' + size="${size%% *}" # strip after any ' ' + $debug && echo "PageSize is $size" + + if [ -z "${size#*Duplex}" ] + then + # Special handling for duplex sizes because HPLIP + # broke backwards compatibility with *that* too! + size="${size%Duplex}.Duplex" + fi + + null=/dev/null + $debug && null=/dev/stdout + lpadmin -h "$sock" -p "$queue" -m "$uri" &>"$null" || : + $debug && echo "PPD regenerated" + + lpadmin -h "$sock" -p "$queue" -o PageSize="$size" &>"$null" || : + $debug && echo "PageSize restored to $size" + break + fi + done <"$tmpdir/models" +done +exit 0 diff --git a/SOURCES/hplip-avahi-parsing.patch b/SOURCES/hplip-avahi-parsing.patch new file mode 100644 index 0000000..029040b --- /dev/null +++ b/SOURCES/hplip-avahi-parsing.patch @@ -0,0 +1,19 @@ +diff -up hplip-3.15.2/base/avahi.py.parsing hplip-3.15.2/base/avahi.py +--- hplip-3.15.2/base/avahi.py.parsing 2015-02-04 15:43:37.662551377 +0100 ++++ hplip-3.15.2/base/avahi.py 2015-02-04 15:45:56.576564858 +0100 +@@ -52,9 +52,14 @@ def detectNetworkDevices(ttl=4, timeout= + 'status_code': 0, 'device2': '0', 'device3': '0', 'note': ''} + y['ip'] = ip + y['hn'] = bits[6].replace('.local', '') +- details = bits[9].split('" "') ++ details = bits[9].rstrip ().strip ('"').split('" "') + for item in details: + key, value = item.split('=', 1) ++ keyvalue = item.split('=', 1) ++ if len (keyvalue) < 2: ++ # Skip parts that don't match key=value ++ continue ++ key, value = keyvalue + if key == 'ty': + y['mdns'] = value + y['device1'] = "MFG:Hewlett-Packard;MDL:%s;CLS:PRINTER;" % value diff --git a/SOURCES/hplip-bad-low-ink-warning.patch b/SOURCES/hplip-bad-low-ink-warning.patch new file mode 100644 index 0000000..bd51d64 --- /dev/null +++ b/SOURCES/hplip-bad-low-ink-warning.patch @@ -0,0 +1,39 @@ +diff -up hplip-3.10.5/prnt/hpijs/dj9xxvip.cpp.bad-low-ink-warning hplip-3.10.5/prnt/hpijs/dj9xxvip.cpp +--- hplip-3.10.5/prnt/hpijs/dj9xxvip.cpp.bad-low-ink-warning 2010-05-13 01:48:58.000000000 +0200 ++++ hplip-3.10.5/prnt/hpijs/dj9xxvip.cpp 2010-05-17 14:56:31.000000000 +0200 +@@ -2239,7 +2239,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel() + { + case '5': + { +- if ((*(pStr+1) & 0xf3) > 1) ++ if ((*(pStr+1) & 0xf3) > '1') + { + if (err != NO_ERROR) + { +@@ -2254,7 +2254,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel() + } + case '6': + { +- if ((*(pStr+1) & 0xf3) > 1) ++ if ((*(pStr+1) & 0xf3) > '1') + { + if (err != NO_ERROR) + { +@@ -2269,7 +2269,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel() + } + case '7': + { +- if ((*(pStr+1) & 0xf3) > 1) ++ if ((*(pStr+1) & 0xf3) > '1') + { + if (err != NO_ERROR) + { +@@ -2285,7 +2285,7 @@ DRIVER_ERROR DJ9xxVIP::CheckInkLevel() + } + case '8': + { +- if ((*(pStr+1) & 0xf3) > 1) ++ if ((*(pStr+1) & 0xf3) > '1') + { + if (err != NO_ERROR) + { diff --git a/SOURCES/hplip-clear-old-state-reasons.patch b/SOURCES/hplip-clear-old-state-reasons.patch new file mode 100644 index 0000000..0dd0c66 --- /dev/null +++ b/SOURCES/hplip-clear-old-state-reasons.patch @@ -0,0 +1,17 @@ +diff -up hplip-3.12.6/prnt/hpcups/HPCupsFilter.cpp.clear-old-state-reasons hplip-3.12.6/prnt/hpcups/HPCupsFilter.cpp +--- hplip-3.12.6/prnt/hpcups/HPCupsFilter.cpp.clear-old-state-reasons 2012-06-19 11:00:06.000000000 +0200 ++++ hplip-3.12.6/prnt/hpcups/HPCupsFilter.cpp 2012-06-19 11:00:57.822093043 +0200 +@@ -510,6 +510,13 @@ int HPCupsFilter::StartPrintJob(int arg + + signal(SIGTERM, HPCancelJob); + ++/* ++ * Prior to the re-write of hpcups, this filter managed the ++ * marker-supply-low-warning printer state reason. Make sure to ++ * clear that state reason so that upgrades work correctly. ++ */ ++ fputs ("STATE: -marker-supply-low-warning\n", stderr); ++ + cups_raster = cupsRasterOpen(fd, CUPS_RASTER_READ); + + if (cups_raster == NULL) { diff --git a/SOURCES/hplip-deviceIDs-drv.patch b/SOURCES/hplip-deviceIDs-drv.patch new file mode 100644 index 0000000..dc975b5 --- /dev/null +++ b/SOURCES/hplip-deviceIDs-drv.patch @@ -0,0 +1,767 @@ +diff -up hplip-3.15.2/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.15.2/prnt/drv/hpcups.drv.in +--- hplip-3.15.2/prnt/drv/hpcups.drv.in.deviceIDs-drv 2015-01-29 13:21:00.000000000 +0100 ++++ hplip-3.15.2/prnt/drv/hpcups.drv.in 2015-02-04 14:20:39.756550038 +0100 +@@ -465,7 +465,7 @@ Manufacturer "HP" + ModelName "HP Photosmart p1000" + Attribute "NickName" "" "HP Photosmart p1000, hpcups $Version" + Attribute "ShortNickName" "" "HP Photosmart p1000" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart p1000;DES:photosmart p1000;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:PHOTOSMART P1000;DES:Hewlett-Packard PhotoSmart P1000;" + PCFileName "hp-photosmart_p1000.ppd" + Attribute "Product" "" "(HP Photosmart p1000/1000 Printer)" + Attribute "Product" "" "(HP Photosmart p1000xi Printer)" +@@ -474,7 +474,7 @@ Manufacturer "HP" + ModelName "HP Photosmart p1100" + Attribute "NickName" "" "HP Photosmart p1100, hpcups $Version" + Attribute "ShortNickName" "" "HP Photosmart p1100" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart p1100;DES:photosmart p1100;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:PHOTOSMART P1100;DES:Hewlett-Packard PhotoSmart P1100;" + PCFileName "hp-photosmart_p1100.ppd" + Attribute "Product" "" "(HP Photosmart p1100 Printer)" + Attribute "Product" "" "(HP Photosmart p1100xi Printer)" +@@ -516,7 +516,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 3820" + Attribute "NickName" "" "HP Deskjet 3820, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 3820" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 3820;DES:deskjet 3820;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 3820;DES:Hewlett-Packard DeskJet 3820;" + PCFileName "hp-deskjet_3820.ppd" + Attribute "Product" "" "(HP Deskjet 3820 Color Inkjet Printer)" + Attribute "Product" "" "(HP Deskjet 3820v Color Inkjet Printer)" +@@ -542,7 +542,7 @@ Manufacturer "HP" + ModelName "HP Officejet v40xi" + Attribute "NickName" "" "HP Officejet v40xi, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet v40xi" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet v40xi;DES:officejet v40xi;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet V40xi;DES:Hewlett-Packard OfficeJet V Series;" + PCFileName "hp-officejet_v40xi.ppd" + Attribute "Product" "" "(HP Officejet v40xi All-in-one Printer)" + } +@@ -550,7 +550,7 @@ Manufacturer "HP" + ModelName "HP Officejet v40" + Attribute "NickName" "" "HP Officejet v40, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet v40" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet v40;DES:officejet v40;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet V40;DES:Hewlett-Packard OfficeJet V Series;" + PCFileName "hp-officejet_v40.ppd" + Attribute "Product" "" "(HP Officejet v40 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet v40s All-in-one Printer)" +@@ -579,7 +579,7 @@ Manufacturer "HP" + ModelName "HP Officejet 5105" + Attribute "NickName" "" "HP Officejet 5105, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet 5105" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 5105;DES:officejet 5105;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 5105;DES:Hewlett-Packard OfficeJet 5100 Series;" + PCFileName "hp-officejet_5105.ppd" + Attribute "Product" "" "(HP Officejet 5105 All-in-one Printer)" + } +@@ -587,7 +587,7 @@ Manufacturer "HP" + ModelName "HP Officejet 5110v" + Attribute "NickName" "" "HP Officejet 5110v, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet 5110v" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 5110v;DES:officejet 5110v;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 5110v;DES:Hewlett-Packard OfficeJet 5100 Series;" + PCFileName "hp-officejet_5110v.ppd" + Attribute "Product" "" "(HP Officejet 5110v All-in-one Printer)" + } +@@ -604,7 +604,7 @@ Manufacturer "HP" + ModelName "HP Officejet g55" + Attribute "NickName" "" "HP Officejet g55, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet g55" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet g55;DES:officejet g55;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet G55;DES:Hewlett-Packard OfficeJet G Series;" + PCFileName "hp-officejet_g55.ppd" + Attribute "Product" "" "(HP Officejet g55 All-in-one Printer)" + } +@@ -644,7 +644,7 @@ Manufacturer "HP" + ModelName "HP PSC 750xi" + Attribute "NickName" "" "HP PSC 750xi, hpcups $Version" + Attribute "ShortNickName" "" "HP PSC 750xi" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 750xi;DES:psc 750xi;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 750xi;DES:Hewlett-Packard PSC 700 Series;" + PCFileName "hp-psc_750xi.ppd" + Attribute "Product" "" "(HP PSC 750xi All-in-one Printer)" + } +@@ -652,7 +652,7 @@ Manufacturer "HP" + ModelName "HP PSC 750" + Attribute "NickName" "" "HP PSC 750, hpcups $Version" + Attribute "ShortNickName" "" "HP PSC 750" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 750;DES:psc 750;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 750;DES:Hewlett-Packard PSC 700 Series;" + PCFileName "hp-psc_750.ppd" + Attribute "Product" "" "(HP PSC 750 All-in-one Printer)" + } +@@ -700,7 +700,7 @@ Manufacturer "HP" + ModelName "HP Officejet g85" + Attribute "NickName" "" "HP Officejet g85, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet g85" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet g85;DES:officejet g85;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet G85;DES:Hewlett-Packard OfficeJet G Series;" + PCFileName "hp-officejet_g85.ppd" + Attribute "Product" "" "(HP Officejet g85 All-in-one Printer)" + } +@@ -716,7 +716,7 @@ Manufacturer "HP" + ModelName "HP PSC 900 Series" + Attribute "NickName" "" "HP PSC 900 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP PSC 900 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 900 series;DES:psc 900 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 900 Series;DES:Hewlett-Packard PSC 900 Series;" + PCFileName "hp-psc_900_series.ppd" + Attribute "Product" "" "(HP PSC 900 All-in-one Printer)" + } +@@ -732,7 +732,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 920c" + Attribute "NickName" "" "HP Deskjet 920c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 920c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 920c;DES:deskjet 920c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 920C;DES:Hewlett-Packard DeskJet 920C;" + PCFileName "hp-deskjet_920c.ppd" + Attribute "Product" "" "(HP Deskjet 920c Printer)" + Attribute "Product" "" "(HP Deskjet 920cvr Printer)" +@@ -751,7 +751,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 930c" + Attribute "NickName" "" "HP Deskjet 930c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 930c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 930c;DES:deskjet 930c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 930C;DES:Hewlett-Packard DeskJet 930C;" + PCFileName "hp-deskjet_930c.ppd" + Attribute "Product" "" "(HP Deskjet 930c Printer)" + Attribute "Product" "" "(HP Deskjet 930cm Printer)" +@@ -792,7 +792,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 940c" + Attribute "NickName" "" "HP Deskjet 940c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 940c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 940c;DES:deskjet 940c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 940C;DES:Hewlett-Packard DeskJet 940C;" + PCFileName "hp-deskjet_940c.ppd" + Attribute "Product" "" "(HP Deskjet 940cvr Printer)" + Attribute "Product" "" "(HP Deskjet 940c Printer)" +@@ -811,7 +811,7 @@ Manufacturer "HP" + ModelName "HP Officejet g95" + Attribute "NickName" "" "HP Officejet g95, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet g95" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet g95;DES:officejet g95;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet G95;DES:Hewlett-Packard OfficeJet G Series;" + PCFileName "hp-officejet_g95.ppd" + Attribute "Product" "" "(HP Officejet g95 All-in-one Printer)" + } +@@ -843,7 +843,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 950c" + Attribute "NickName" "" "HP Deskjet 950c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 950c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 950c;DES:deskjet 950c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 950C;DES:Hewlett-Packard DeskJet 950C;" + PCFileName "hp-deskjet_950c.ppd" + Attribute "Product" "" "(HP Deskjet 950c Printer)" + } +@@ -876,7 +876,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 959c" + Attribute "NickName" "" "HP Deskjet 959c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 959c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 959c;DES:deskjet 959c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 950C;DES:Hewlett-Packard DeskJet 950C;" + PCFileName "hp-deskjet_959c.ppd" + Attribute "Product" "" "(HP Deskjet 959c Printer)" + } +@@ -884,7 +884,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 970c" + Attribute "NickName" "" "HP Deskjet 970c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 970c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 970c;DES:deskjet 970c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 970C;DES:Hewlett-Packard DeskJet 970C;" + PCFileName "hp-deskjet_970c.ppd" + Attribute "Product" "" "(HP Deskjet 970cxi Printer)" + Attribute "Product" "" "(HP Deskjet 970cse Printer)" +@@ -938,7 +938,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 1220c" + Attribute "NickName" "" "HP Deskjet 1220c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 1220c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 1220c;DES:deskjet 1220c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 1220C;DES:Hewlett-Packard DeskJet 1220;" + PCFileName "hp-deskjet_1220c.ppd" + Attribute "Product" "" "(HP Deskjet 1220c Printer)" + Attribute "Product" "" "(HP Deskjet 1220cse Printer)" +@@ -1134,7 +1134,7 @@ Manufacturer "HP" + ModelName "HP 2000c" + Attribute "NickName" "" "HP 2000c, hpcups $Version" + Attribute "ShortNickName" "" "HP 2000c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp 2000c;DES:hp 2000c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP 2000C;DES:hp 2000c;" + PCFileName "hp-2000c.ppd" + Attribute "Product" "" "(HP 2000cse Printer)" + Attribute "Product" "" "(HP 2000c Printer)" +@@ -1609,7 +1609,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 960c" + Attribute "NickName" "" "HP Deskjet 960c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 960c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 960c;DES:deskjet 960c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 960C;DES:Hewlett-Packard DeskJet 960C;" + PCFileName "hp-deskjet_960c.ppd" + Attribute "Product" "" "(HP Deskjet 960cse Printer)" + Attribute "Product" "" "(HP Deskjet 960cxi Printer)" +@@ -1619,7 +1619,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 980c" + Attribute "NickName" "" "HP Deskjet 980c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 980c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 980c;DES:deskjet 980c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 980C;DES:Hewlett-Packard DeskJet 980C;" + PCFileName "hp-deskjet_980c.ppd" + Attribute "Product" "" "(HP Deskjet 980cxi Printer)" + Attribute "Product" "" "(HP Deskjet 980c Printer)" +@@ -1628,7 +1628,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 990c" + Attribute "NickName" "" "HP Deskjet 990c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 990c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 990c;DES:deskjet 990c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 990C;DES:Hewlett-Packard DeskJet 990C;" + PCFileName "hp-deskjet_990c.ppd" + Attribute "Product" "" "(HP Deskjet 990cxi Printer)" + Attribute "Product" "" "(HP Deskjet 990cse Printer)" +@@ -1658,7 +1658,7 @@ Manufacturer "HP" + ModelName "HP Color Inkjet cp1700" + Attribute "NickName" "" "HP Color Inkjet cp1700, hpcups $Version" + Attribute "ShortNickName" "" "HP Color Inkjet cp1700" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color inkjet cp1700;DES:hp color inkjet cp1700;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP Color Inkjet CP1700;DES:HP Color Inkjet CP1700;" + PCFileName "hp-color_inkjet_cp1700.ppd" + Attribute "Product" "" "(HP Color Inkjet cp1700 Printer)" + } +@@ -1666,7 +1666,7 @@ Manufacturer "HP" + ModelName "HP Officejet 7100 Series" + Attribute "NickName" "" "HP Officejet 7100 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet 7100 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 7100 series;DES:officejet 7100 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 7100 series;DES:officejet 7100 series;" + PCFileName "hp-officejet_7100_series.ppd" + Attribute "Product" "" "(HP Officejet 7100 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 7110 All-in-one Printer)" +@@ -1681,7 +1681,7 @@ Manufacturer "HP" + ModelName "HP Officejet D Series" + Attribute "NickName" "" "HP Officejet D Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet D Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet d series;DES:officejet d series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet d series;DES:officejet d series;" + PCFileName "hp-officejet_d_series.ppd" + Attribute "Product" "" "(HP Officejet d125xi All-in-one Printer)" + Attribute "Product" "" "(HP Officejet d135 All-in-one Printer)" +@@ -1728,7 +1728,7 @@ Manufacturer "HP" + ModelName "HP PSC 2100 Series" + Attribute "NickName" "" "HP PSC 2100 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP PSC 2100 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2100 series;DES:psc 2100 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2100 Series;DES:psc 2100 series;" + PCFileName "hp-psc_2100_series.ppd" + Attribute "Product" "" "(HP PSC 2105 All-in-one Printer)" + Attribute "Product" "" "(HP PSC 2108 All-in-one Printer)" +@@ -1741,7 +1741,7 @@ Manufacturer "HP" + ModelName "HP PSC 2150 Series" + Attribute "NickName" "" "HP PSC 2150 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP PSC 2150 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2150 series;DES:psc 2150 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2150 Series;DES:psc 2150 series;" + PCFileName "hp-psc_2150_series.ppd" + Attribute "Product" "" "(HP PSC 2150 All-in-one Printer)" + } +@@ -1749,7 +1749,7 @@ Manufacturer "HP" + ModelName "HP PSC 2170 Series" + Attribute "NickName" "" "HP PSC 2170 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP PSC 2170 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2170 series;DES:psc 2170 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2170 Series;DES:psc 2170 series;" + PCFileName "hp-psc_2170_series.ppd" + Attribute "Product" "" "(HP PSC 2170 All-in-one Printer)" + Attribute "Product" "" "(HP PSC 2171 All-in-one Printer)" +@@ -1977,7 +1977,7 @@ Manufacturer "HP" + ModelName "HP Business Inkjet 2200" + Attribute "NickName" "" "HP Business Inkjet 2200, hpcups $Version" + Attribute "ShortNickName" "" "HP Business Inkjet 2200" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2200;DES:hp business inkjet 2200;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2200;DES:Hewlett-Packard Business Inkjet 2200;" + PCFileName "hp-business_inkjet_2200.ppd" + Attribute "Product" "" "(HP Business Inkjet 2200 Printer)" + Attribute "Product" "" "(HP Business Inkjet 2200se Printer)" +@@ -1987,7 +1987,7 @@ Manufacturer "HP" + ModelName "HP Business Inkjet 2230" + Attribute "NickName" "" "HP Business Inkjet 2230, hpcups $Version" + Attribute "ShortNickName" "" "HP Business Inkjet 2230" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2230;DES:hp business inkjet 2230;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2230;DES:Hewlett-Packard Business Inkjet 2230;" + PCFileName "hp-business_inkjet_2230.ppd" + Attribute "Product" "" "(HP Business Inkjet 2230 Printer)" + } +@@ -1995,7 +1995,7 @@ Manufacturer "HP" + ModelName "HP Business Inkjet 2250" + Attribute "NickName" "" "HP Business Inkjet 2250 pcl3, hpcups $Version" + Attribute "ShortNickName" "" "HP Business Inkjet 2250" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2250;DES:hp business inkjet 2250;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2250;DES:Hewlett-Packard Business Inkjet 2250;" + PCFileName "hp-business_inkjet_2250-pcl3.ppd" + Attribute "Product" "" "(HP Business Inkjet 2250 Printer)" + Attribute "Product" "" "(HP Business Inkjet 2250tn Printer)" +@@ -2004,7 +2004,7 @@ Manufacturer "HP" + ModelName "HP Business Inkjet 2280" + Attribute "NickName" "" "HP Business Inkjet 2280 pcl3, hpcups $Version" + Attribute "ShortNickName" "" "HP Business Inkjet 2280" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2280;DES:hp business inkjet 2280;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2280;DES:Hewlett-Packard Business Inkjet 2280;" + PCFileName "hp-business_inkjet_2280-pcl3.ppd" + Attribute "Product" "" "(HP Business Inkjet 2280 Printer)" + Attribute "Product" "" "(HP Business Inkjet 2280tn Printer)" +@@ -2522,7 +2522,7 @@ Manufacturer "HP" + ModelName "HP PSC 2200 Series" + Attribute "NickName" "" "HP PSC 2200 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP PSC 2200 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2200 series;DES:psc 2200 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2200 Series;DES:psc 2200 series;" + PCFileName "hp-psc_2200_series.ppd" + Attribute "Product" "" "(HP PSC 2200 All-in-one Printer)" + } +@@ -2540,7 +2540,7 @@ Manufacturer "HP" + ModelName "HP PSC 2300 Series" + Attribute "NickName" "" "HP PSC 2300 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP PSC 2300 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2300 series;DES:psc 2300 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2300 Series;DES:psc 2300 series;" + PCFileName "hp-psc_2300_series.ppd" + Attribute "Product" "" "(HP PSC 2300 Series All-in-one Printer)" + Attribute "Product" "" "(HP PSC 2310 All-in-one Printer)" +@@ -2549,7 +2549,7 @@ Manufacturer "HP" + ModelName "HP PSC 2350 Series" + Attribute "NickName" "" "HP PSC 2350 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP PSC 2350 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2350 series;DES:psc 2350 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2350 Series;DES:psc 2350 series;" + PCFileName "hp-psc_2350_series.ppd" + Attribute "Product" "" "(HP PSC 2350 All-in-one Printer)" + Attribute "Product" "" "(HP PSC 2352 All-in-one Printer)" +@@ -2592,7 +2592,7 @@ Manufacturer "HP" + ModelName "HP PSC 2500 Series" + Attribute "NickName" "" "HP PSC 2500 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP PSC 2500 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2500 series;DES:psc 2500 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:PSC 2500 Series;DES:psc 2500 series;" + PCFileName "hp-psc_2500_series.ppd" + Attribute "Product" "" "(HP PSC 2500 Photosmart All-in-one Printer)" + Attribute "Product" "" "(HP PSC 2510 Photosmart All-in-one Printer)" +@@ -3040,7 +3040,7 @@ Manufacturer "HP" + ModelName "HP Officejet j5700 Series" + Attribute "NickName" "" "HP Officejet j5700 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet j5700 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet j5700 series;DES:officejet j5700 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:Officejet J5700 series;DES:officejet j5700 series;" + PCFileName "hp-officejet_j5700_series.ppd" + Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet j5725 All-in-one Printer)" +@@ -3126,7 +3126,7 @@ Manufacturer "HP" + ModelName "HP Officejet 6100 Series" + Attribute "NickName" "" "HP Officejet 6100 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet 6100 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 6100 series;DES:officejet 6100 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 6100 Series;DES:officejet 6100 series;" + PCFileName "hp-officejet_6100_series.ppd" + Attribute "Product" "" "(HP Officejet 6105 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 6110xi All-in-one Printer)" +@@ -3350,7 +3350,7 @@ Manufacturer "HP" + ModelName "HP Officejet 7200 Series" + Attribute "NickName" "" "HP Officejet 7200 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet 7200 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 7200 series;DES:officejet 7200 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 7200 series;DES:officejet 7200 series;" + PCFileName "hp-officejet_7200_series.ppd" + Attribute "Product" "" "(HP Officejet 7205 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 7208 All-in-one Printer)" +@@ -3452,7 +3452,7 @@ Manufacturer "HP" + ModelName "HP Officejet 7400 Series" + Attribute "NickName" "" "HP Officejet 7400 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet 7400 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 7400 series;DES:officejet 7400 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 7400 series;DES:officejet 7400 series;" + PCFileName "hp-officejet_7400_series.ppd" + Attribute "Product" "" "(HP Officejet 7408 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 7410 All-in-one Printer)" +@@ -11486,7 +11486,7 @@ Manufacturer "HP" + ModelName "HP PSC 1100 Series" + Attribute "NickName" "" "HP PSC 1100 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP PSC 1100 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 1100 series;DES:psc 1100 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:psc 1100 series;DES:psc 1100 series;" + PCFileName "hp-psc_1100_series.ppd" + Attribute "Product" "" "(HP PSC 1110 All-in-one Printer)" + Attribute "Product" "" "(HP PSC 1110v All-in-one Printer)" +@@ -11496,7 +11496,7 @@ Manufacturer "HP" + ModelName "HP PSC 1200 Series" + Attribute "NickName" "" "HP PSC 1200 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP PSC 1200 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 1200 series;DES:psc 1200 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:psc 1200 series;DES:psc 1200 series;" + PCFileName "hp-psc_1200_series.ppd" + Attribute "Product" "" "(HP PSC 1200 All-in-one Printer)" + Attribute "Product" "" "(HP PSC 1205 All-in-one Printer)" +@@ -11688,7 +11688,7 @@ Manufacturer "HP" + ModelName "HP Officejet 4100 Series" + Attribute "NickName" "" "HP Officejet 4100 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet 4100 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 4100 series;DES:officejet 4100 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-packard;MDL:officejet 4100 series;DES:officejet 4100 series;" + PCFileName "hp-officejet_4100_series.ppd" + Attribute "Product" "" "(HP Officejet 4100 Series All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 4110xi All-in-one Printer)" +@@ -11715,7 +11715,7 @@ Manufacturer "HP" + ModelName "HP Officejet 4300 Series" + Attribute "NickName" "" "HP Officejet 4300 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet 4300 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 4300 series;DES:officejet 4300 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:Officejet 4300 series;DES:officejet 4300 series;" + PCFileName "hp-officejet_4300_series.ppd" + Attribute "Product" "" "(HP Officejet 4308 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 4311 All-in-one Printer)" +@@ -12026,7 +12026,7 @@ Manufacturer "HP" + ModelName "HP Officejet j3600 Series" + Attribute "NickName" "" "HP Officejet j3600 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet j3600 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet j3600 series;DES:officejet j3600 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:Officejet J3600 series;DES:officejet j3600 series;" + PCFileName "hp-officejet_j3600_series.ppd" + Attribute "Product" "" "(HP Officejet j3608 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet j3625 All-in-one Printer)" +@@ -12086,7 +12086,7 @@ Manufacturer "HP" + ModelName "HP Officejet 4200 Series" + Attribute "NickName" "" "HP Officejet 4200 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet 4200 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 4200 series;DES:officejet 4200 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 4200 series;DES:officejet 4200 series;" + PCFileName "hp-officejet_4200_series.ppd" + Attribute "Product" "" "(HP Officejet 4200 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 4211 All-in-one Printer)" +@@ -12609,6 +12609,7 @@ Manufacturer "HP" + Attribute "NickName" "" "HP Photosmart 380 Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Photosmart 380 Series" + Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart 380 series;DES:photosmart 380 series;" ++ Attribute "1284DeviceID" "" "MFG:HP;MDL:Photosmart 380 series_BT;DES:385;" + PCFileName "hp-photosmart_380_series.ppd" + Attribute "Product" "" "(HP Photosmart 385 Compact Photo Printer)" + Attribute "Product" "" "(HP Photosmart 385xi Compact Photo Printer)" +@@ -14554,7 +14557,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Business Inkjet 2300" + Attribute "NickName" "" "HP Business Inkjet 2300 pcl3, hpcups $Version" + Attribute "ShortNickName" "" "HP Business Inkjet 2300" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2300;DES:hp business inkjet 2300;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2300;DES:Hewlett-Packard Business Inkjet 2300;" + PCFileName "hp-business_inkjet_2300-pcl3.ppd" + Attribute "Product" "" "(HP Business Inkjet 2300 Printer)" + Attribute "Product" "" "(HP Business Inkjet 2300n Printer)" +@@ -14818,7 +14821,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet 9100 Series" + Attribute "NickName" "" "HP Officejet 9100 Series pcl3, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet 9100 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 9100 series;DES:officejet 9100 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:officejet 9100 series;DES:officejet 9100 series;" + PCFileName "hp-officejet_9100_series-pcl3.ppd" + Attribute "Product" "" "(HP Officejet 9110 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 9120 All-in-one Printer)" +@@ -14902,7 +14905,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Business Inkjet 2800" + Attribute "NickName" "" "HP Business Inkjet 2800 pcl3, hpcups $Version" + Attribute "ShortNickName" "" "HP Business Inkjet 2800" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp business inkjet 2800;DES:hp business inkjet 2800;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:HP BUSINESS INKJET 2800;DES:Hewlett-Packard Business Inkjet 2800;" + PCFileName "hp-business_inkjet_2800-pcl3.ppd" + Attribute "Product" "" "(HP Business Inkjet 2800 Printer)" + Attribute "Product" "" "(HP Business Inkjet 2800dt Printer)" +@@ -15445,7 +15448,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet Lx" + Attribute "NickName" "" "HP Officejet Lx, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet Lx" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet lx;DES:officejet lx;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet;DES:officejet lx;" + PCFileName "hp-officejet_lx.ppd" + Attribute "Product" "" "(HP Officejet Lx All-in-one Printer)" + } +@@ -15574,7 +15577,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet Series 300" + Attribute "NickName" "" "HP Officejet Series 300, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet Series 300" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet series 300;DES:officejet series 300;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet Series 300;DES:Hewlett-Packard OfficeJet Series 300;" + PCFileName "hp-officejet_series_300.ppd" + Attribute "Product" "" "(HP Officejet 300 All-in-one Printer)" + } +@@ -15598,7 +15601,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 400" + Attribute "NickName" "" "HP Deskjet 400, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 400" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp deskjet 400;DES:hp deskjet 400;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP DeskJet 400;DES:HP DeskJet 400 Printer;" + PCFileName "hp-deskjet_400.ppd" + Attribute "Product" "" "(HP Deskjet 400 Printer)" + Attribute "Product" "" "(HP Deskjet 400 Color Capable Printer)" +@@ -15615,7 +15618,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 540" + Attribute "NickName" "" "HP Deskjet 540, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 540" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 540;DES:deskjet 540;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 540;DES:Hewlett-Packard DeskJet 540;" + PCFileName "hp-deskjet_540.ppd" + Attribute "Product" "" "(HP Deskjet 540 Printer)" + } +@@ -15740,7 +15743,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 630c" + Attribute "NickName" "" "HP Deskjet 630c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 630c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 630c;DES:deskjet 630c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 630C;DES:Hewlett-Packard DeskJet 630C;" + PCFileName "hp-deskjet_630c.ppd" + Attribute "Product" "" "(HP Deskjet 630c Printer)" + } +@@ -15756,7 +15759,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 656c" + Attribute "NickName" "" "HP Deskjet 656c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 656c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 656c;DES:deskjet 656c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 656C;DES:DESKJET 656C;" + PCFileName "hp-deskjet_656c.ppd" + Attribute "Product" "" "(HP Deskjet 656c Printer)" + Attribute "Product" "" "(HP Deskjet 656cvr Printer)" +@@ -15869,7 +15872,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 600" + Attribute "NickName" "" "HP Deskjet 600, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 600" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 600;DES:deskjet 600;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 600;DES:Hewlett-Packard DeskJet 600;" + PCFileName "hp-deskjet_600.ppd" + Attribute "Product" "" "(HP Deskjet 600c Printer)" + Attribute "Product" "" "(HP Deskjet 600 Printer)" +@@ -15931,7 +15934,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet Series 600" + Attribute "NickName" "" "HP Officejet Series 600, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet Series 600" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet series 600;DES:officejet series 600;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet Series 600;DES:officejet series 600;" + PCFileName "hp-officejet_series_600.ppd" + Attribute "Product" "" "(HP Officejet 600 All-in-one Printer)" + } +@@ -15983,7 +15986,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 670c" + Attribute "NickName" "" "HP Deskjet 670c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 670c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 670c;DES:deskjet 670c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 670C;DES:Hewlett-Packard DeskJet 670C;" + PCFileName "hp-deskjet_670c.ppd" + Attribute "Product" "" "(HP Deskjet 670c)" + } +@@ -16127,7 +16130,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 610c" + Attribute "NickName" "" "HP Deskjet 610c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 610c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 610c;DES:deskjet 610c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 610C;DES:Hewlett-Packard DeskJet 610C;" + PCFileName "hp-deskjet_610c.ppd" + Attribute "Product" "" "(HP Deskjet 610c Printer)" + } +@@ -16151,7 +16154,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 640c" + Attribute "NickName" "" "HP Deskjet 640c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 640c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 640c;DES:deskjet 640c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 640C;DES:Hewlett-Packard DeskJet 640C;" + PCFileName "hp-deskjet_640c.ppd" + Attribute "Product" "" "(HP Deskjet 640c Lite Printer)" + Attribute "Product" "" "(HP Deskjet 640c Printer)" +@@ -16171,7 +16174,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 690c" + Attribute "NickName" "" "HP Deskjet 690c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 690c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 690c;DES:deskjet 690c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 690C;DES:Hewlett-Packard DeskJet 690C;" + PCFileName "hp-deskjet_690c.ppd" + Attribute "Product" "" "(HP Deskjet 690c Plus Printer)" + Attribute "Product" "" "(HP Deskjet 690c Printer)" +@@ -16231,7 +16234,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet Series 700" + Attribute "NickName" "" "HP Officejet Series 700, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet Series 700" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet series 700;DES:officejet series 700;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet Series 700;DES:officejet series 700;" + PCFileName "hp-officejet_series_700.ppd" + Attribute "Product" "" "(HP Officejet 700 All-in-one Printer)" + } +@@ -16382,7 +16385,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 812c" + Attribute "NickName" "" "HP Deskjet 812c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 812c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 812c;DES:deskjet 812c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 810C;DES:Hewlett-Packard DeskJet 810C;" + PCFileName "hp-deskjet_812c.ppd" + Attribute "Product" "" "(HP Deskjet 812c Printer)" + } +@@ -16390,7 +16393,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 815c" + Attribute "NickName" "" "HP Deskjet 815c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 815c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 815c;DES:deskjet 815c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 815C;DES:Hewlett-Packard DeskJet 815C;" + PCFileName "hp-deskjet_815c.ppd" + Attribute "Product" "" "(HP Deskjet 815c Printer)" + } +@@ -16422,7 +16425,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 840c" + Attribute "NickName" "" "HP Deskjet 840c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 840c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 840c;DES:deskjet 840c;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:DeskJet 840C;DES:deskjet 840c;" + PCFileName "hp-deskjet_840c.ppd" + Attribute "Product" "" "(HP Deskjet 840c Printer)" + } +@@ -16430,7 +16433,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 841c" + Attribute "NickName" "" "HP Deskjet 841c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 841c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 841c;DES:deskjet 841c;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:DeskJet 841C;DES:deskjet 841c;" + PCFileName "hp-deskjet_841c.ppd" + Attribute "Product" "" "(HP Deskjet 841c Printer)" + } +@@ -16446,7 +16449,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 843c" + Attribute "NickName" "" "HP Deskjet 843c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 843c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 843c;DES:deskjet 843c;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:DeskJet 843C;DES:deskjet 843c;" + PCFileName "hp-deskjet_843c.ppd" + Attribute "Product" "" "(HP Deskjet 843c Printer)" + Attribute "Product" "" "(HP Deskjet 843cxe Printer)" +@@ -16455,7 +16458,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 880c" + Attribute "NickName" "" "HP Deskjet 880c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 880c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 880c;DES:deskjet 880c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 880C;DES:Hewlett-Packard DeskJet 880C;" + PCFileName "hp-deskjet_880c.ppd" + Attribute "Product" "" "(HP Deskjet 880c Printer)" + } +@@ -16471,7 +16474,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 895c" + Attribute "NickName" "" "HP Deskjet 895c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 895c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 895c;DES:deskjet 895c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 895C;DES:Hewlett-Packard DeskJet 895C;" + PCFileName "hp-deskjet_895c.ppd" + Attribute "Product" "" "(HP Deskjet 895cse Printer)" + Attribute "Product" "" "(HP Deskjet 895c Printer)" +@@ -16481,7 +16484,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet r40" + Attribute "NickName" "" "HP Officejet r40, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet r40" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet r40;DES:officejet r40;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET R40;DES:Hewlett-Packard OfficeJet R40;" + PCFileName "hp-officejet_r40.ppd" + Attribute "Product" "" "(HP Officejet r40 All-in-one Printer)" + } +@@ -16505,7 +16508,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet r60" + Attribute "NickName" "" "HP Officejet r60, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet r60" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet r60;DES:officejet r60;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET R60;DES:Hewlett-Packard OfficeJet R60;" + PCFileName "hp-officejet_r60.ppd" + Attribute "Product" "" "(HP Officejet r60 All-in-one Printer)" + } +@@ -16513,7 +16516,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet r65" + Attribute "NickName" "" "HP Officejet r65, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet r65" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet r65;DES:officejet r65;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET R65;DES:Hewlett-Packard OfficeJet R65;" + PCFileName "hp-officejet_r65.ppd" + Attribute "Product" "" "(HP Officejet r65 All-in-one Printer)" + } +@@ -16521,7 +16524,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet r80" + Attribute "NickName" "" "HP Officejet r80, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet r80" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet r80;DES:officejet r80;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET R80;DES:Hewlett-Packard OfficeJet R80;" + PCFileName "hp-officejet_r80.ppd" + Attribute "Product" "" "(HP Officejet r80 All-in-one Printer)" + } +@@ -16537,7 +16540,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet T Series" + Attribute "NickName" "" "HP Officejet T Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet T Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet t series;DES:officejet t series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet T Series;DES:Hewlett-Packard OfficeJet T Series;" + PCFileName "hp-officejet_t_series.ppd" + Attribute "Product" "" "(HP Officejet t45 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet t45xi All-in-one Printer)" +@@ -16548,7 +16551,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP PSC 500" + Attribute "NickName" "" "HP PSC 500, hpcups $Version" + Attribute "ShortNickName" "" "HP PSC 500" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 500;DES:psc 500;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:PSC 500;DES:Hewlett-Packard PSC 500;" + PCFileName "hp-psc_500.ppd" + Attribute "Product" "" "(HP PSC 500 All-in-one Printer)" + Attribute "Product" "" "(HP PSC 500xi All-in-one Printer)" +@@ -16664,7 +16667,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 825c" + Attribute "NickName" "" "HP Deskjet 825c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 825c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 825c;DES:deskjet 825c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 825C;DES:Hewlett-Packard DeskJet 825C;" + PCFileName "hp-deskjet_825c.ppd" + Attribute "Product" "" "(HP Deskjet 825cvr Printer)" + Attribute "Product" "" "(HP Deskjet 825c Printer)" +@@ -16673,7 +16676,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 845c" + Attribute "NickName" "" "HP Deskjet 845c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 845c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 845c;DES:deskjet 845c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 845C;DES:Hewlett-Packard DeskJet 845C;" + PCFileName "hp-deskjet_845c.ppd" + Attribute "Product" "" "(HP Deskjet 845c Printer)" + Attribute "Product" "" "(HP Deskjet 845cvr Printer)" +@@ -16784,7 +16787,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet Pro 1150c" + Attribute "NickName" "" "HP Officejet Pro 1150c, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet Pro 1150c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 1150c;DES:officejet pro 1150c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET PRO 1150C;DES:Hewlett-Packard OfficeJet Pro 1150C;" + PCFileName "hp-officejet_pro_1150c.ppd" + Attribute "Product" "" "(HP Officejet Pro 1150c All-in-one Printer)" + Attribute "Product" "" "(HP Officejet Pro 1150cse All-in-one Printer)" +@@ -16793,7 +16796,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 850c" + Attribute "NickName" "" "HP Deskjet 850c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 850c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 850c;DES:deskjet 850c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 850C;DES:Hewlett-Packard Deskjet 850C;" + PCFileName "hp-deskjet_850c.ppd" + Attribute "Product" "" "(HP Deskjet 850k Printer)" + Attribute "Product" "" "(HP Deskjet 850c Printer)" +@@ -16812,7 +16815,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 870c" + Attribute "NickName" "" "HP Deskjet 870c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 870c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 870c;DES:deskjet 870c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 870C;DES:Hewlett-Packard Deskjet 870C;" + PCFileName "hp-deskjet_870c.ppd" + Attribute "Product" "" "(HP Deskjet 870k Printer)" + Attribute "Product" "" "(HP Deskjet 870c Printer)" +@@ -16928,7 +16931,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet Pro 1170c Series" + Attribute "NickName" "" "HP Officejet Pro 1170c Series, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet Pro 1170c Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 1170c series;DES:officejet pro 1170c series;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:OFFICEJET PRO 1170C SERIES;DES:Hewlett-Packard OfficeJet Pro 1170C Series;" + PCFileName "hp-officejet_pro_1170c_series.ppd" + Attribute "Product" "" "(HP Officejet Pro 1170c All-in-one Printer)" + Attribute "Product" "" "(HP Officejet Pro 1170cse All-in-one Printer)" +@@ -16941,7 +16944,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 890c" + Attribute "NickName" "" "HP Deskjet 890c, hpcups $Version" + Attribute "ShortNickName" "" "HP Deskjet 890c" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 890c;DES:deskjet 890c;" ++ Attribute "1284DeviceID" "" "MFG:HEWLETT-PACKARD;MDL:DESKJET 890C;DES:Hewlett-Packard Deskjet 890C;" + PCFileName "hp-deskjet_890c.ppd" + Attribute "Product" "" "(HP Deskjet 890cse Printer)" + Attribute "Product" "" "(HP Deskjet 890c Printer)" diff --git a/SOURCES/hplip-deviceIDs-ppd.patch b/SOURCES/hplip-deviceIDs-ppd.patch new file mode 100644 index 0000000..810fdc3 --- /dev/null +++ b/SOURCES/hplip-deviceIDs-ppd.patch @@ -0,0 +1,11 @@ +diff -up hplip-3.14.10/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz-deviceid hplip-3.14.10/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd +--- hplip-3.14.10/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz-deviceid 2014-11-04 09:41:13.200005393 +0000 ++++ hplip-3.14.10/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd 2014-11-04 09:42:13.168312042 +0000 +@@ -82,6 +82,7 @@ + *cupsManualCopies: False + *cupsLanguages: "en da de es fi fr it ja ko nb nl pt ru sv zh_CN zh_TW" + *cupsFilter: "application/vnd.cups-postscript 0 hpps" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 400 color M451dn;DES:HP LaserJet 400 color M451dn;" + *UIConstraints: *HPOption_Duplexer False *Duplex + *UIConstraints: *Duplex *HPOption_Duplexer False + *UIConstraints: *HPOption_Tray3 False *InputSlot Tray3 diff --git a/SOURCES/hplip-dj990c-margin.patch b/SOURCES/hplip-dj990c-margin.patch new file mode 100644 index 0000000..1091384 --- /dev/null +++ b/SOURCES/hplip-dj990c-margin.patch @@ -0,0 +1,15 @@ +diff -up hplip-3.14.10/prnt/drv/hpcups.drv.in.dj990c-margin hplip-3.14.10/prnt/drv/hpcups.drv.in +--- hplip-3.14.10/prnt/drv/hpcups.drv.in.dj990c-margin 2014-12-23 15:55:09.779368939 +0000 ++++ hplip-3.14.10/prnt/drv/hpcups.drv.in 2014-12-23 15:55:24.488454126 +0000 +@@ -1531,9 +1531,9 @@ Manufacturer "HP" + "<>setpagedevice" + CustomMedia "Letter.Duplex/Letter AutoDuplex 8.5x11in" 612 783 18 27 18 36 "<>setpagedevice" + "<>setpagedevice" +- CustomMedia "A4/A4 210x297mm" 595.44 841.68 18 36.00 18 9.00 "<>setpagedevice" ++ CustomMedia "A4/A4 210x297mm" 595.44 841.68 9 36.00 9 9.00 "<>setpagedevice" + "<>setpagedevice" +- CustomMedia "A4.Duplex/A4 AutoDuplex 210x297mm" 595 833 18 27 18 36 "<>setpagedevice" ++ CustomMedia "A4.Duplex/A4 AutoDuplex 210x297mm" 595 833 9 27 9 36 "<>setpagedevice" + "<>setpagedevice" + CustomMedia "ExecutiveJIS/Executive (JIS) 8.5x12.986in" 612 936 18 36 18 9 "<>setpagedevice" + "<>setpagedevice" diff --git a/SOURCES/hplip-do-not-crash-on-usb-failure.patch b/SOURCES/hplip-do-not-crash-on-usb-failure.patch new file mode 100644 index 0000000..28ec2a8 --- /dev/null +++ b/SOURCES/hplip-do-not-crash-on-usb-failure.patch @@ -0,0 +1,114 @@ +diff -up hplip-3.15.9/io/hpmud/musb.c.hplip-usb-no-crash hplip-3.15.9/io/hpmud/musb.c +--- hplip-3.15.9/io/hpmud/musb.c.hplip-usb-no-crash 2016-06-10 12:51:45.981782728 +0200 ++++ hplip-3.15.9/io/hpmud/musb.c 2016-06-10 13:07:57.691178754 +0200 +@@ -691,7 +691,8 @@ static libusb_device *get_libusb_device( + int numdevs = 0; /* number of connected devices */ + int i, conf, iface, altset ; + +- libusb_init(&libusb_ctx); ++ i = libusb_init(&libusb_ctx); ++ if (i) goto bugout; + numdevs = libusb_get_device_list(libusb_ctx, &libusb_dev_list); + for (i=0; i< numdevs; i++) + { +@@ -2022,7 +2023,7 @@ bugout: + int __attribute__ ((visibility ("hidden"))) musb_probe_devices(char *lst, int lst_size, int *cnt) + { + libusb_context *ctx = NULL; +- libusb_device **list; /*List of connected USB devices */ ++ libusb_device **list = NULL; /*List of connected USB devices */ + libusb_device *dev = NULL; /* Current device */ + struct libusb_device_descriptor devdesc; /* Current device descriptor */ + struct libusb_config_descriptor *confptr = NULL; /* Pointer to current configuration */ +@@ -2039,7 +2040,8 @@ int __attribute__ ((visibility ("hidden" + char serial[128], mfg[128], sz[HPMUD_LINE_SIZE]; + int r, size=0; + +- libusb_init(&ctx); ++ i = libusb_init(&ctx); ++ if (i) goto bugout; + numdevs = libusb_get_device_list(ctx, &list); + + if (numdevs <= 0) +@@ -2135,12 +2137,14 @@ int __attribute__ ((visibility ("hidden" + }//end for loop + + bugout: +- if (!hd) ++ if (hd) + libusb_close(hd); + if (confptr) + libusb_free_config_descriptor(confptr); +- libusb_free_device_list(list, 1); +- libusb_exit(ctx); ++ if (list) ++ libusb_free_device_list(list, 1); ++ if (ctx) ++ libusb_exit(ctx); + + return size; + } +@@ -2148,7 +2152,7 @@ bugout: + enum HPMUD_RESULT hpmud_make_usb_uri(const char *busnum, const char *devnum, char *uri, int uri_size, int *bytes_read) + { + libusb_context *ctx = NULL; +- libusb_device **list; /*List of connected USB devices */ ++ libusb_device **list = NULL; /*List of connected USB devices */ + libusb_device *dev = NULL, *found_dev=NULL; + libusb_device_handle *hd=NULL; + struct libusb_device_descriptor devdesc; /* Current device descriptor */ +@@ -2166,7 +2170,8 @@ enum HPMUD_RESULT hpmud_make_usb_uri(con + + *bytes_read=0; + +- libusb_init(&ctx); ++ i = libusb_init(&ctx); ++ if (i) goto bugout; + numdevs = libusb_get_device_list(ctx, &list); + + if (numdevs <= 0) +@@ -2269,8 +2274,10 @@ bugout: + if (hd != NULL) + libusb_close(hd); + +- libusb_free_device_list(list, 1); +- libusb_exit(ctx); ++ if (list) ++ libusb_free_device_list(list, 1); ++ if (ctx) ++ libusb_exit(ctx); + + return stat; + } +@@ -2278,7 +2285,7 @@ bugout: + enum HPMUD_RESULT hpmud_make_usb_serial_uri(const char *sn, char *uri, int uri_size, int *bytes_read) + { + libusb_context *ctx = NULL; +- libusb_device **list; /*List of connected USB devices */ ++ libusb_device **list = NULL; /*List of connected USB devices */ + libusb_device *dev = NULL, *found_dev=NULL; + + char model[128]; +@@ -2289,7 +2296,8 @@ enum HPMUD_RESULT hpmud_make_usb_serial_ + + *bytes_read=0; + +- libusb_init(&ctx); ++ i = libusb_init(&ctx); ++ if (i) goto bugout; + numdevs = libusb_get_device_list(ctx, &list); + + if (numdevs <= 0) +@@ -2315,8 +2323,10 @@ enum HPMUD_RESULT hpmud_make_usb_serial_ + stat = HPMUD_R_OK; + + bugout: +- libusb_free_device_list(list, 1); +- libusb_exit(ctx); ++ if (list) ++ libusb_free_device_list(list, 1); ++ if (ctx) ++ libusb_exit(ctx); + + return stat; + } diff --git a/SOURCES/hplip-hpcups-sigpipe.patch b/SOURCES/hplip-hpcups-sigpipe.patch new file mode 100644 index 0000000..3dbe0b0 --- /dev/null +++ b/SOURCES/hplip-hpcups-sigpipe.patch @@ -0,0 +1,29 @@ +diff -up hplip-3.9.8/prnt/hpijs/services.cpp.hpcups-sigpipe hplip-3.9.8/prnt/hpijs/services.cpp +--- hplip-3.9.8/prnt/hpijs/services.cpp.hpcups-sigpipe 2009-08-04 22:35:41.000000000 +0100 ++++ hplip-3.9.8/prnt/hpijs/services.cpp 2009-10-29 11:56:23.015022337 +0000 +@@ -29,6 +29,7 @@ + POSSIBILITY OF SUCH DAMAGE. + \*****************************************************************************/ + ++#include + #include + #include + #include +@@ -382,8 +383,16 @@ DRIVER_ERROR UXServices::ToDevice(const + if (write(OutputPath, pBuffer, *Count) != (ssize_t)*Count) + { + static int cnt=0; +- if (cnt++ < 5) ++ if (cnt < 5) ++ { ++ cnt++; + BUG("unable to write to output, fd=%d, count=%d: %m\n", OutputPath, *Count); ++ } ++ ++ if (errno == EPIPE) ++ /* The backend has exited. There's no recovering from that. */ ++ exit (1); ++ + return IO_ERROR; + } + diff --git a/SOURCES/hplip-hpijs-marker-supply.patch b/SOURCES/hplip-hpijs-marker-supply.patch new file mode 100644 index 0000000..2de8e64 --- /dev/null +++ b/SOURCES/hplip-hpijs-marker-supply.patch @@ -0,0 +1,32 @@ +diff -up hplip-3.10.9/prnt/hpijs/hpijs.cpp.hpijs-marker-supply hplip-3.10.9/prnt/hpijs/hpijs.cpp +--- hplip-3.10.9/prnt/hpijs/hpijs.cpp.hpijs-marker-supply 2010-10-18 16:58:23.882993673 +0100 ++++ hplip-3.10.9/prnt/hpijs/hpijs.cpp 2010-10-18 17:00:00.510869032 +0100 +@@ -585,6 +585,7 @@ int main (int argc, char *argv[], char * + char *raster = NULL, *k_raster = NULL; + int status = EXIT_FAILURE; + int ret, n, i, kn=0, width, k_width; ++ int low_marker = 0; + char user_name[32]={0,}; + + openlog("hpijs", LOG_PID, LOG_DAEMON); + +@@ -666,14 +667,17 @@ int main (int argc, char *argv[], char * + case WARN_LOW_INK_YELLOW: + case WARN_LOW_INK_MULTIPLE_PENS: + { +- fputs("STATE: +marker-supply-low-warning\n", stderr); ++ low_marker = 1; + break; + } + default: +- fputs("STATE: +marker-supply-low-warning\n", stderr); ++ low_marker = 1; + } + } + ++ fprintf(stderr, "STATE: %cmarker-supply-low-warning\n", ++ low_marker ? '+' : '-'); ++ + #if 0 + BUG("device model=%s\n", pSS->pPC->PrinterModel()); + BUG("device class=%s\n", pSS->pPC->PrintertypeToString(pSS->pPC->SelectedDevice())); diff --git a/SOURCES/hplip-log-stderr.patch b/SOURCES/hplip-log-stderr.patch new file mode 100644 index 0000000..6c0749f --- /dev/null +++ b/SOURCES/hplip-log-stderr.patch @@ -0,0 +1,37 @@ +diff -up hplip-3.15.2/fax/backend/hpfax.py.log-stderr hplip-3.15.2/fax/backend/hpfax.py +--- hplip-3.15.2/fax/backend/hpfax.py.log-stderr 2015-01-29 13:20:35.000000000 +0100 ++++ hplip-3.15.2/fax/backend/hpfax.py 2015-02-04 15:40:48.360972449 +0100 +@@ -55,7 +55,10 @@ home_dir = '' + + def bug(msg): + syslog.syslog("hpfax[%d]: error: %s\n" % (pid, msg)) +- log.stderr("ERROR: %s\n" % msg) ++ try: ++ log.stderr("ERROR: %s" % msg) ++ except NameError: ++ sys.stderr.write("ERROR: %s\n" % msg) + + + if os.path.exists(config_file): +diff -up hplip-3.15.2/prnt/filters/hpps.log-stderr hplip-3.15.2/prnt/filters/hpps +--- hplip-3.15.2/prnt/filters/hpps.log-stderr 2015-02-04 15:40:48.360972449 +0100 ++++ hplip-3.15.2/prnt/filters/hpps 2015-02-04 15:43:14.796878364 +0100 +@@ -53,10 +53,16 @@ home_dir = '' + + + def bug(m): +- log.stderr("ERROR: %s" % m) ++ try: ++ log.stderr("ERROR: %s" % m) ++ except NameError: ++ sys.stderr.write("ERROR: %s\n" % m) + + def msg(m): +- log.stderr("INFO: %s" % m) ++ try: ++ log.stderr("INFO: %s" % msg) ++ except NameError: ++ sys.stderr.write("INFO: %s\n" % msg) + + if os.path.exists(config_file): + config = configparser.ConfigParser() diff --git a/SOURCES/hplip-logdir.patch b/SOURCES/hplip-logdir.patch new file mode 100644 index 0000000..bbfab9b --- /dev/null +++ b/SOURCES/hplip-logdir.patch @@ -0,0 +1,24 @@ +diff -up hplip-3.15.2/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.15.2/prnt/hpcups/HPCupsFilter.cpp +--- hplip-3.15.2/prnt/hpcups/HPCupsFilter.cpp.logdir 2015-02-04 14:22:43.838774401 +0100 ++++ hplip-3.15.2/prnt/hpcups/HPCupsFilter.cpp 2015-02-04 14:22:43.844774315 +0100 +@@ -619,7 +619,7 @@ int HPCupsFilter::processRasterData(cups + char hpPreProcessedRasterFile[MAX_FILE_PATH_LEN]; //temp file needed to store raster data with swaped pages. + + +- sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name); ++ snprintf(hpPreProcessedRasterFile, sizeof (hpPreProcessedRasterFile), "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name); + + + while (cupsRasterReadHeader2(cups_raster, &cups_header)) +diff -up hplip-3.15.2/prnt/hpcups/SystemServices.cpp.logdir hplip-3.15.2/prnt/hpcups/SystemServices.cpp +--- hplip-3.15.2/prnt/hpcups/SystemServices.cpp.logdir 2015-02-04 14:22:43.844774315 +0100 ++++ hplip-3.15.2/prnt/hpcups/SystemServices.cpp 2015-02-04 14:24:04.080626127 +0100 +@@ -38,7 +38,7 @@ SystemServices::SystemServices(int iLogL + if (iLogLevel & SAVE_OUT_FILE) + { + char fname[MAX_FILE_PATH_LEN]; +- sprintf(fname, "%s/hpcups_%s_out_job%d_XXXXXX",CUPS_TMP_DIR, user_name, job_id); ++ snprintf(fname, sizeof(fname), "%s/hpcups_%s_out_job%d_XXXXXX",CUPS_TMP_DIR, user_name, job_id); + createTempFile(fname, &m_fp); + if (m_fp) + { diff --git a/SOURCES/hplip-no-asm.patch b/SOURCES/hplip-no-asm.patch new file mode 100644 index 0000000..1240c17 --- /dev/null +++ b/SOURCES/hplip-no-asm.patch @@ -0,0 +1,36 @@ +diff -up hplip-3.9.8/ip/xfax.c.no-asm hplip-3.9.8/ip/xfax.c +--- hplip-3.9.8/ip/xfax.c.no-asm 2009-08-04 22:37:28.000000000 +0100 ++++ hplip-3.9.8/ip/xfax.c 2009-08-25 14:44:04.502202418 +0100 +@@ -1680,19 +1680,6 @@ static BOOL bits_flush_to_eol ( + & ((1u<gb_cache; \ +- \ +- asm ("extract %1,%2,%0" \ +- : "=d" (par_result) \ +- : "dI" (g->gb_cache_cnt - n_bits), "dI" (n_bits), "0" (par_result)); \ +-} +- +-#endif + + + +diff -up hplip-3.9.8/scan/sane/common.h.no-asm hplip-3.9.8/scan/sane/common.h +--- hplip-3.9.8/scan/sane/common.h.no-asm 2009-08-25 16:35:14.577203106 +0100 ++++ hplip-3.9.8/scan/sane/common.h 2009-08-25 16:35:29.948216281 +0100 +@@ -53,8 +53,6 @@ + + #define BACKEND_NAME hpaio + +-#define BREAKPOINT __asm( "int3" ) +- + #define OK 1 + #define ERROR 0 + #define MAX_LIST_SIZE 32 +diff -up hplip-3.9.8/scan/sane/hpaio.c.no-asm hplip-3.9.8/scan/sane/hpaio.c diff --git a/SOURCES/hplip-no-write-bytecode.patch b/SOURCES/hplip-no-write-bytecode.patch new file mode 100644 index 0000000..95f3ecc --- /dev/null +++ b/SOURCES/hplip-no-write-bytecode.patch @@ -0,0 +1,27 @@ +diff -up hplip-3.15.9/config_usb_printer.py.no-write-bytecode hplip-3.15.9/config_usb_printer.py +--- hplip-3.15.9/config_usb_printer.py.no-write-bytecode 2015-10-23 15:42:45.252723455 +0100 ++++ hplip-3.15.9/config_usb_printer.py 2015-10-23 15:43:06.695592567 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python -B + # -*- coding: utf-8 -*- + # + # (c) Copyright 2011-2014 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.15.9/fax/backend/hpfax.py.no-write-bytecode hplip-3.15.9/fax/backend/hpfax.py +--- hplip-3.15.9/fax/backend/hpfax.py.no-write-bytecode 2015-10-23 15:42:21.180873748 +0100 ++++ hplip-3.15.9/fax/backend/hpfax.py 2015-10-23 15:42:21.189873691 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python -B + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2009 Hewlett-Packard Development Company, L.P. +diff -up hplip-3.15.9/prnt/filters/hpps.no-write-bytecode hplip-3.15.9/prnt/filters/hpps +--- hplip-3.15.9/prnt/filters/hpps.no-write-bytecode 2016-01-04 16:44:08.000000000 +0100 ++++ hplip-3.15.9/prnt/filters/hpps 2016-01-04 16:50:11.272921194 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python -B + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2012 Hewlett-Packard Development Company, L.P. diff --git a/SOURCES/hplip-ppd-ImageableArea.patch b/SOURCES/hplip-ppd-ImageableArea.patch new file mode 100644 index 0000000..7394bb7 --- /dev/null +++ b/SOURCES/hplip-ppd-ImageableArea.patch @@ -0,0 +1,459 @@ +diff -up hplip-3.14.3/prnt/ps/hp-laserjet_8150_mfp-ps.ppd.ImageableArea hplip-3.14.3/prnt/ps/hp-laserjet_8150_mfp-ps.ppd +--- hplip-3.14.3/prnt/ps/hp-laserjet_8150_mfp-ps.ppd.ImageableArea 2014-03-06 06:11:09.000000000 +0100 ++++ hplip-3.14.3/prnt/ps/hp-laserjet_8150_mfp-ps.ppd 2014-03-07 10:26:54.404913622 +0100 +@@ -3430,7 +3430,7 @@ restore + *CloseUI: *PageRegion + + *DefaultImageableArea: Letter +-*ImageableArea Letter/Letter: "4.00 3.00 606.00 786.00" ++*ImageableArea Letter/Letter: "12.00 12.00 599.76 779.76" + *da.ImageableArea Letter/Letter: "" + *de.ImageableArea Letter/Letter: "" + *es.ImageableArea Letter/Letter: "" +@@ -3462,7 +3462,7 @@ restore + *zh_CN.ImageableArea LetterSmall/信纸 (小): "" + *zh_TW.ImageableArea LetterSmall/Letter (小): "" + +-*ImageableArea Executive/Executive: "3.00 3.00 516.00 750.00" ++*ImageableArea Executive/Executive: "12.00 12.00 509.76 743.76" + *da.ImageableArea Executive/Executive: "" + *de.ImageableArea Executive/Executive: "" + *es.ImageableArea Executive/Exec: "" +@@ -3478,7 +3478,7 @@ restore + *zh_CN.ImageableArea Executive/Executive: "" + *zh_TW.ImageableArea Executive/Executive: "" + +-*ImageableArea Legal/Legal: "64.00 54.00 606.00 1002.00" ++*ImageableArea Legal/Legal: "12.00 12.00 599.76 995.76" + *da.ImageableArea Legal/Legal: "" + *de.ImageableArea Legal/Legal: "" + *es.ImageableArea Legal/Legal: "" +@@ -3494,7 +3494,7 @@ restore + *zh_CN.ImageableArea Legal/Legal: "" + *zh_TW.ImageableArea Legal/Legal: "" + +-*ImageableArea LegalSmall/Legal (Small): "3.00 3.00 548.00 954.00" ++*ImageableArea LegalSmall/Legal (Small): "64.00 54.00 548.00 954.00" + *da.ImageableArea LegalSmall/Legal (lille): "" + *de.ImageableArea LegalSmall/Legal (Klein): "" + *es.ImageableArea LegalSmall/Legal (pequeño): "" +@@ -3510,7 +3510,7 @@ restore + *zh_CN.ImageableArea LegalSmall/Legal (小): "" + *zh_TW.ImageableArea LegalSmall/Legal (小): "" + +-*ImageableArea Tabloid/11x17: "3.00 3.00 786.00 1218.00" ++*ImageableArea Tabloid/11x17: "12.00 12.00 779.76 1211.76" + *da.ImageableArea Tabloid/11x17: "" + *de.ImageableArea Tabloid/11x17 Zoll: "" + *es.ImageableArea Tabloid/11x17: "" +@@ -3526,7 +3526,7 @@ restore + *zh_CN.ImageableArea Tabloid/11x17: "" + *zh_TW.ImageableArea Tabloid/11x17 : "" + +-*ImageableArea w842h1274/11x17 (Oversize 11.7x17.7): "3.00 3.00 836.00 1268.00" ++*ImageableArea w842h1274/11x17 (Oversize 11.7x17.7): "12.00 12.00 829.68 1261.68" + *da.ImageableArea w842h1274/11x17 (overstr. 297 x 450 mm): "" + *de.ImageableArea w842h1274/11x17 Zoll (Übergröße 11,7x17,7 Zoll): "" + *es.ImageableArea w842h1274/11x17 (Extra 11,7x17,7) : "" +@@ -3542,7 +3542,7 @@ restore + *zh_CN.ImageableArea w842h1274/11x17 (超大尺寸 11.7x17.7): "" + *zh_TW.ImageableArea w842h1274/11x17 (Oversize 11.7x17.7): "" + +-*ImageableArea A3/A3: "3.00 3.00 836.00 1185.00" ++*ImageableArea A3/A3: "12.00 12.00 829.44 1178.16" + *da.ImageableArea A3/A3: "" + *de.ImageableArea A3/A3: "" + *es.ImageableArea A3/A3: "" +@@ -3558,7 +3558,7 @@ restore + *zh_CN.ImageableArea A3/A3: "" + *zh_TW.ImageableArea A3/A3: "" + +-*ImageableArea A4/A4: "4.00 3.00 586.00 836.00" ++*ImageableArea A4/A4: "12.00 12.00 582.96 829.44" + *da.ImageableArea A4/A4: "" + *de.ImageableArea A4/A4: "" + *es.ImageableArea A4/A4: "" +@@ -3590,7 +3590,7 @@ restore + *zh_CN.ImageableArea A4Small/A4 (小): "" + *zh_TW.ImageableArea A4Small/A4 (小): "" + +-*ImageableArea A5/A5: "3.00 3.00 414.00 589.00" ++*ImageableArea A5/A5: "12.00 12.00 407.28 582.96" + *da.ImageableArea A5/A5: "" + *de.ImageableArea A5/A5: "" + *es.ImageableArea A5/A5: "" +@@ -3606,7 +3606,7 @@ restore + *zh_CN.ImageableArea A5/A5: "" + *zh_TW.ImageableArea A5/A5: "" + +-*ImageableArea B4/JIS B4: "3.00 3.00 723.00 1026.00" ++*ImageableArea B4/JIS B4: "12.00 12.00 716.16 1019.52" + *da.ImageableArea B4/JIS B4: "" + *de.ImageableArea B4/B4 (JIS): "" + *es.ImageableArea B4/JIS B4: "" +@@ -3622,7 +3622,7 @@ restore + *zh_CN.ImageableArea B4/JIS B4: "" + *zh_TW.ImageableArea B4/JIS B4: "" + +-*ImageableArea B5/JIS B5: "3.00 3.00 510.00 723.00" ++*ImageableArea B5/JIS B5: "12.00 12.00 503.52 716.16" + *da.ImageableArea B5/JIS B5: "" + *de.ImageableArea B5/JIS B5: "" + *es.ImageableArea B5/JIS B5: "" +@@ -3638,7 +3638,7 @@ restore + *zh_CN.ImageableArea B5/JIS B5: "" + *zh_TW.ImageableArea B5/JIS B5: "" + +-*ImageableArea DoublePostcard/Double Postcard (JIS): "3.00 3.00 413.50 561.00" ++*ImageableArea DoublePostcard/Double Postcard (JIS): "12.00 12.00 407.28 554.64" + *da.ImageableArea DoublePostcard/Dobbelt postkort (JIS): "" + *de.ImageableArea DoublePostcard/Doppelte Postkarte (JIS): "" + *es.ImageableArea DoublePostcard/Tarjeta postal doble (JIS): "" +@@ -3654,7 +3654,7 @@ restore + *zh_CN.ImageableArea DoublePostcard/大号明信片 (JIS): "" + *zh_TW.ImageableArea DoublePostcard/雙聯明信片(JIS): "" + +-*ImageableArea w612h935/Executive (JIS): "3.00 3.00 606.00 929.00" ++*ImageableArea w612h935/Executive (JIS): "12.00 12.00 599.76 922.76" + *da.ImageableArea w612h935/Executive (JIS): "" + *de.ImageableArea w612h935/Executive (JIS): "" + *es.ImageableArea w612h935/Exec (JIS): "" +@@ -3670,7 +3670,7 @@ restore + *zh_CN.ImageableArea w612h935/Executive (JIS): "" + *zh_TW.ImageableArea w612h935/Executive (JIS): "" + +-*ImageableArea w558h774/16K: "3.00 3.00 552.00 768.00" ++*ImageableArea w558h774/16K: "12.00 12.00 545.76 761.76" + *da.ImageableArea w558h774/16K: "" + *de.ImageableArea w558h774/16K: "" + *es.ImageableArea w558h774/16K: "" +@@ -3686,7 +3686,7 @@ restore + *zh_CN.ImageableArea w558h774/16K: "" + *zh_TW.ImageableArea w558h774/16K: "" + +-*ImageableArea w774h1116/8K: "3.00 3.00 768.00 1110.00" ++*ImageableArea w774h1116/8K: "12.00 12.00 761.76 1103.76" + *da.ImageableArea w774h1116/8K: "" + *de.ImageableArea w774h1116/8K: "" + *es.ImageableArea w774h1116/8K: "" +@@ -3702,7 +3702,7 @@ restore + *zh_CN.ImageableArea w774h1116/8K: "" + *zh_TW.ImageableArea w774h1116/8K: "" + +-*ImageableArea Env10/Env Comm10: "3.00 3.00 291.00 678.00" ++*ImageableArea Env10/Env Comm10: "12.00 12.00 284.64 671.76" + *da.ImageableArea Env10/Konvolut Comm10: "" + *de.ImageableArea Env10/Umschlag Comm10: "" + *es.ImageableArea Env10/Sobre Comm10: "" +@@ -3718,7 +3718,7 @@ restore + *zh_CN.ImageableArea Env10/Comm10号信封: "" + *zh_TW.ImageableArea Env10/Comm10 信封: "" + +-*ImageableArea EnvMonarch/Env Monarch: "3.00 3.00 273.00 534.00" ++*ImageableArea EnvMonarch/Env Monarch: "12.00 12.00 266.64 527.76" + *da.ImageableArea EnvMonarch/Konvolut Monarch: "" + *de.ImageableArea EnvMonarch/Umschlag Monarch: "" + *es.ImageableArea EnvMonarch/Sobre Monarch: "" +@@ -3734,7 +3734,7 @@ restore + *zh_CN.ImageableArea EnvMonarch/Monarch号信封: "" + *zh_TW.ImageableArea EnvMonarch/Monarch 信封: "" + +-*ImageableArea EnvDL/Env DL: "3.00 3.00 306.00 618.00" ++*ImageableArea EnvDL/Env DL: "12.00 12.00 299.52 611.28" + *da.ImageableArea EnvDL/Konvolut DL: "" + *de.ImageableArea EnvDL/Umschlag DL: "" + *es.ImageableArea EnvDL/Sobre DL: "" +@@ -3750,7 +3750,7 @@ restore + *zh_CN.ImageableArea EnvDL/DL号信封: "" + *zh_TW.ImageableArea EnvDL/DL 信封: "" + +-*ImageableArea EnvC5/Env C5: "3.00 3.00 453.00 643.00" ++*ImageableArea EnvC5/Env C5: "12.00 12.00 446.88 636.72" + *da.ImageableArea EnvC5/Konvolut C5: "" + *de.ImageableArea EnvC5/Umschlag C5: "" + *es.ImageableArea EnvC5/Sobre C5: "" +@@ -3766,7 +3766,7 @@ restore + *zh_CN.ImageableArea EnvC5/C5号信封: "" + *zh_TW.ImageableArea EnvC5/C5 信封: "" + +-*ImageableArea EnvISOB5/Env ISO B5: "3.00 3.00 493.00 703.00" ++*ImageableArea EnvISOB5/Env ISO B5: "12.00 12.00 486.48 696.24" + *da.ImageableArea EnvISOB5/Konvolut ISO B5: "" + *de.ImageableArea EnvISOB5/Umschlag ISO B5: "" + *es.ImageableArea EnvISOB5/Sobre ISO B5: "" +diff -up hplip-3.14.3/prnt/ps/hp-laserjet_9000_mfp-ps.ppd.ImageableArea hplip-3.14.3/prnt/ps/hp-laserjet_9000_mfp-ps.ppd +--- hplip-3.14.3/prnt/ps/hp-laserjet_9000_mfp-ps.ppd.ImageableArea 2014-03-06 06:11:09.000000000 +0100 ++++ hplip-3.14.3/prnt/ps/hp-laserjet_9000_mfp-ps.ppd 2014-03-07 10:26:54.407913581 +0100 +@@ -2593,7 +2593,7 @@ currentpagedevice /MediaProcessing known + *CloseUI: *PageRegion + + *DefaultImageableArea: Letter +-*ImageableArea Letter/Letter: "6.00 6.00 606.00 786.00" ++*ImageableArea Letter/Letter: "12.00 12.00 599.76 779.76" + *da.ImageableArea Letter/Letter: "" + *de.ImageableArea Letter/Letter: "" + *es.ImageableArea Letter/Letter: "" +@@ -2625,7 +2625,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea LetterSmall/信纸 (小): "" + *zh_TW.ImageableArea LetterSmall/Letter (小): "" + +-*ImageableArea Executive/Executive: "6.00 6.00 516.00 750.00" ++*ImageableArea Executive/Executive: "12.00 12.00 509.76 743.76" + *da.ImageableArea Executive/Executive: "" + *de.ImageableArea Executive/Executive: "" + *es.ImageableArea Executive/Exec: "" +@@ -2641,7 +2641,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea Executive/Executive: "" + *zh_TW.ImageableArea Executive/Executive: "" + +-*ImageableArea Legal/Legal: "6.00 6.00 606.00 1002.00" ++*ImageableArea Legal/Legal: "12.00 12.00 599.76 995.76" + *da.ImageableArea Legal/Legal: "" + *de.ImageableArea Legal/Legal: "" + *es.ImageableArea Legal/Legal: "" +@@ -2673,7 +2673,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea LegalSmall/Legal (小): "" + *zh_TW.ImageableArea LegalSmall/Legal (小): "" + +-*ImageableArea Tabloid/11x17: "6.00 6.00 786.00 1218.00" ++*ImageableArea Tabloid/11x17: "12.00 12.00 779.76 1211.76" + *da.ImageableArea Tabloid/11x17: "" + *de.ImageableArea Tabloid/11x17 Zoll: "" + *es.ImageableArea Tabloid/11x17: "" +@@ -2689,7 +2689,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea Tabloid/11x17: "" + *zh_TW.ImageableArea Tabloid/11x17 : "" + +-*ImageableArea w842h1274/11x17 (Oversize 11.7x17.7): "6.00 6.00 836.00 1268.00" ++*ImageableArea w842h1274/11x17 (Oversize 11.7x17.7): "12.00 12.00 829.68 1261.68" + *da.ImageableArea w842h1274/11x17 (overstr. 297 x 450 mm): "" + *de.ImageableArea w842h1274/11x17 Zoll (Übergröße 11,7x17,7 Zoll): "" + *es.ImageableArea w842h1274/11x17 (Extra 11,7x17,7) : "" +@@ -2705,7 +2705,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea w842h1274/11x17 (超大尺寸 11.7x17.7): "" + *zh_TW.ImageableArea w842h1274/11x17 (Oversize 11.7x17.7): "" + +-*ImageableArea A3/A3: "6.00 6.00 836.00 1185.00" ++*ImageableArea A3/A3: "12.00 12.00 829.44 1178.16" + *da.ImageableArea A3/A3: "" + *de.ImageableArea A3/A3: "" + *es.ImageableArea A3/A3: "" +@@ -2721,7 +2721,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea A3/A3: "" + *zh_TW.ImageableArea A3/A3: "" + +-*ImageableArea A4/A4: "6.00 6.00 589.00 836.00" ++*ImageableArea A4/A4: "12.00 12.00 582.96 829.44" + *da.ImageableArea A4/A4: "" + *de.ImageableArea A4/A4: "" + *es.ImageableArea A4/A4: "" +@@ -2753,7 +2753,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea A4Small/A4 (小): "" + *zh_TW.ImageableArea A4Small/A4 (小): "" + +-*ImageableArea A5/A5: "6.00 6.00 414.00 589.00" ++*ImageableArea A5/A5: "12.00 12.00 407.28 582.96" + *da.ImageableArea A5/A5: "" + *de.ImageableArea A5/A5: "" + *es.ImageableArea A5/A5: "" +@@ -2769,7 +2769,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea A5/A5: "" + *zh_TW.ImageableArea A5/A5: "" + +-*ImageableArea B4/JIS B4: "6.00 6.00 723.00 1026.00" ++*ImageableArea B4/JIS B4: "12.00 12.00 716.16 1019.52" + *da.ImageableArea B4/JIS B4: "" + *de.ImageableArea B4/B4 (JIS): "" + *es.ImageableArea B4/JIS B4: "" +@@ -2785,7 +2785,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea B4/JIS B4: "" + *zh_TW.ImageableArea B4/JIS B4: "" + +-*ImageableArea B5/JIS B5: "6.00 6.00 510.00 723.00" ++*ImageableArea B5/JIS B5: "12.00 12.00 503.52 716.16" + *da.ImageableArea B5/JIS B5: "" + *de.ImageableArea B5/JIS B5: "" + *es.ImageableArea B5/JIS B5: "" +@@ -2801,7 +2801,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea B5/JIS B5: "" + *zh_TW.ImageableArea B5/JIS B5: "" + +-*ImageableArea DoublePostcard/Double Postcard (JIS): "6.00 6.00 413.50 561.00" ++*ImageableArea DoublePostcard/Double Postcard (JIS): "12.00 12.00 407.28 554.64" + *da.ImageableArea DoublePostcard/Dobbelt postkort (JIS): "" + *de.ImageableArea DoublePostcard/Doppelte Postkarte (JIS): "" + *es.ImageableArea DoublePostcard/Tarjeta postal doble (JIS): "" +@@ -2817,7 +2817,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea DoublePostcard/大号明信片 (JIS): "" + *zh_TW.ImageableArea DoublePostcard/雙聯明信片(JIS): "" + +-*ImageableArea w612h935/Executive (JIS): "6.00 6.00 606.00 929.00" ++*ImageableArea w612h935/Executive (JIS): "12.00 12.00 599.76 922.76" + *da.ImageableArea w612h935/Executive (JIS): "" + *de.ImageableArea w612h935/Executive (JIS): "" + *es.ImageableArea w612h935/Exec (JIS): "" +@@ -2833,7 +2833,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea w612h935/Executive (JIS): "" + *zh_TW.ImageableArea w612h935/Executive (JIS): "" + +-*ImageableArea w558h774/16K: "6.00 6.00 552.00 768.00" ++*ImageableArea w558h774/16K: "12.00 12.00 545.76 761.76" + *da.ImageableArea w558h774/16K: "" + *de.ImageableArea w558h774/16K: "" + *es.ImageableArea w558h774/16K: "" +@@ -2849,7 +2849,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea w558h774/16K: "" + *zh_TW.ImageableArea w558h774/16K: "" + +-*ImageableArea w774h1116/8K: "6.00 6.00 768.00 1110.00" ++*ImageableArea w774h1116/8K: "12.00 12.00 761.76 1103.76" + *da.ImageableArea w774h1116/8K: "" + *de.ImageableArea w774h1116/8K: "" + *es.ImageableArea w774h1116/8K: "" +@@ -2865,7 +2865,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea w774h1116/8K: "" + *zh_TW.ImageableArea w774h1116/8K: "" + +-*ImageableArea Env10/Env Comm10: "11.00 11.00 286.00 673.00" ++*ImageableArea Env10/Env Comm10: "12.00 12.00 284.64 671.76" + *da.ImageableArea Env10/Konvolut Comm10: "" + *de.ImageableArea Env10/Umschlag Comm10: "" + *es.ImageableArea Env10/Sobre Comm10: "" +diff -up hplip-3.14.3/prnt/ps/hp-laserjet_9000_series-ps.ppd.ImageableArea hplip-3.14.3/prnt/ps/hp-laserjet_9000_series-ps.ppd +--- hplip-3.14.3/prnt/ps/hp-laserjet_9000_series-ps.ppd.ImageableArea 2014-03-06 06:11:09.000000000 +0100 ++++ hplip-3.14.3/prnt/ps/hp-laserjet_9000_series-ps.ppd 2014-03-07 10:26:54.408913567 +0100 +@@ -2660,7 +2660,7 @@ currentpagedevice /MediaProcessing known + *CloseUI: *PageRegion + + *DefaultImageableArea: Letter +-*ImageableArea Letter/Letter: "6.00 6.00 606.00 786.00" ++*ImageableArea Letter/Letter: "12.00 12.00 599.76 779.76" + *da.ImageableArea Letter/Letter: "" + *de.ImageableArea Letter/Letter: "" + *es.ImageableArea Letter/Letter: "" +@@ -2692,7 +2692,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea LetterSmall/信纸 (小): "" + *zh_TW.ImageableArea LetterSmall/Letter (小): "" + +-*ImageableArea Executive/Executive: "6.00 6.00 516.00 750.00" ++*ImageableArea Executive/Executive: "12.00 12.00 509.76 743.76" + *da.ImageableArea Executive/Executive: "" + *de.ImageableArea Executive/Executive: "" + *es.ImageableArea Executive/Exec: "" +@@ -2708,7 +2708,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea Executive/Executive: "" + *zh_TW.ImageableArea Executive/Executive: "" + +-*ImageableArea Legal/Legal: "6.00 6.00 606.00 1002.00" ++*ImageableArea Legal/Legal: "12.00 12.00 599.76 995.76" + *da.ImageableArea Legal/Legal: "" + *de.ImageableArea Legal/Legal: "" + *es.ImageableArea Legal/Legal: "" +@@ -2740,7 +2740,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea LegalSmall/Legal (小): "" + *zh_TW.ImageableArea LegalSmall/Legal (小): "" + +-*ImageableArea Tabloid/11x17: "6.00 6.00 786.00 1218.00" ++*ImageableArea Tabloid/11x17: "12.00 12.00 779.76 1211.76" + *da.ImageableArea Tabloid/11x17: "" + *de.ImageableArea Tabloid/11x17 Zoll: "" + *es.ImageableArea Tabloid/11x17: "" +@@ -2756,7 +2756,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea Tabloid/11x17: "" + *zh_TW.ImageableArea Tabloid/11x17 : "" + +-*ImageableArea w842h1274/11x17 (Oversize 11.7x17.7): "6.00 6.00 836.00 1268.00" ++*ImageableArea w842h1274/11x17 (Oversize 11.7x17.7): "12.00 12.00 829.68 1261.68" + *da.ImageableArea w842h1274/11x17 (overstr. 297 x 450 mm): "" + *de.ImageableArea w842h1274/11x17 Zoll (Übergröße 11,7x17,7 Zoll): "" + *es.ImageableArea w842h1274/11x17 (Extra 11,7x17,7) : "" +@@ -2772,7 +2772,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea w842h1274/11x17 (超大尺寸 11.7x17.7): "" + *zh_TW.ImageableArea w842h1274/11x17 (Oversize 11.7x17.7): "" + +-*ImageableArea A3/A3: "6.00 6.00 836.00 1185.00" ++*ImageableArea A3/A3: "12.00 12.00 829.44 1178.16" + *da.ImageableArea A3/A3: "" + *de.ImageableArea A3/A3: "" + *es.ImageableArea A3/A3: "" +@@ -2788,7 +2788,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea A3/A3: "" + *zh_TW.ImageableArea A3/A3: "" + +-*ImageableArea A4/A4: "6.00 6.00 589.00 836.00" ++*ImageableArea A4/A4: "12.00 12.00 582.96 829.44" + *da.ImageableArea A4/A4: "" + *de.ImageableArea A4/A4: "" + *es.ImageableArea A4/A4: "" +@@ -2820,7 +2820,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea A4Small/A4 (小): "" + *zh_TW.ImageableArea A4Small/A4 (小): "" + +-*ImageableArea A5/A5: "6.00 6.00 414.00 589.00" ++*ImageableArea A5/A5: "12.00 12.00 407.28 582.96" + *da.ImageableArea A5/A5: "" + *de.ImageableArea A5/A5: "" + *es.ImageableArea A5/A5: "" +@@ -2836,7 +2836,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea A5/A5: "" + *zh_TW.ImageableArea A5/A5: "" + +-*ImageableArea B4/JIS B4: "6.00 6.00 723.00 1026.00" ++*ImageableArea B4/JIS B4: "12.00 12.00 716.16 1019.52" + *da.ImageableArea B4/JIS B4: "" + *de.ImageableArea B4/B4 (JIS): "" + *es.ImageableArea B4/JIS B4: "" +@@ -2852,7 +2852,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea B4/JIS B4: "" + *zh_TW.ImageableArea B4/JIS B4: "" + +-*ImageableArea B5/JIS B5: "6.00 6.00 510.00 723.00" ++*ImageableArea B5/JIS B5: "12.00 12.00 503.52 716.16" + *da.ImageableArea B5/JIS B5: "" + *de.ImageableArea B5/JIS B5: "" + *es.ImageableArea B5/JIS B5: "" +@@ -2868,7 +2868,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea B5/JIS B5: "" + *zh_TW.ImageableArea B5/JIS B5: "" + +-*ImageableArea DoublePostcard/Double Postcard (JIS): "6.00 6.00 413.50 561.00" ++*ImageableArea DoublePostcard/Double Postcard (JIS): "12.00 12.00 407.28 554.64" + *da.ImageableArea DoublePostcard/Dobbelt postkort (JIS): "" + *de.ImageableArea DoublePostcard/Doppelte Postkarte (JIS): "" + *es.ImageableArea DoublePostcard/Tarjeta postal doble (JIS): "" +@@ -2884,7 +2884,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea DoublePostcard/大号明信片 (JIS): "" + *zh_TW.ImageableArea DoublePostcard/雙聯明信片(JIS): "" + +-*ImageableArea w612h935/Executive (JIS): "6.00 6.00 606.00 929.00" ++*ImageableArea w612h935/Executive (JIS): "12.00 12.00 599.76 922.76" + *da.ImageableArea w612h935/Executive (JIS): "" + *de.ImageableArea w612h935/Executive (JIS): "" + *es.ImageableArea w612h935/Exec (JIS): "" +@@ -2900,7 +2900,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea w612h935/Executive (JIS): "" + *zh_TW.ImageableArea w612h935/Executive (JIS): "" + +-*ImageableArea w558h774/16K: "6.00 6.00 552.00 768.00" ++*ImageableArea w558h774/16K: "12.00 12.00 545.76 761.76" + *da.ImageableArea w558h774/16K: "" + *de.ImageableArea w558h774/16K: "" + *es.ImageableArea w558h774/16K: "" +@@ -2916,7 +2916,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea w558h774/16K: "" + *zh_TW.ImageableArea w558h774/16K: "" + +-*ImageableArea w774h1116/8K: "6.00 6.00 768.00 1110.00" ++*ImageableArea w774h1116/8K: "12.00 12.00 761.76 1103.76" + *da.ImageableArea w774h1116/8K: "" + *de.ImageableArea w774h1116/8K: "" + *es.ImageableArea w774h1116/8K: "" +@@ -2932,7 +2932,7 @@ currentpagedevice /MediaProcessing known + *zh_CN.ImageableArea w774h1116/8K: "" + *zh_TW.ImageableArea w774h1116/8K: "" + +-*ImageableArea Env10/Env Comm10: "11.00 11.00 286.00 673.00" ++*ImageableArea Env10/Env Comm10: "12.00 12.00 284.64 671.76" + *da.ImageableArea Env10/Konvolut Comm10: "" + *de.ImageableArea Env10/Umschlag Comm10: "" + *es.ImageableArea Env10/Sobre Comm10: "" diff --git a/SOURCES/hplip-pstotiff-is-rubbish.patch b/SOURCES/hplip-pstotiff-is-rubbish.patch new file mode 100644 index 0000000..014e2cf --- /dev/null +++ b/SOURCES/hplip-pstotiff-is-rubbish.patch @@ -0,0 +1,65 @@ +diff -up hplip-3.15.2/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.15.2/fax/filters/pstotiff +--- hplip-3.15.2/fax/filters/pstotiff.pstotiff-is-rubbish 2015-02-04 09:40:43.169147058 +0100 ++++ hplip-3.15.2/fax/filters/pstotiff 2015-02-04 09:47:20.786983832 +0100 +@@ -1,45 +1,16 @@ +-#!/usr/bin/env python +- +-import os +-import os.path +-import time +-import sys +-import tempfile +- +-PY3 = sys.version_info[0] == 3 +- +-READ_SIZE = 8192 +- +-total_bytes_read = 0 +-temp_in_file = "-" +- +-if (len(sys.argv) > 6): +- temp_in_file = sys.argv[6] +- +-temp_out_handle, temp_out_fname = tempfile.mkstemp() +- +-font = "-I/usr/share/cups/fonts" +-device = "-sDEVICE=tiffg4 -dMaxStripSize=0 -r204x196 -dNOPAUSE -dBATCH -dSAFER -dPARANOIDSAFER -dSHORTERRORS -dWRITESYSTEMDICT -dGHOSTSCRIPT -sstdout=%stderr -sOutputFile=" + temp_out_fname + " " + temp_in_file +- +-gs_command = "/usr/bin/gs" + " " + font + " " + device +- +-exit_code = os.system(gs_command) +- +-file_len = os.stat(temp_out_fname).st_size +-if (file_len < READ_SIZE): +- READ_SIZE = file_len +- +-os.close(temp_out_handle) +- +-out_handle = open(temp_out_fname, mode='rb') +-while (total_bytes_read < file_len): +- data = out_handle.read(READ_SIZE) +- if PY3: +- sys.stdout.buffer.write(data) +- else: +- sys.stdout.write(data) +- total_bytes_read += READ_SIZE +-out_handle.close() +- +-os.remove(temp_out_fname) +-sys.exit(0) ++#!/bin/sh ++if [ $# -lt 6 ]; then ++ IN=-_ ++else ++ IN="$6" ++fi ++ ++TMPFILE=`mktemp /tmp/pstotiff.XXXXXX` || exit 1 ++gs -I/usr/share/cups/fonts -sDEVICE=tiffg4 -dMaxStripSize=0 -r204x196 \ ++ -dNOPAUSE -dBATCH -dSAFER -dPARANOIDSAFER \ ++ -dSHORTERRORS -dWRITESYSTEMDICT -dGHOSTSCRIPT \ ++ -sstdout=%stderr -sOutputFile="$TMPFILE" "$IN" ++RET=$? ++cat "$TMPFILE" ++rm -f "$TMPFILE" ++exit $RET diff --git a/SOURCES/hplip-retry-open.patch b/SOURCES/hplip-retry-open.patch new file mode 100644 index 0000000..3667108 --- /dev/null +++ b/SOURCES/hplip-retry-open.patch @@ -0,0 +1,16 @@ +diff -up hplip-3.9.12/prnt/backend/hp.c.retry-open hplip-3.9.12/prnt/backend/hp.c +--- hplip-3.9.12/prnt/backend/hp.c.retry-open 2010-01-05 15:14:30.000000000 +0000 ++++ hplip-3.9.12/prnt/backend/hp.c 2010-01-05 15:16:03.521911780 +0000 +@@ -741,12 +741,6 @@ int main(int argc, char *argv[]) + goto bugout; + } + +- if (stat != HPMUD_R_DEVICE_BUSY) +- { +- BUG("ERROR: open device failed stat=%d: %s\n", stat, argv[0]); +- goto bugout; +- } +- + /* Display user error. */ + device_event(argv[0], printer, 5000+stat, argv[2], argv[1], argv[3]); + diff --git a/SOURCES/hplip-scan-tmp.patch b/SOURCES/hplip-scan-tmp.patch new file mode 100644 index 0000000..39f2b96 --- /dev/null +++ b/SOURCES/hplip-scan-tmp.patch @@ -0,0 +1,25 @@ +diff -up hplip-3.15.2/scan.py.scan-tmp hplip-3.15.2/scan.py +--- hplip-3.15.2/scan.py.scan-tmp 2015-02-04 15:27:20.423562999 +0100 ++++ hplip-3.15.2/scan.py 2015-02-04 15:34:59.170978476 +0100 +@@ -1080,7 +1080,7 @@ try: + if ('editor' in dest or 'viewer' in dest or 'email' in dest or 'print' in dest) \ + and not file_saved: + +- output_fd, output = utils.make_temp_file(suffix='.png') ++ output_fd, output = utils.make_temp_file(dir='/var/tmp', suffix='.png') + try: + im.save(output) + except IOError as e: +diff -up hplip-3.15.2/scan/sane.py.scan-tmp hplip-3.15.2/scan/sane.py +--- hplip-3.15.2/scan/sane.py.scan-tmp 2015-01-29 13:20:21.000000000 +0100 ++++ hplip-3.15.2/scan/sane.py 2015-02-04 15:27:20.424562984 +0100 +@@ -425,7 +425,8 @@ class ScanThread(threading.Thread): + self.dev = device + self.update_queue = update_queue + self.event_queue = event_queue +- self.buffer_fd, self.buffer_path = utils.make_temp_file(prefix='hpscan') ++ self.buffer_fd, self.buffer_path = utils.make_temp_file(dir='/var/tmp', ++ prefix='hpscan') + self.buffer = os.fdopen(self.buffer_fd, "w+b") + self.format = -1 + self.format_name = '' diff --git a/SOURCES/hplip-silence-ioerror.patch b/SOURCES/hplip-silence-ioerror.patch new file mode 100644 index 0000000..013931b --- /dev/null +++ b/SOURCES/hplip-silence-ioerror.patch @@ -0,0 +1,12 @@ +diff -up hplip-3.15.2/base/logger.py.silence-ioerror hplip-3.15.2/base/logger.py +--- hplip-3.15.2/base/logger.py.silence-ioerror 2015-03-16 16:48:12.750337907 +0000 ++++ hplip-3.15.2/base/logger.py 2015-03-16 16:48:34.850253564 +0000 +@@ -199,6 +199,8 @@ class Logger(object): + out.write('\n') + + out.flush() ++ except IOError: ++ pass + finally: + self._lock.release() + diff --git a/SOURCES/hplip-snmp-quirks.patch b/SOURCES/hplip-snmp-quirks.patch new file mode 100644 index 0000000..517ed2f --- /dev/null +++ b/SOURCES/hplip-snmp-quirks.patch @@ -0,0 +1,21 @@ +diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.snmp-quirks hplip-3.13.4/prnt/drv/hpcups.drv.in +--- hplip-3.13.4/prnt/drv/hpcups.drv.in.snmp-quirks 2013-04-09 12:11:58.447587815 +0200 ++++ hplip-3.13.4/prnt/drv/hpcups.drv.in 2013-04-09 12:11:58.594585761 +0200 +@@ -6757,6 +6757,8 @@ Manufacturer "HP" + Attribute "NickName" "" "HP Officejet Pro 8500 a909a, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet Pro 8500 a909a" + Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 8500 a909a;DES:officejet pro 8500 a909a;" ++ // This device lies about its supplies capacity. ++ Attribute "cupsSNMPQuirks" "" "capacity" + PCFileName "hp-officejet_pro_8500_a909a.ppd" + Attribute "Product" "" "(HP Officejet Pro 8500 All-in-one Printer - a909a)" + } +@@ -6773,6 +6775,8 @@ Manufacturer "HP" + Attribute "NickName" "" "HP Officejet Pro 8500 a909g, hpcups $Version" + Attribute "ShortNickName" "" "HP Officejet Pro 8500 a909g" + Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 8500 a909g;DES:officejet pro 8500 a909g;" ++ // This device lies about its supplies capacity. ++ Attribute "cupsSNMPQuirks" "" "capacity" + PCFileName "hp-officejet_pro_8500_a909g.ppd" + Attribute "Product" "" "(HP Officejet Pro 8500 Wireless All-in-one Printer - a909g)" + } diff --git a/SOURCES/hplip-strncpy.patch b/SOURCES/hplip-strncpy.patch new file mode 100644 index 0000000..eac29b8 --- /dev/null +++ b/SOURCES/hplip-strncpy.patch @@ -0,0 +1,48 @@ +diff -up hplip-3.14.10/prnt/hpcups/HPCupsFilter.cpp.strncpy hplip-3.14.10/prnt/hpcups/HPCupsFilter.cpp +--- hplip-3.14.10/prnt/hpcups/HPCupsFilter.cpp.strncpy 2015-01-21 16:52:44.066497631 +0000 ++++ hplip-3.14.10/prnt/hpcups/HPCupsFilter.cpp 2015-01-21 16:59:46.216434376 +0000 +@@ -203,6 +203,7 @@ HPCupsFilter::HPCupsFilter() : m_pPrinte + adj_k_width = 0; + black_raster = NULL; + color_raster = NULL; ++ memset (&m_JA, 0, sizeof (m_JA)); + } + + HPCupsFilter::~HPCupsFilter() +@@ -384,9 +385,9 @@ DRIVER_ERROR HPCupsFilter::startPage (cu + m_JA.media_attributes.physical_height = cups_header->PageSize[1]; + m_JA.media_attributes.printable_width = ((cups_header->ImagingBoundingBox[2]-cups_header->ImagingBoundingBox[0]) * horz_res) / 72; + m_JA.media_attributes.printable_height = ((cups_header->ImagingBoundingBox[3]-cups_header->ImagingBoundingBox[1]) * vert_res) / 72; +- strncpy(m_JA.media_attributes.PageSizeName, &cups_header->cupsString[0][0], sizeof(m_JA.media_attributes.PageSizeName)); +- strncpy(m_JA.media_attributes.MediaTypeName, cups_header->MediaType, sizeof(m_JA.media_attributes.MediaTypeName)); +- strncpy(m_JA.quality_attributes.hbpl1_print_quality, cups_header->OutputType, sizeof(m_JA.quality_attributes.hbpl1_print_quality)); ++ strncpy(m_JA.media_attributes.PageSizeName, &cups_header->cupsString[0][0], sizeof(m_JA.media_attributes.PageSizeName)-1); ++ strncpy(m_JA.media_attributes.MediaTypeName, cups_header->MediaType, sizeof(m_JA.media_attributes.MediaTypeName)-1); ++ strncpy(m_JA.quality_attributes.hbpl1_print_quality, cups_header->OutputType, sizeof(m_JA.quality_attributes.hbpl1_print_quality)-1); + m_JA.color_mode = cups_header->cupsRowStep; + } + else { +diff -up hplip-3.14.10/prnt/hpijs/hpijs.cpp.strncpy hplip-3.14.10/prnt/hpijs/hpijs.cpp +--- hplip-3.14.10/prnt/hpijs/hpijs.cpp.strncpy 2015-01-21 17:00:03.225512410 +0000 ++++ hplip-3.14.10/prnt/hpijs/hpijs.cpp 2015-01-21 17:04:59.308870785 +0000 +@@ -605,7 +605,7 @@ int main (int argc, char *argv[], char * + } + + if (argc > 2) +- strncpy(user_name, argv[2], sizeof(user_name)); ++ strncpy(user_name, argv[2], sizeof(user_name) - 1); + + #ifdef HAVE_LIBHPIP + char *pDev; +diff -up hplip-3.14.10/prnt/hpijs/hpijsfax.cpp.strncpy hplip-3.14.10/prnt/hpijs/hpijsfax.cpp +--- hplip-3.14.10/prnt/hpijs/hpijsfax.cpp.strncpy 2015-01-21 17:05:06.585904171 +0000 ++++ hplip-3.14.10/prnt/hpijs/hpijsfax.cpp 2015-01-21 17:05:15.787946389 +0000 +@@ -282,7 +282,7 @@ int hpijsFaxServer (int argc, char **arg + char user_name[32]={0,}; + + if (argc > 2) +- strncpy(user_name, argv[2], sizeof(user_name)); ++ strncpy(user_name, argv[2], sizeof(user_name) - 1); + + snprintf(hpFileName,sizeof(hpFileName),"%s/hp_%s_ijsfax_Log_XXXXXX",CUPS_TMP_DIR, user_name); + diff --git a/SOURCES/hplip-strstr-const.patch b/SOURCES/hplip-strstr-const.patch new file mode 100644 index 0000000..f2ac91b --- /dev/null +++ b/SOURCES/hplip-strstr-const.patch @@ -0,0 +1,50 @@ +diff -up hplip-3.9.6b/prnt/hpijs/dj3320.cpp.strstr-const hplip-3.9.6b/prnt/hpijs/dj3320.cpp +--- hplip-3.9.6b/prnt/hpijs/dj3320.cpp.strstr-const 2009-06-25 21:02:29.000000000 +0100 ++++ hplip-3.9.6b/prnt/hpijs/dj3320.cpp 2009-07-27 16:14:52.868542337 +0100 +@@ -405,7 +405,7 @@ DISPLAY_STATUS DJ3320::ParseError (BYTE + { + DRIVER_ERROR err = NO_ERROR; + BYTE byDevIDBuffer[DevIDBuffSize]; +- char *pcStr = NULL; ++ const char *pcStr = NULL; + BYTE byStatus1, byStatus2; + + memset(byDevIDBuffer, 0, sizeof(byDevIDBuffer)); +diff -up hplip-3.9.6b/prnt/hpijs/registry.cpp.strstr-const hplip-3.9.6b/prnt/hpijs/registry.cpp +--- hplip-3.9.6b/prnt/hpijs/registry.cpp.strstr-const 2009-06-25 21:02:29.000000000 +0100 ++++ hplip-3.9.6b/prnt/hpijs/registry.cpp 2009-07-27 16:18:41.583417187 +0100 +@@ -290,14 +290,14 @@ DRIVER_ERROR DeviceRegistry::SelectDevic + err = pSS->GetDeviceID(DevIDBuffer, DevIDBuffSize, FALSE); + ERRCHECK; // should be either NO_ERROR or BAD_DEVICE_ID + +- char *cmdStr = (char *) strstr ((const char *) DevIDBuffer+2, "CMD:"); ++ char *cmdStr = strstr ((char *) DevIDBuffer+2, "CMD:"); + char *cmdStrEnd; + if ((strstr((const char *) DevIDBuffer+2,"CMD:LDL"))) + { + device = eDJ3320; + match = TRUE; + } +- if (!match && cmdStr && (cmdStrEnd = (char *) strstr (cmdStr, ";"))) ++ if (!match && cmdStr && (cmdStrEnd = strstr (cmdStr, ";"))) + { + *cmdStrEnd = '\0'; + if (strstr (cmdStr, "LDL")) +@@ -309,12 +309,12 @@ DRIVER_ERROR DeviceRegistry::SelectDevic + } + if (!match && !cmdStr) + { +- cmdStr = (char *) strstr ((const char *) DevIDBuffer+2, "COMMAND SET:"); ++ cmdStr = strstr ((char *) DevIDBuffer+2, "COMMAND SET:"); + } +- if (!match && cmdStr && (strstr ((const char *) cmdStr+4, "POSTSCRIPT") || +- strstr ((const char *) cmdStr+4, "PostScript") || +- strstr ((const char *) cmdStr+4, "Postscript") || +- strstr ((const char *) cmdStr+4, "postscript") )) ++ if (!match && cmdStr && (strstr (cmdStr+4, "POSTSCRIPT") || ++ strstr (cmdStr+4, "PostScript") || ++ strstr (cmdStr+4, "Postscript") || ++ strstr (cmdStr+4, "postscript") )) + { + device = ePScript; + match = TRUE; diff --git a/SOURCES/hplip-stuck-plugin.patch b/SOURCES/hplip-stuck-plugin.patch new file mode 100644 index 0000000..eadc049 --- /dev/null +++ b/SOURCES/hplip-stuck-plugin.patch @@ -0,0 +1,144 @@ +From f46ac074d066884480098c14397f5f3e34475e11 Mon Sep 17 00:00:00 2001 +From: Jiri Popelka +Date: Fri, 22 Jan 2016 16:30:13 +0100 +Subject: [PATCH] fix from launchpad #1510950 + +--- + base/password.py | 17 ++++++++++++++++- + base/utils.py | 53 ++++++++++++++++++++++++++++++++++------------------- + 2 files changed, 50 insertions(+), 20 deletions(-) + +diff --git a/base/password.py b/base/password.py +index 3ca16ae..6caefdf 100644 +--- a/base/password.py ++++ b/base/password.py +@@ -104,6 +104,7 @@ def get_distro_name(): + class Password(object): + def __init__(self, Mode = INTERACTIVE_MODE): + self.__password ="" ++ self.__password_prompt_str="" + self.__passwordValidated = False + self.__mode = Mode + self.__readAuthType() #self.__authType +@@ -201,7 +202,17 @@ class Password(object): + + cb = child.before + if cb: +- ++ if('true' in cmd and self.__password_prompt_str == ""): #sudo true or su -c "true" ++ cb = cb.replace("[", "\[") ++ cb = cb.replace("]", "\]") ++ self.__password_prompt_str = cb ++ try: ++ p = re.compile(cb, re.I) ++ except TypeError: ++ self.__expectList.append(cb) ++ else: ++ self.__expectList.append(p) ++ + start = time.time() + output.write(cb) + +@@ -355,3 +366,7 @@ class Password(object): + self.__validatePassword( pswd_msg) + return self.__password + ++ def getPasswordPromptString(self): ++ return self.__password_prompt_str ++ ++ +diff --git a/base/utils.py b/base/utils.py +index f1ec1e1..5d108f0 100644 +--- a/base/utils.py ++++ b/base/utils.py +@@ -108,22 +108,21 @@ MAJ_VER = sys.version_info[0] + MIN_VER = sys.version_info[1] + + +- + EXPECT_WORD_LIST = [ + pexpect.EOF, # 0 + pexpect.TIMEOUT, # 1 +- "Continue?", # 2 (for zypper) +- "passwor[dt]:", # en/de/it/ru +- "kennwort", # de? +- "password for", # en +- "mot de passe", # fr +- "contraseña", # es +- "palavra passe", # pt +- "口令", # zh +- "wachtwoord", # nl +- "heslo", # czech +- "密码", +- "Lösenord", #sv ++ u"Continue?", # 2 (for zypper) ++ u"passwor[dt]:", # en/de/it/ru ++ u"kennwort", # de? ++ u"password for", # en ++ u"mot de passe", # fr ++ u"contraseña", # es ++ u"palavra passe", # pt ++ u"口令", # zh ++ u"wachtwoord", # nl ++ u"heslo", # czech ++ u"密码", ++ u"Lösenord", #sv + ] + + +@@ -1260,6 +1259,15 @@ def run(cmd, passwordObj = None, pswd_msg='', log_output=True, spinner=True, tim + import io + output = io.StringIO() + ++ pwd_prompt_str = "" ++ if passwordObj and ('su' in cmd or 'sudo' in cmd): ++ pwd_prompt_str = passwordObj.getPasswordPromptString() ++ log.debug("cmd = %s pwd_prompt_str = [%s]"%(cmd, pwd_prompt_str)) ++ if(pwd_prompt_str == ""): ++ passwordObj.getPassword(pswd_msg, 0) ++ pwd_prompt_str = passwordObj.getPasswordPromptString() ++ log.debug("pwd_prompt_str2 = [%s]"%(pwd_prompt_str)) ++ + try: + child = pexpect.spawnu(cmd, timeout=timeout) + except pexpect.ExceptionPexpect as e: +@@ -1277,15 +1285,22 @@ def run(cmd, passwordObj = None, pswd_msg='', log_output=True, spinner=True, tim + continue + + if child.before: ++ if(pwd_prompt_str and pwd_prompt_str not in EXPECT_LIST): ++ log.debug("Adding %s to EXPECT LIST"%pwd_prompt_str) ++ try: ++ p = re.compile(pwd_prompt_str, re.I) ++ except TypeError: ++ EXPECT_LIST.append(pwd_prompt_str) ++ else: ++ EXPECT_LIST.append(p) ++ EXPECT_LIST.append(pwd_prompt_str) ++ + try: + output.write(child.before) ++ if log_output: ++ log.debug(child.before) + except Exception: + pass +- if log_output: +- try: +- log.debug(child.before) +- except Exception: +- pass + + if i == 0: # EOF + break +@@ -2018,7 +2033,7 @@ def download_from_network(weburl, outputFile = None, useURLLIB=False): + + if useURLLIB: + +- sys.stdout.write("Download in progress..........") ++ #sys.stdout.write("Download in progress..........") + try: + response = urllib2_request.urlopen(weburl) + file_fd = open(outputFile, 'wb') +-- +2.5.0 + diff --git a/SOURCES/hplip-udev-rules.patch b/SOURCES/hplip-udev-rules.patch new file mode 100644 index 0000000..d54b786 --- /dev/null +++ b/SOURCES/hplip-udev-rules.patch @@ -0,0 +1,23 @@ +diff -up hplip-3.15.6/data/rules/56-hpmud.rules.udev-rules hplip-3.15.6/data/rules/56-hpmud.rules +--- hplip-3.15.6/data/rules/56-hpmud.rules.udev-rules 2015-06-10 19:27:31.068051786 +0200 ++++ hplip-3.15.6/data/rules/56-hpmud.rules 2015-06-10 19:28:46.533854350 +0200 +@@ -12,7 +12,4 @@ ENV{ID_USB_INTERFACES}=="", IMPORT{built + # ENV{ID_HPLIP}="1" is for Ubuntu udev-acl + ATTR{idVendor}=="03f0", ENV{ID_USB_INTERFACES}=="*:0701??:*|*:08????:", OWNER="root", GROUP="lp", MODE="0664", ENV{libsane_matched}="yes", ENV{hp_test}="yes", ENV{ID_HPLIP}="1" + +-# This rule will check the smart install feature, plugin status and firmware download for the required printers. +-ENV{hp_test}=="yes", PROGRAM="/bin/sh -c 'logger -p user.info loading HP Device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/nohup /usr/bin/hp-config_usb_printer $env{BUSNUM}:$env{DEVNUM}'" +- + LABEL="hpmud_rules_end" +diff -up hplip-3.15.6/Makefile.in.udev-rules hplip-3.15.6/Makefile.in +--- hplip-3.15.6/Makefile.in.udev-rules 2015-06-07 21:26:22.000000000 +0200 ++++ hplip-3.15.6/Makefile.in 2015-06-10 19:27:31.069051784 +0200 +@@ -4591,7 +4591,7 @@ cups_drv = prnt/drv/hpcups.drv + @HPLIP_BUILD_TRUE@dist_rulessystem_DATA = data/rules/hplip-printer@.service + + # hpmud.rules +-@HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d ++@HPLIP_BUILD_TRUE@rulesdir = /usr/lib/udev/rules.d + @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_FALSE@dist_rules_DATA = data/rules/56-hpmud.rules + @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@dist_rules_DATA = data/rules/56-hpmud_sysfs.rules + @HPLIP_BUILD_TRUE@halpredir = /usr/share/hal/fdi/preprobe/10osvendor diff --git a/SOURCES/hplip-ui-optional.patch b/SOURCES/hplip-ui-optional.patch new file mode 100644 index 0000000..d389d6e --- /dev/null +++ b/SOURCES/hplip-ui-optional.patch @@ -0,0 +1,27 @@ +diff -up hplip-3.12.11/base/utils.py.ui-optional hplip-3.12.11/base/utils.py +--- hplip-3.12.11/base/utils.py.ui-optional 2012-11-20 10:55:15.000000000 +0100 ++++ hplip-3.12.11/base/utils.py 2012-11-27 10:03:21.909512264 +0100 +@@ -667,6 +667,13 @@ def checkPyQtImport(): # qt3 + if os.getenv('DISPLAY') and os.getenv('STARTED_FROM_MENU'): + no_qt_message_gtk() + ++ # hplip-gui sub-package (Fedora) ++ try: ++ import ui ++ except ImportError: ++ log.error("hplip-gui not installed. GUI not available. Exiting.") ++ return False ++ + log.error("PyQt not installed. GUI not available. Exiting.") + return False + +@@ -712,7 +719,8 @@ def checkPyQtImport4(): + import PyQt4 + import ui4 + except ImportError: +- log.error("HPLIP is not installed properly or is installed without graphical support. Please reinstall HPLIP") ++ # hplip-gui sub-package (Fedora) requires PyQt4 ++ log.error("Install the hplip-gui package for graphical support.") + return False + else: + return True diff --git a/SPECS/hplip.spec b/SPECS/hplip.spec new file mode 100644 index 0000000..77302b1 --- /dev/null +++ b/SPECS/hplip.spec @@ -0,0 +1,1586 @@ +# we don't want to provide private python extension libs +%{?filter_setup: +%filter_provides_in %{python_sitearch}/.*\.so$ +%filter_setup +} + +Summary: HP Linux Imaging and Printing Project +Name: hplip +Version: 3.15.9 +Release: 3%{?dist} +License: GPLv2+ and MIT +Group: System Environment/Daemons + +Url: http://hplip.sourceforge.net/ +Source0: http://downloads.sourceforge.net/sourceforge/hplip/hplip-%{version}.tar.gz +Source1: hpcups-update-ppds.sh +Source2: copy-deviceids.py +Patch1: hplip-pstotiff-is-rubbish.patch +Patch2: hplip-strstr-const.patch +Patch3: hplip-ui-optional.patch +Patch4: hplip-no-asm.patch +Patch5: hplip-deviceIDs-drv.patch +Patch6: hplip-udev-rules.patch +Patch7: hplip-retry-open.patch +Patch8: hplip-snmp-quirks.patch +Patch9: hplip-hpijs-marker-supply.patch +Patch10: hplip-clear-old-state-reasons.patch +Patch11: hplip-hpcups-sigpipe.patch +Patch12: hplip-logdir.patch +Patch13: hplip-bad-low-ink-warning.patch +Patch14: hplip-deviceIDs-ppd.patch +Patch15: hplip-ppd-ImageableArea.patch +Patch16: hplip-scan-tmp.patch +Patch17: hplip-log-stderr.patch +Patch18: hplip-avahi-parsing.patch +Patch19: hplip-dj990c-margin.patch +Patch20: hplip-strncpy.patch +Patch21: hplip-no-write-bytecode.patch +Patch22: hplip-silence-ioerror.patch +Patch23: hplip-stuck-plugin.patch +Patch24: hplip-do-not-crash-on-usb-failure.patch + +%global hpijs_epoch 1 +Requires: hpijs%{?_isa} = %{hpijs_epoch}:%{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: python-pillow +Requires: cups +Requires: wget +Requires: gnupg +Requires: dbus-python + +BuildRequires: net-snmp-devel +BuildRequires: cups-devel +BuildRequires: python2-devel +BuildRequires: libjpeg-devel +BuildRequires: desktop-file-utils +BuildRequires: libusb1-devel +BuildRequires: openssl-devel +BuildRequires: sane-backends-devel +BuildRequires: dbus-devel + +# Make sure we get postscriptdriver tags. +BuildRequires: python-cups, cups + +# macros: %%{_tmpfilesdir}, %%{_udevrulesdir} +BuildRequires: systemd + +%description +The Hewlett-Packard Linux Imaging and Printing Project provides +drivers for HP printers and multi-function peripherals. + +%package common +Summary: Files needed by the HPLIP printer and scanner drivers +Group: System Environment/Libraries +License: GPLv2+ +# /usr/lib/udev/rules.d +Requires: systemd + +%description common +Files needed by the HPLIP printer and scanner drivers. + +%package libs +Summary: HPLIP libraries +Group: System Environment/Libraries +License: GPLv2+ and MIT +Requires: %{name}-common%{?_isa} = %{version}-%{release} +Requires: python + +%description libs +Libraries needed by HPLIP. + +%package gui +Summary: HPLIP graphical tools +Group: Applications/System +License: BSD +Requires: PyQt4 +Requires: python-reportlab +Requires: pygobject2 +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: libsane-hpaio%{?_isa} = %{version}-%{release} + +%description gui +HPLIP graphical tools. + +%package -n hpijs +Summary: HP Printer Drivers +Group: Applications/Publishing +License: BSD +Epoch: %{hpijs_epoch} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: cups >= 1:1.4 + +%description -n hpijs +hpijs is a collection of optimized drivers for HP printers. +hpijs supports the DeskJet 350C, 600C, 600C Photo, 630C, Apollo 2000, +Apollo 2100, Apollo 2560, DeskJet 800C, DeskJet 825, DeskJet 900, +PhotoSmart, DeskJet 990C, and PhotoSmart 100 series. + +%package -n libsane-hpaio +Summary: SANE driver for scanners in HP's multi-function devices +Group: System Environment/Daemons +License: GPLv2+ +Obsoletes: libsane-hpoj < 0.91 +Provides: libsane-hpoj = 0.91 +Requires: sane-backends +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description -n libsane-hpaio +SANE driver for scanners in HP's multi-function devices (from HPOJ). + +%prep +%setup -q + +# The pstotiff filter is rubbish so replace it (launchpad #528394). +%patch1 -p1 -b .pstotiff-is-rubbish + +# Fix compilation. +%patch2 -p1 -b .strstr-const + +# Make utils.checkPyQtImport() look for the gui sub-package (bug #243273). +%patch3 -p1 -b .ui-optional + +# Make sure to avoid handwritten asm. +%patch4 -p1 -b .no-asm + +# Corrected several IEEE 1284 Device IDs using foomatic data. +# Color LaserJet 2500 series (bug #659040) +# LaserJet 4100 Series/2100 Series (bug #659039) +%patch5 -p1 -b .deviceIDs-drv +chmod +x %{SOURCE2} +mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs} +%{SOURCE2} prnt/drv/hpcups.drv.in \ + prnt/drv/hpijs.drv.in.deviceIDs-drv-hpijs \ + > prnt/drv/hpijs.drv.in + +# Don't add printer queue, just check plugin. +# Move udev rules from /etc/ to /usr/lib/ (bug #748208). +%patch6 -p1 -b .udev-rules + +# Retry when connecting to device fails (bug #532112). +%patch7 -p1 -b .retry-open + +# Mark SNMP quirks in PPD for HP OfficeJet Pro 8500 (bug #581825). +%patch8 -p1 -b .snmp-quirks + +# Fixed bogus low ink warnings from hpijs driver (bug #643643). +%patch9 -p1 -b .hpijs-marker-supply + +# Clear old printer-state-reasons we used to manage (bug #510926). +%patch10 -p1 -b .clear-old-state-reasons + +# Avoid busy loop in hpcups when backend has exited (bug #525944). +%patch11 -p1 -b .hpcups-sigpipe + +# CUPS filters should use TMPDIR when available (bug #865603). +%patch12 -p1 -b .logdir + +# Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926). +%patch13 -p1 -b .bad-low-ink-warning + +# Add Device ID for +# HP LaserJet Color M451dn (bug #1159380) +for ppd_file in $(grep '^diff' %{PATCH14} | cut -d " " -f 4); +do + gunzip ${ppd_file#*/}.gz +done +%patch14 -p1 -b .deviceIDs-ppd +for ppd_file in $(grep '^diff' %{PATCH14} | cut -d " " -f 4); +do + gzip -n ${ppd_file#*/} +done + +# Fix ImageableArea for Laserjet 8150/9000 (bug #596298). +for ppd_file in $(grep '^diff' %{PATCH15} | cut -d " " -f 4); +do + gunzip ${ppd_file#*/}.gz +done +%patch15 -p1 -b .ImageableArea +for ppd_file in $(grep '^diff' %{PATCH15} | cut -d " " -f 4); +do + gzip -n ${ppd_file#*/} +done + +# Scan to /var/tmp instead of /tmp (bug #1076954). +%patch16 -p1 -b .scan-tmp + +# Treat logging before importing of logger module (bug #984699). +%patch17 -p1 -b .log-stderr + +# Fix parsing of avahi-daemon output (bug #1096939). +%patch18 -p1 -b .parsing + +# Fixed left/right margins for HP DeskJet 990C (LP #1405212). +%patch19 -p1 -b .dj990c-margin + +# Fixed uses of strncpy throughout. +%patch20 -p1 -b .strncpy + +# Don't try to write bytecode cache for hpfax backend (bug #1192761) +# or hp-config_usb_printer (bug #1266903) +# or hpps filter (bug #1241548). +%patch21 -p1 -b .no-write-bytecode + +# Ignore IOError when logging output (bug #712537). +%patch22 -p1 -b .silence-ioerror + +# hp-plugin hangs on 'su' (bug #1249414). +%patch23 -p1 -b .stuck-plugin + +# hp/hpfax backends crash when no USB is available (bug #1332714). +%patch24 -p1 -b .hplip-usb-no-crash + +sed -i.duplex-constraints \ + -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ + prnt/drv/hpcups.drv.in + +# Change shebang /usr/bin/env python -> /usr/bin/python (bug #618351). +find -name '*.py' -print0 | xargs -0 \ + sed -i.env-python -e 's,^#!/usr/bin/env python,#!/usr/bin/python,' +sed -i.env-python -e 's,^#!/usr/bin/env python,#!/usr/bin/python,' \ + prnt/filters/hpps \ + fax/filters/pstotiff + +%build +%configure \ + --enable-scan-build --enable-gui-build --enable-fax-build \ + --disable-foomatic-rip-hplip-install --enable-pp-build \ + --enable-qt4 --enable-hpcups-install --enable-cups-drv-install \ + --enable-foomatic-drv-install \ + --enable-hpijs-install --enable-udev-acl-rules \ + --disable-policykit --with-mimedir=%{_datadir}/cups/mime + +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + +make + +%install +mkdir -p %{buildroot}%{_bindir} +make install DESTDIR=%{buildroot} + +# Create /run/hplip +mkdir -p %{buildroot}/run/hplip + +# install /usr/lib/tmpfiles.d/hplip.conf (bug #1033131) +mkdir -p %{buildroot}%{_tmpfilesdir} +cat > %{buildroot}%{_tmpfilesdir}/hplip.conf < %{buildroot}%{_sysconfdir}/sane.d/dll.d/hpaio + +# Images in docdir should not be executable (bug #440552). +find doc/images -type f -exec chmod 644 {} \; + +# Create an empty plugins directory to make sure it gets the right +# SELinux file context (bug #564551). +%{__mkdir_p} %{buildroot}%{_datadir}/hplip/prnt/plugins + +# Remove files we don't want to package. +rm -f %{buildroot}%{_datadir}/hplip/hpaio.desc +rm -f %{buildroot}%{_datadir}/hplip/hplip-install +rm -rf %{buildroot}%{_datadir}/hplip/install.* +rm -f %{buildroot}%{_datadir}/hplip/uninstall.* +rm -f %{buildroot}%{_bindir}/hp-uninstall +rm -f %{buildroot}%{_datadir}/hplip/upgrade.* +rm -f %{buildroot}%{_bindir}/hp-upgrade +rm -f %{buildroot}%{_bindir}/hp-config_usb_printer +rm -f %{buildroot}%{_unitdir}/hplip-printer@.service +rm -f %{buildroot}%{_datadir}/hplip/config_usb_printer.* +rm -f %{buildroot}%{_datadir}/hplip/hpijs.drv.in.template +rm -f %{buildroot}%{_datadir}/cups/mime/pstotiff.types +rm -f %{buildroot}%{_datadir}/hplip/fax/pstotiff* +rm -f %{buildroot}%{_cups_serverbin}/filter/hpcac + +# The systray applet doesn't work properly (displays icon as a +# window), so don't ship the launcher yet. +rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop + +%files +%doc COPYING doc/* +%{_bindir}/hp-align +%{_bindir}/hp-clean +%{_bindir}/hp-colorcal +%{_bindir}/hp-devicesettings +%{_bindir}/hp-diagnose_plugin +%{_bindir}/hp-diagnose_queues +%{_bindir}/hp-doctor +%{_bindir}/hp-fab +%{_bindir}/hp-faxsetup +%{_bindir}/hp-firmware +%{_bindir}/hp-info +%{_bindir}/hp-levels +%{_bindir}/hp-linefeedcal +%{_bindir}/hp-logcapture +%{_bindir}/hp-makecopies +%{_bindir}/hp-makeuri +%{_bindir}/hp-plugin +%{_bindir}/hp-pqdiag +%{_bindir}/hp-printsettings +%{_bindir}/hp-probe +%{_bindir}/hp-query +%{_bindir}/hp-scan +%{_bindir}/hp-sendfax +%{_bindir}/hp-setup +%{_bindir}/hp-testpage +%{_bindir}/hp-timedate +%{_bindir}/hp-unload +%{_bindir}/hp-wificonfig +%{_cups_serverbin}/backend/hp +%{_cups_serverbin}/backend/hpfax +%{_cups_serverbin}/filter/pstotiff +%{_cups_serverbin}/filter/hpps +%{_datadir}/cups/mime/pstotiff.convs +# Files +%{_datadir}/hplip/align.py* +%{_datadir}/hplip/check-plugin.py* +%{_datadir}/hplip/clean.py* +%{_datadir}/hplip/colorcal.py* +%{_datadir}/hplip/devicesettings.py* +%{_datadir}/hplip/diagnose_plugin.py* +%{_datadir}/hplip/diagnose_queues.py* +%{_datadir}/hplip/doctor.py* +%{_datadir}/hplip/fab.py* +%{_datadir}/hplip/fax +%{_datadir}/hplip/faxsetup.py* +%{_datadir}/hplip/firmware.py* +%{_datadir}/hplip/hpdio.py* +%{_datadir}/hplip/hplip_clean.sh +%{_datadir}/hplip/hpssd* +%{_datadir}/hplip/info.py* +%{_datadir}/hplip/__init__.py* +%{_datadir}/hplip/levels.py* +%{_datadir}/hplip/linefeedcal.py* +%{_datadir}/hplip/logcapture.py* +%{_datadir}/hplip/makecopies.py* +%{_datadir}/hplip/makeuri.py* +%{_datadir}/hplip/plugin.py* +%{_datadir}/hplip/pqdiag.py* +%{_datadir}/hplip/printsettings.py* +%{_datadir}/hplip/probe.py* +%{_datadir}/hplip/query.py* +%{_datadir}/hplip/scan.py* +%{_datadir}/hplip/sendfax.py* +%{_datadir}/hplip/setup.py* +%{_datadir}/hplip/testpage.py* +%{_datadir}/hplip/timedate.py* +%{_datadir}/hplip/unload.py* +%{_datadir}/hplip/wificonfig.py* +# Directories +%{_datadir}/hplip/base +%{_datadir}/hplip/copier +%{_datadir}/hplip/data/ldl +%{_datadir}/hplip/data/localization +%{_datadir}/hplip/data/pcl +%{_datadir}/hplip/data/ps +%{_datadir}/hplip/installer +%{_datadir}/hplip/pcard +%{_datadir}/hplip/prnt +%{_datadir}/hplip/scan +%{_localstatedir}/lib/hp +%dir %attr(0775,root,lp) /run/hplip/ +%{_tmpfilesdir}/hplip.conf + +%files common +%doc COPYING +%{_udevrulesdir}/*.rules +%dir %{_sysconfdir}/hp +%config(noreplace) %{_sysconfdir}/hp/hplip.conf +%dir %{_datadir}/hplip +%dir %{_datadir}/hplip/data +%{_datadir}/hplip/data/models + +%files libs +%{_libdir}/libhpip.so.* +%{_libdir}/libhpipp.so.* +# The so symlink is required here (see bug #489059). +%{_libdir}/libhpmud.so* +# Python extension +%{python_sitearch}/* + +%files gui +%{_bindir}/hp-check +%{_bindir}/hp-print +%{_bindir}/hp-systray +%{_bindir}/hp-toolbox +%{_datadir}/applications/*.desktop +# Files +%{_datadir}/hplip/check.py* +%{_datadir}/hplip/print.py* +%{_datadir}/hplip/systray.py* +%{_datadir}/hplip/toolbox.py* +# Directories +%{_datadir}/hplip/data/images +%{_datadir}/hplip/ui4 + +%files -n hpijs +%{_bindir}/hpijs +%{_bindir}/hpcups-update-ppds +%dir %{_datadir}/ppd/HP +%{_datadir}/ppd/HP/*.ppd.gz +%{_datadir}/cups/drv/* +%{_cups_serverbin}/filter/hpcups +%{_cups_serverbin}/filter/hpcupsfax + +%files -n libsane-hpaio +%{_libdir}/sane/libsane-*.so* +%config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio + +%post -n hpijs +%{_bindir}/hpcups-update-ppds &>/dev/null ||: + +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + +%changelog +* Thu Nov 17 2016 Zdenek Dohnal - 3.15.9-3 +- 1395862 - Missing dependency for hplip-3.15.9-2.el7.x86_64 + +* Tue Jun 14 2016 Zdenek Dohnal - 3.15.9-2 +- 1069619 - Rebase to version 3.15.9 extension - solving bug 1346196 (/usr/lib/cups/filter/hpps uses python -B which is unknown), which is duplicate of bug 1202451 + +* Fri Jun 10 2016 Zdenek Dohnal - 3.15.9-1 +- 1069619 Rebase to version 3.15.9 + +* Tue Jun 07 2016 Jiri Popelka - 3.13.7-7 +- hp/hpfax backends crash when no USB is available (bug #1332714) + +* Fri Jan 24 2014 Daniel Mach - 3.13.7-6 +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 3.13.7-5 +- Mass rebuild 2013-12-27 + +* Wed Nov 27 2013 Jiri Popelka - 3.13.7-4 +- do not %%ghost /run/hplip (bug #1033131) + +* Mon Nov 25 2013 Jiri Popelka - 3.13.7-3 +- create /usr/lib/tmpfiles.d/hplip.conf (bug #1033131) + +* Wed Sep 11 2013 Tim Waugh - 3.13.7-2 +- Applied patch to avoid unix-process authorization subject when using + polkit as it is racy (CVE-2013-4325). + +* Tue Jul 23 2013 Jiri Popelka - 3.13.7-1 +- 3.13.7 +- Device IDs for CM4540 (bug #968177) and cp4005 (bug #980976). + + +* Mon Jun 24 2013 Jiri Popelka - 3.13.6-2 +- add one more arch-specific dependency. + +* Mon Jun 24 2013 Jiri Popelka - 3.13.6-1 +- 3.13.6 +- hplip-ipp-accessors.patch merged upstream +- /etc/cron.daily/hplip_cron -> /usr/share/hplip/hplip_clean.sh + +* Wed May 29 2013 Tim Waugh - 3.13.5-2 +- Avoid several bugs in createTempFile (bug #925032). + +* Tue May 14 2013 Jiri Popelka - 3.13.5-1 +- 3.13.5 +- change udev rule to not add printer queue, just check plugin. + +* Fri May 10 2013 Jiri Popelka - 3.13.4-3 +- Device ID for HP LaserJet 2200 (bug #873123#c8). + +* Thu Apr 11 2013 Tim Waugh - 3.13.4-2 +- Fixed changelog dates. +- Device ID for HP LaserJet P1005 (bug #950776). +- mark cron job file as config(noreplace) + +* Tue Apr 09 2013 Jiri Popelka - 3.13.4-1 +- 3.13.4 + +* Fri Mar 15 2013 Jiri Popelka - 3.13.3-3 +- Remove unused Requires. + +* Thu Mar 14 2013 Tim Waugh - 3.13.3-2 +- Moved hpfax pipe to /var/run/hplip (bug #917756). + +* Fri Mar 08 2013 Jiri Popelka - 3.13.3-1 +- 3.13.3 + +* Thu Feb 14 2013 Jiri Popelka - 3.13.2-1 +- 3.13.2 + +* Thu Feb 14 2013 Fedora Release Engineering - 3.12.11-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Jan 22 2013 Jiri Popelka - 3.12.11-7 +- No need to run update-desktop-database (and require desktop-file-utils) + because there are no MimeKey lines in the desktop files. + +* Fri Jan 18 2013 Adam Tkac - 3.12.11-6 +- rebuild due to "jpeg8-ABI" feature drop + +* Fri Jan 18 2013 Jiri Popelka 3.12.11-5 +- Use arch-specific dependencies. +- Don't provide private python extension libs. + +* Wed Jan 16 2013 Jiri Popelka 3.12.11-4 +- hpijs no longer requires net-snmp (bug #376641, bug #895643). + +* Tue Jan 15 2013 Jiri Popelka 3.12.11-3 +- Use the form of import of PIL that is pillow compatible (bug #895266). + +* Fri Dec 07 2012 Jiri Popelka 3.12.11-2 +- desktop file: remove deprecated Encoding key and Application category + +* Tue Nov 27 2012 Jiri Popelka 3.12.11-1 +- 3.12.11 +-- release-parport.patch merged upstream + +* Thu Nov 22 2012 Tim Waugh 3.12.10-5.a +- Make 'hp-check' check for hpaio set-up correctly (bug #683007). + +* Wed Oct 17 2012 Tim Waugh 3.12.10-4.a +- Some more CUPS filters using the wrong temporary directory + (bug #865603). + +* Tue Oct 16 2012 Tim Waugh 3.12.10-3.a +- CUPS filters should use TMPDIR when available (bug #865603). + +* Thu Oct 11 2012 Jiri Popelka 3.12.10-2.a +- 3.12.10a + +* Thu Oct 04 2012 Jiri Popelka 3.12.10-1 +- 3.12.10 + +* Tue Oct 02 2012 Jiri Popelka 3.12.9-6 +- Ship %%{_localstatedir}/log/hp/tmp directory (bug #859658) + +* Thu Sep 27 2012 Jiri Popelka 3.12.9-5 +- remove useless Conflicts:, Obsoletes: and Provides: fields +- remove %%pre section (stopping&disabling of hplip service on upgrade) +- make hplip_cron work with non-english locale + +* Mon Sep 24 2012 Jiri Popelka 3.12.9-4 +- amend hplip-notification-exception.patch (bug #859543). + +* Thu Sep 20 2012 Jiri Popelka 3.12.9-3 +- Support IEEE 1284.4 protocol over USB (bug #858861). + +* Fri Sep 07 2012 Jiri Popelka 3.12.9-2 +- build against CUPS-1.6 + +* Fri Sep 07 2012 Jiri Popelka 3.12.9-1 +- 3.12.9 +-- no longer needed: fax-ppd.patch + +* Fri Jul 27 2012 Fedora Release Engineering - 3.12.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jun 19 2012 Jiri Popelka 3.12.6-1 +- 3.12.6 + +* Tue Jun 05 2012 Jiri Popelka 3.12.4-3 +- Require systemd instead of udev. + +* Mon Apr 30 2012 Tim Waugh 3.12.4-2 +- The hpijs sub-package no longer requires cupsddk-drivers (which no + longer exists as a real package), but cups >= 1.4. + +* Thu Apr 12 2012 Jiri Popelka 3.12.4-1 +- 3.12.4 + +* Wed Mar 21 2012 Tim Waugh 3.12.2-4 +- Release parport if unsupported model connected (bug #699052). + +* Wed Feb 29 2012 Tim Waugh 3.12.2-3 +- Added another IEEE 1284 Device ID for Color LaserJet CP2025dn to + cope with its DNS-SD response, which has no usb_* keys (bug #651509). + +* Wed Feb 22 2012 Tim Waugh 3.12.2-2 +- Added IEEE 1284 Device ID for LaserJet Professional P1102w (bug #795958). + +* Tue Feb 07 2012 Jiri Popelka 3.12.2-1 +- 3.12.2 + +* Wed Jan 18 2012 Jiri Popelka 3.11.12-3 +- Added IEEE 1284 Device ID for LaserJet P2035. + +* Wed Jan 11 2012 Tim Waugh 3.11.12-2 +- When copying Device IDs from hpcups to hpijs, use ModelName as the + key instead of ShortNickName (bug #651509 comment #7). + +* Mon Dec 19 2011 Jiri Popelka 3.11.12-1 +- 3.11.12 + +* Mon Nov 21 2011 Tim Waugh 3.11.10-11 +- Added IEEE 1284 Device ID for Designjet T770 (bug #747957). + +* Wed Nov 16 2011 Tim Waugh 3.11.10-10 +- Corrected IEEE 1284 Device ID for LaserJet M1120 MFP (bug #754139). + +* Wed Nov 16 2011 Jiri Popelka 3.11.10-9 +- revert prnt/hpcups/HPCupsFilter.cpp 3.11.5->3.11.7 change (bug #738089). + +* Wed Oct 26 2011 Fedora Release Engineering - 3.11.10-8 +- Rebuilt for glibc bug#747377 + +* Tue Oct 25 2011 Tim Waugh 3.11.10-7 +- Catch DBusException in hp-systray (bug #746024). + +* Mon Oct 24 2011 Jiri Popelka 3.11.10-6 +- Move udev rules to /lib/udev/rules.d (bug #748208). + +* Thu Oct 20 2011 Tim Waugh 3.11.10-5 +- Pay attention to the SANE localOnly flag in hpaio (bug #743593). + +* Mon Oct 17 2011 Tim Waugh 3.11.10-4 +- Corrected IEEE 1284 Device ID for LaserJet M1319f MFP (bug #746614) + +* Wed Oct 12 2011 Tim Waugh 3.11.10-3 +- Corrected IEEE 1284 Device ID for LaserJet M1522nf MFP (bug #745498). + +* Fri Oct 7 2011 Tim Waugh 3.11.10-2 +- Corrected IEEE 1284 Device IDs: + - LaserJet M1536dnf MFP (bug #743915) + - PSC 1600 series (bug #743821) + +* Tue Oct 04 2011 Jiri Popelka 3.11.10-1 +- 3.11.10 +- Use _cups_serverbin macro from cups-devel for where to put driver executables. +- No need to define BuildRoot and clean it in clean and install section anymore. +- Corrected IEEE 1284 Device IDs: + Officejet 6300 series (bug #689378) + LaserJet Professional M1212nf MFP (bug #742490) + +* Fri Sep 23 2011 Tim Waugh 3.11.7-5 +- Fixed broken patch for pstotiff. + +* Tue Sep 06 2011 Jiri Popelka 3.11.7-4 +- Fixed xsane crash when doing a multi-image scan (bug #725878) + +* Fri Sep 2 2011 Tim Waugh 3.11.7-3 +- Fixed hpcups crash when required plugin missing (bug #733461). + +* Thu Aug 18 2011 Tim Waugh 3.11.7-2 +- Create debugging files securely (CVE-2011-2722, bug #725830). + +* Mon Jul 25 2011 Jiri Popelka 3.11.7-1 +- 3.11.7 + +* Mon Jul 11 2011 Jiri Popelka 3.11.5-5 +- rebuilt against new net-snmp-5.7 + +* Tue Jun 28 2011 Tim Waugh 3.11.5-4 +- Added Device ID for HP LaserJet Professional P1606dn (bug #708472). +- Update IEEE 1284 Device IDs in hpijs.drv from hpcups.drv. + +* Fri Jun 10 2011 Tim Waugh 3.11.5-3 +- Fix building against CUPS 1.5. +- Re-create installed hpcups PPDs unconditionally (bug #712241). + +* Thu May 19 2011 Jiri Popelka 3.11.5-2 +- Main package requires wget to avoid + misleading errors about network connectivity (bug #705843). + +* Thu May 12 2011 Jiri Popelka 3.11.5-1 +- 3.11.5 + +* Fri Apr 1 2011 Tim Waugh 3.11.3a-2 +- Some rpmlint fixes for obsoletes/provides tags. + +* Thu Mar 31 2011 Tim Waugh 3.11.3a-1 +- 3.11.3a. + +* Fri Mar 18 2011 Jiri Popelka 3.11.3-1 +- 3.11.3 (new hpps filter) + +* Tue Mar 1 2011 Jiri Popelka 3.11.1-5 +- Avoid KeyError in ui4/wifisetupdialog.py (bug #680939). +- Corrected IEEE 1284 Device IDs: + LaserJet 1300 (bug #670548) + LaserJet 3390 (bug #678565) + LaserJet P1505 (bug #680951) + +* Tue Feb 22 2011 Tim Waugh - 3.11.1-4 +- Ship hpijs.drv to give another driver option in case of problems + with hpcups. + +* Wed Feb 09 2011 Fedora Release Engineering - 3.11.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Feb 4 2011 Tim Waugh - 3.11.1-2 +- Fixed typo causing ";marker-supply-low-warning" state reason to be + reported by hpijs (bug #675151). + +* Mon Jan 24 2011 Jiri Popelka 3.11.1-1 +- 3.11.1 + +* Mon Jan 17 2011 Tim Waugh - 3.10.9-14 +- Applied patch to fix CVE-2010-4267, remote stack overflow + vulnerability (bug #670252). + +* Wed Jan 12 2011 Tim Waugh - 3.10.9-13 +- Removed unused hpcac filter to avoid unnecessary perl dependency. + +* Wed Jan 12 2011 Tim Waugh - 3.10.9-12 +- Removed duplicate pstotiff files. + +* Wed Jan 12 2011 Tim Waugh - 3.10.9-11 +- Fixed "CUPS Web Interface" button (bug #633899). +- Set mimedir explicitly via configure. + +* Wed Jan 05 2011 Jiri Popelka 3.10.9-10 +- Catch GError exception when notification showing failed (bug #665577). + +* Wed Dec 15 2010 Tim Waugh - 3.10.9-9 +- Enable D-Bus threading (and require pygobject2) (bug #600932). +- Fixed incorrect signal name in setup dialog (bug #653626). +- Another missing newline in filter output (Ubuntu #418053). +- Prevent hpaio segfaulting on invalid URIs (bug #649092). +- Catch D-Bus exceptions in fax dialog (bug #645316). + +* Fri Dec 03 2010 Jiri Popelka 3.10.9-8 +- Corrected IEEE 1284 Device IDs: + HP Color LaserJet CP2025dn (bug #651509). + HP Color LaserJet CM3530 MFP (bug #659381). + +* Fri Dec 03 2010 Jiri Popelka 3.10.9-7 +- The pycups requirement is now python-cups. +- Corrected IEEE 1284 Device IDs: + HP LaserJet 4050/4100/2100 Series/2420/4200/4300/4350/5100/8000 + M3027 MFP/M3035 MFP/P3005/P3010/P4014/P4515 (bug #659039). + HP Color LaserJet 2500/2550 series/3700/4550/4600/4650/4700/5550 + CP1515n/CP3525/CP4520/CM2320nf MFP (bug #659040). + HP Color LaserJet CM4730 MFP (bug #658831). + +* Fri Nov 12 2010 Tim Waugh - 3.10.9-6 +- Call cupsSetUser in cupsext's addPrinter method before connecting so + that we can get an authentication callback (bug #538352). +- Prevent hp-fab traceback when run as root. + +* Thu Nov 11 2010 Jiri Popelka 3.10.9-5 +- Don't emit SIGNALs in ui4.setupdialog.SetupDialog the PyQt3 way (bug #623834). + +* Sun Oct 24 2010 Jiri Popelka 3.10.9-4 +- Avoid UnicodeDecodeError in printsettingstoolbox.py (bug #645739). + +* Mon Oct 18 2010 Tim Waugh - 3.10.9-3 +- Fixed traceback on error condition in device.py (bug #628125). +- Fixed bogus low ink warnings from hpijs driver (bug #643643). + +* Thu Oct 14 2010 Jiri Popelka - 3.10.9-2 +- Fixed utils.addgroup() to return array instead of string (bug #642771). + +* Mon Oct 04 2010 Jiri Popelka - 3.10.9-1 +- 3.10.9. + +* Thu Sep 30 2010 Tim Waugh - 3.10.6-7 +- More fixes from package review: + - Avoided another macro in comment. + - Use python_sitearch macro throughout. + +* Wed Sep 29 2010 jkeating - 3.10.6-6 +- Rebuilt for gcc bug 634757 + +* Mon Sep 20 2010 Jiri Popelka - 3.10.6-5 +- Increased timeouts for curl, wget, ping for high latency networks (bug #635388). + +* Sat Sep 18 2010 Dan Horák - 3.10.6-4 +- drop the ExcludeArch for s390(x) + +* Wed Sep 15 2010 Tim Waugh +- Fixes from package review: + - Main package and hpijs sub-package require cups for directories. + - The common sub-package requires udev for directories. + - The libs sub-package requires python for directories. + - Avoided macro in comment. + - The lib sub-package now runs ldconfig for post/postun. + - Use python_sitearch macro. + +* Mon Sep 13 2010 Jiri Popelka +- Added IEEE 1284 Device ID for HP LaserJet 4000 (bug #633227). + +* Fri Aug 20 2010 Tim Waugh - 3.10.6-3 +- Added another SNMP quirk for an OfficeJet Pro 8500 variant. + +* Thu Aug 12 2010 Tim Waugh - 3.10.6-2 +- Use correct fax PPD name for Qt3 UI. + +* Tue Jul 27 2010 Jiri Popelka - 3.10.6-1 +- 3.10.6. +- Changed shebang /usr/bin/env python -> /usr/bin/python (bug #618351). +- Corrected IEEE 1284 Device IDs: + - HP Color LaserJet CP1518ni (bug #613689). + - HP Color LaserJet 2600n (bug #613712). + +* Mon Jul 26 2010 Tim Waugh +- Removed selinux-policy version conflict as it is no longer + necessary. + +* Wed Jul 21 2010 David Malcolm - 3.10.5-8 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Thu Jun 24 2010 Jiri Popelka - 3.10.5-7 +- Added COPYING to common sub-package. + +* Thu Jun 24 2010 Jiri Popelka - 3.10.5-6 +- Main package requires explicit version of hplip-libs. + +* Thu Jun 17 2010 Tim Waugh - 3.10.5-5 +- Fixed marker-supply attributes in hpijs (bug #605269). + +* Wed Jun 9 2010 Tim Waugh - 3.10.5-4 +- Mark SNMP quirks in PPD for HP OfficeJet Pro 8500 (bug #581825). + +* Mon Jun 07 2010 Jiri Popelka - 3.10.5-3 +- hplip-gui requires libsane-hpaio + +* Thu Jun 03 2010 Jiri Popelka - 3.10.5-2 +- Fix ImageableArea for Laserjet 8150/9000 (#596298) + +* Mon May 17 2010 Jiri Popelka - 3.10.5-1 +- 3.10.5. No longer need tray-icon-crash.patch +- Increase the timeout for system tray availability checking (bug #569969). + +* Wed May 12 2010 Jiri Popelka - 3.10.2-16 +- Prevent segfault in cupsext when opening PPD file (bug #572775). + +* Wed May 12 2010 Jiri Popelka - 3.10.2-15 +- Added/corrected more IEEE 1284 Device IDs: + - HP LaserJet 4250 (bug #585499). + - HP Color LaserJet 2605dn (bug #583953). + - HP LaserJet P1007 (bug #585272). + +* Wed May 12 2010 Jiri Popelka - 3.10.2-14 +- Wait for max 30s to see if a system tray becomes available (bug #569969). + +* Wed Apr 28 2010 Tim Waugh - 3.10.2-13 +- Clear old printer-state-reasons we used to manage (bug #510926). + +* Tue Apr 27 2010 Jiri Popelka - 3.10.2-12 +- Added missing newline to string argument in dbglog() call (bug #585275). + +* Fri Apr 16 2010 Tim Waugh - 3.10.2-11 +- Added/corrected more IEEE 1284 Device IDs: + - HP Color LaserJet CM1312nfi (bug #581005). + - HP Color LaserJet 3800 (bug #581935). + - HP Color LaserJet 2840 (bug #582215). + - HP PSC 2400 (bug #583103). + +* Fri Apr 16 2010 Jiri Popelka - 3.10.2-10 +- Fixed black/blank lines in ljcolor hpcups output (bug #579461). + Work-around is to send entire blank raster lines instead of skipping them. + +* Fri Apr 9 2010 Jiri Popelka - 3.10.2-9.1 +- Added/Corrected several IEEE 1284 Device IDs + (bugs #577262, #577282, #577282, #577288, #577292, #577302, + ,#577306, #577308, #577898, #579920, #580231) + +* Wed Apr 7 2010 Tim Waugh - 3.10.2-8 +- Regenerate hpcups PPDs on upgrade if necessary (bug #579355). + +* Fri Mar 26 2010 Jiri Popelka - 3.10.2-6 +- Add Device ID for HP LaserJet 2300 (#576928) + +* Tue Mar 23 2010 Tim Waugh - 3.10.2-5 +- Explicitly destroy tray icon on exit (bug #543286). + +* Thu Mar 4 2010 Tim Waugh - 3.10.2-4 +- Main package doesn't require hal. +- Sub-package common requires udev. + +* Wed Mar 3 2010 Tim Waugh - 3.10.2-3 +- Set defattr in gui sub-package file manifest. +- Avoid mixed use of spaces and tabs. + +* Mon Mar 1 2010 Tim Waugh - 3.10.2-2 +- Removed SYSFS use in udev rules and actually made them work + (bug #560754). +- Use a temporary file in pstotiff to allow gs random access. + +* Fri Feb 26 2010 Tim Waugh - 3.10.2-1 +- 3.10.2. No longer need preferences-crash patch. +- The pstotiff filter is rubbish so replace it (launchpad #528394). +- Stopped hpcups pointlessly trying to read spool files + directly (bug #552572). + +* Sat Feb 20 2010 Tim Waugh - 3.9.12-8 +- Corrected several IEEE 1284 Device IDs using foomatic data + (launchpad bug #523259). + +* Tue Feb 16 2010 Tim Waugh - 3.9.12-7 +- Ship %%{_datadir}/hplip/prnt/plugins directory (bug #564551). + +* Fri Feb 5 2010 Tim Waugh - 3.9.12-6 +- Build requires cups for postscriptdriver tags for .drv file. + +* Thu Feb 4 2010 Tim Waugh - 3.9.12-5 +- Rebuild for postscriptdriver tags. + +* Wed Jan 20 2010 Tim Waugh - 3.9.12-4 +- Fixed crash when using Preferences dialog (bug #555979). + +* Tue Jan 12 2010 Tim Waugh - 3.9.12-3 +- Do ship pkit module even though the PolicyKit mechanism is not + shipped (bug #554817). + +* Tue Jan 5 2010 Tim Waugh - 3.9.12-2 +- Retry when connecting to device fails (bug #532112). +- Don't ship PolicyKit mechanism (bug #551773). + +* Tue Dec 22 2009 Tim Waugh - 3.9.12-1 +- 3.9.12. No longer need hpcups-plugin patch. + +* Thu Dec 10 2009 Tim Waugh - 3.9.10-5 +- Reverted fix for bug #533462 until bug #541604 is solved. + +* Thu Nov 26 2009 Tim Waugh 3.9.10-4 +- Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926). + +* Thu Nov 26 2009 Tim Waugh 3.9.10-3 +- Removed duplex constraints on page sizes with imageable areas larger + than possible when duplexing (bug #541572). +- Fixed duplex reverse sides being horizontally flipped (bug #541604). + +* Wed Nov 18 2009 Tim Waugh 3.9.10-2 +- Fixed duplex handling in hpcups.drv (bug #533462). + +* Wed Nov 4 2009 Tim Waugh 3.9.10-1 +- 3.9.10. No longer need clear-previous-state-reasons, + hpcups-reorder, non-scripts, parenths, plugin-error, + requirespageregion or state-reasons-newline patches. + +* Mon Nov 2 2009 Tim Waugh 3.9.8-21 +- Added 'requires proprietary plugin' to appropriate model names + (bug #513283). + +* Fri Oct 30 2009 Tim Waugh 3.9.8-20 +- Reverted retry patch until it can be tested some more. + +* Thu Oct 29 2009 Tim Waugh 3.9.8-19 +- Retry when connecting to device fails (bug #528483). +- Avoid busy loop in hpcups when backend has exited (bug #525944). + +* Wed Oct 28 2009 Tim Waugh 3.9.8-18 +- Set a printer-state-reason when there's a missing required plugin + (bug #531330). + +* Tue Sep 29 2009 Tim Waugh 3.9.8-17 +- Give up trying to print a job to a reconnected device (bug #515481). + +* Wed Sep 23 2009 Tim Waugh 3.9.8-16 +- Enable parallel port support when configuring (bug #524979). + +* Wed Sep 16 2009 Tim Waugh 3.9.8-15 +- Fixed hp-setup traceback when discovery page is skipped (bug #523685). + +* Fri Aug 28 2009 Tim Waugh 3.9.8-14 +- Include missing base files. + +* Fri Aug 28 2009 Tim Waugh 3.9.8-13 +- Use dll.d file instead of post scriptlet for hpaio (bug #519988). +- Fixed RequiresPageRegion patch (bug #518756). + +* Thu Aug 27 2009 Tomas Mraz - 3.9.8-12 +- rebuilt with new openssl + +* Wed Aug 26 2009 Tim Waugh 3.9.8-11 +- Set RequiresPageRegion in hpcups PPDs (bug #518756). + +* Tue Aug 25 2009 Tim Waugh 3.9.8-10 +- Removed never-used definition of BREAKPOINT in scan/sane/common.h + in hope of fixing the build. + +* Tue Aug 25 2009 Tim Waugh 3.9.8-9 +- New common sub-package for udev rules and config file (bug #516459). +- Don't install base/*.py with executable bit set. + +* Mon Aug 24 2009 Tim Waugh 3.9.8-8 +- Fixed typos in page sizes (bug #515469). +- Build no longer requires libudev-devel. +- Fixed state reasons handling problems (bug #501338). + +* Wed Aug 19 2009 Tim Waugh 3.9.8-6 +- Make sure to avoid handwritten asm. +- Don't use obsolete configure options. + +* Wed Aug 19 2009 Tim Waugh 3.9.8-5 +- Use upstream udev rules instead of hal policy (bug #518172). +- Removed unnecessary dependency on PyQt as we only use PyQt4 now. + +* Wed Aug 12 2009 Tim Waugh 3.9.8-4 +- Upstream patch to fix paper size order and LJColor device class + color space. + +* Wed Aug 12 2009 Tim Waugh 3.9.8-3 +- The python-reportlab dependency was in the wrong sub-package. + +* Thu Aug 6 2009 Tim Waugh 3.9.8-2 +- Removed access_control.grant_group line from HAL fdi file. + +* Wed Aug 5 2009 Tim Waugh 3.9.8-1 +- 3.9.8. + +* Tue Aug 4 2009 Tim Waugh 3.9.6b-5 +- Fix hpcups fax PPDs (bug #515356) + +* Tue Jul 28 2009 Tim Waugh 3.9.6b-4 +- Fixed ui-optional patch for qt4 code path (bug #500473). +- Fixed HWResolution for 'Normal' output from the hpcups driver + (laundpad bug #405400). + +* Mon Jul 27 2009 Tim Waugh 3.9.6b-2 +- 3.9.6b. + +* Fri Jul 24 2009 Fedora Release Engineering - 3.9.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Jul 23 2009 Tim Waugh 3.9.2-8 +- Use existing libusb-using routines to try fetching Device ID. + +* Thu Jul 23 2009 Tim Waugh 3.9.2-7 +- Error checking in the libudev device-id fallback code. + +* Tue Jul 21 2009 Tim Waugh 3.9.2-6 +- Fixed device-id reporting. + +* Wed Jun 24 2009 Tim Waugh 3.9.2-5 +- Set disc media for disc page sizes (bug #495672). + +* Mon Mar 9 2009 Tim Waugh 3.9.2-4 +- Ship libhpmud.so (bug #489059). +- Fixed no-root-config patch (bug #489055). + +* Tue Feb 24 2009 Fedora Release Engineering - 3.9.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Feb 20 2009 Tim Waugh 3.9.2-2 +- 3.9.2. No longer need systray or quit patches. + +* Tue Jan 27 2009 Tim Waugh 2.8.12-7 +- Only ship compressed PPD files. + +* Fri Jan 16 2009 Tomas Mraz 2.8.12-6 +- rebuild with new openssl + +* Tue Jan 13 2009 Tim Waugh 2.8.12-5 +- Fixed Quit menu item in device manager (bug #479751). + +* Tue Jan 13 2009 Tim Waugh 2.8.12-4 +- Prevent crash when DEVICE_URI/PRINTER environment variables are not + set (bug #479808 comment 6). + +* Tue Jan 13 2009 Tim Waugh 2.8.12-3 +- Make --qt4 the default for the systray applet, so that it appears + in the right place, again (bug #479751). +- Removed hal preprobe rules as they were causing breakage + (bug #479648). + +* Mon Jan 12 2009 Tim Waugh 2.8.12-2 +- Don't write to system-wide configuration file (bug #479178). + +* Tue Dec 23 2008 Tim Waugh 2.8.12-1 +- 2.8.12. + +* Thu Dec 11 2008 Tim Waugh 2.8.10-2 +- Rediff libsane patch. + +* Thu Dec 11 2008 Tim Waugh 2.8.10-1 +- 2.8.10. No longer need gzip-n or quiet patches. + +* Thu Dec 11 2008 Tim Waugh 2.8.7-5 +- Prevent backend crash when D-Bus not running (bug #474362). + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 2.8.7-4 +- Rebuild for Python 2.6 + +* Tue Oct 21 2008 Tim Waugh 2.8.7-3 +- Ship PPDs in the correct location (bug #343841). + +* Fri Sep 26 2008 Tim Waugh 2.8.7-2 +- Moved Python extension into libs sub-package (bug #461236). + +* Mon Aug 4 2008 Tim Waugh 2.8.7-1 +- 2.8.7. +- Avoid hard-coded rpaths. +- New libs sub-package (bug #444016). + +* Thu Jul 31 2008 Tim Waugh +- Move libhpip.so* to the main package to avoid libsane-hpaio + depending on hpijs (bug #457440). + +* Thu Jul 31 2008 Tom "spot" Callaway 2.8.6b-2 +- fix license tag + +* Mon Jul 28 2008 Tim Waugh 2.8.6b-1 +- 2.8.6b. + +* Mon Jun 23 2008 Tim Waugh 2.8.6-1 +- 2.8.6. No longer need libm patch. + +* Fri Jun 6 2008 Tim Waugh 2.8.5-2 +- Make --qt4 the default for the systray applet, so that it appears + in the right place. Requires PyQt4. + +* Tue Jun 3 2008 Tim Waugh 2.8.5-1 +- 2.8.5. +- Configure with --enable-dbus. Build requires dbus-devel. +- Fix chmod 644 line. +- Ship hp-systray in the gui sub-package, but don't ship the desktop + launcher yet as the systray applet is quite broken. +- Don't run autoconf. + +* Tue May 13 2008 Tim Waugh 2.8.2-3 +- Move installer directory to main package (bug #446171). + +* Fri Apr 4 2008 Tim Waugh 2.8.2-2 +- Update hplip.fdi for Fedora 9: info.bus -> info.subsystem. +- Images in docdir should not be executable (bug #440552). + +* Tue Mar 4 2008 Tim Waugh 2.8.2-1 +- 2.8.2. No longer need alloc, unload-traceback or media-empty patches. +- Ship cupsddk driver. The hpijs sub-package now requires cupsddk-drivers. + +* Tue Mar 4 2008 Tim Waugh 2.7.12-6 +- Fixed marker-supply-low strings. + +* Wed Feb 13 2008 Tim Waugh 2.7.12-5 +- Rebuild for GCC 4.3. + +* Fri Jan 25 2008 Tim Waugh 2.7.12-4 +- The hpijs compression module doesn't allocate enough memory (bug #428536). + +* Wed Jan 23 2008 Tim Waugh 2.7.12-3 +- Really grant the ACL for the lp group (bug #424331). + +* Fri Jan 18 2008 Tim Waugh 2.7.12-2 +- Ship installer directory (bug #428246). +- Avoid multilib conflict (bug #341531). +- The hpijs sub-package requires net-snmp (bug #376641). + +* Fri Jan 18 2008 Tim Waugh 2.7.12-1 +- 2.7.12. No longer need ljdot4 patch. + +* Fri Jan 4 2008 Tim Waugh 2.7.10-2 +- Don't ship udev rules; instead, grant an ACL for group lp (bug #424331). + +* Fri Dec 07 2007 Release Engineering - 2.7.10-2 +- Rebuild for deps + +* Mon Oct 22 2007 Tim Waugh 2.7.10-1 +- 2.7.10. + +* Fri Oct 12 2007 Tim Waugh 2.7.9-3 +- Applied patch to fix remnants of CVE-2007-5208 (bug #329111). + +* Tue Oct 9 2007 Tim Waugh 2.7.9-2 +- Use raw instead of 1284.4 communication for LJ4000 series (bug #249191). +- Build requires openssl-devel. + +* Wed Oct 3 2007 Tim Waugh 2.7.9-1 +- 2.7.9. +- Adjusted udev rules to be less permissive. We use ConsoleKit to add + ACLs to the device nodes, so world-writable device nodes can be avoided. + +* Tue Sep 25 2007 Tim Waugh 2.7.7-5 +- Prevent hpfax trying to load configuration files as user lp. + +* Thu Sep 6 2007 Tim Waugh 2.7.7-4 +- Reverted udev rules change. +- Ship a HAL FDI file to get correct access control on the USB device + nodes (bug #251470). +- Make libsane-hpaio requires the main hplip package, needed for + libhpip.so (bug #280281). + +* Thu Aug 30 2007 Tim Waugh 2.7.7-3 +- Updated udev rules to allow scanning by console user. + +* Wed Aug 29 2007 Tim Waugh 2.7.7-2 +- Better buildroot tag. +- More specific license tag. + +* Fri Aug 3 2007 Tim Waugh 2.7.7-1 +- 2.7.7. + +* Mon Jul 23 2007 Tim Waugh 2.7.6-10 +- Move libhpmud to hpijs package (bug #248978). + +* Fri Jul 20 2007 Tim Waugh 2.7.6-9 +- Remove hplip service on upgrade. +- Updated selinux-policy conflict for bug #249014. +- Fixed the udev rules file (bug #248740, bug #249025). + +* Tue Jul 17 2007 Tim Waugh 2.7.6-8 +- Fixed hp-toolbox desktop file (bug #248560). + +* Mon Jul 16 2007 Tim Waugh 2.7.6-7 +- Low ink is a warning condition, not an error. + +* Wed Jul 11 2007 Tim Waugh 2.7.6-6 +- Add hp-check back, but in the gui sub-package. +- Show the HP Toolbox menu entry again. + +* Mon Jul 9 2007 Tim Waugh 2.7.6-5 +- Read system config when run as root (bug #242974). + +* Mon Jul 9 2007 Tim Waugh 2.7.6-4 +- Moved reportlab requirement to gui sub-package (bug #189030). +- Patchlevel 1. + +* Sat Jul 7 2007 Tim Waugh 2.7.6-3 +- Fixed pre scriptlet (bug #247349, bug #247322). + +* Fri Jul 6 2007 Tim Waugh 2.7.6-2 +- Main package requires python-reportlab for hp-sendfax (bug #189030). +- Explicitly enable scanning. +- Main package requires python-imaging for hp-scan (bug #247210). + +* Mon Jul 2 2007 Tim Waugh +- Updated selinux-policy conflict for bug #246257. + +* Fri Jun 29 2007 Tim Waugh 2.7.6-1 +- 2.7.6. + +* Thu Jun 28 2007 Tim Waugh 1.7.4a-3 +- Another go at avoiding AVC messages on boot (bug #244205). + +* Thu Jun 14 2007 Tim Waugh 1.7.4a-2 +- Don't try to write a /root/.hplip.conf file when running as a CUPS + backend (bug #244205). + +* Wed Jun 13 2007 Tim Waugh 1.7.4a-1 +- Don't put the version in the desktop file; let desktop-file-install do it. +- 1.7.4a. No longer need marker-supply or faxing-with-low-supplies + patches. Cheetah and cherrypy directories no longer shipped in source + tarball. + +* Mon Jun 11 2007 Tim Waugh +- Don't ship hp-check (bug #243273). +- Moved hp-setup back to the base package, and put code in + utils.checkPyQtImport() to check for the gui sub-package as well as + PyQt (bug #243273). + +* Fri Jun 8 2007 Tim Waugh +- Moved hp-setup to the ui package (bug #243273). +- Prevent SELinux audit message from the CUPS backends (bug #241776) + +* Thu May 10 2007 Tim Waugh 1.7.2-10 +- Prevent a traceback when unloading a photo card (bug #238617). + +* Fri May 4 2007 Tim Waugh 1.7.2-9 +- When faxing, low ink/paper is not a problem (bug #238664). + +* Tue Apr 17 2007 Tim Waugh 1.7.2-8 +- Update desktop database on %%postun as well (bug #236163). + +* Mon Apr 16 2007 Tim Waugh 1.7.2-7 +- Some parts can run without GUI support after all (bug #236161). +- Added /sbin/service and /sbin/chkconfig requirements for the scriptlets + (bug #236445). +- Fixed %%post scriptlet's condrestart logic (bug #236445). + +* Fri Apr 13 2007 Tim Waugh 1.7.2-6 +- Fixed dangling symlinks (bug #236156). +- Move all fax bits to the gui package (bug #236161). +- Don't ship fax PPD and backend twice (bug #236092). +- Run update-desktop-database in the gui package's %%post scriptlet + (bug #236163). +- Moved desktop-file-utils requirement to gui package (bug #236163). +- Bumped selinux-policy conflict version (bug #236092). + +* Thu Apr 5 2007 Tim Waugh 1.7.2-5 +- Better media-empty-error state handling: always set the state. + +* Wed Apr 4 2007 Tim Waugh 1.7.2-4 +- Clear the media-empty-error printer state. + +* Wed Apr 4 2007 Tim Waugh 1.7.2-3 +- Fixed typo in marker-supply-low patch. + +* Wed Apr 4 2007 Tim Waugh 1.7.2-2 +- Split out a gui sub-package (bug #193661). +- Build requires sane-backends-devel (bug #234813). + +* Tue Apr 3 2007 Tim Waugh +- Change 'Hidden' to 'NoDisplay' in the desktop file, and use the System + category instead of Utility (bug #170762). +- Link libsane-hpaio against libsane (bug #234813). + +* Fri Mar 30 2007 Tim Waugh +- Use marker-supply-low IPP message. + +* Thu Mar 1 2007 Tim Waugh 1.7.2-1 +- 1.7.2. + +* Wed Feb 14 2007 Tim Waugh 1.7.1-1 +- 1.7.1. + +* Wed Jan 10 2007 Tim Waugh 1.6.12-1 +- 1.6.12. No longer need broken-conf, loop, out-of-paper or + sane-debug patches. + +* Thu Dec 7 2006 Jeremy Katz - 1.6.10-7 +- rebuild against python 2.5 + +* Wed Dec 6 2006 Tim Waugh +- Minor state fixes for out-of-paper patch. + +* Thu Nov 23 2006 Tim Waugh 1.6.10-6 +- Report out-of-paper and offline conditions in CUPS backend (bug #216477). + +* Wed Nov 1 2006 Tim Waugh 1.6.10-5 +- Fixed debugging patch. + +* Wed Nov 1 2006 Tim Waugh 1.6.10-4 +- Allow debugging of the SANE backend. + +* Mon Oct 30 2006 Tim Waugh 1.6.10-3 +- IPv6 support (bug #198377). Local-only sockets are IPv4, and ought + to be changed to unix domain sockets in future. + +* Fri Oct 27 2006 Tim Waugh 1.6.10-2 +- 1.6.10. No longer need compile patch. +- Fixed default config file (bug #211072). +- Moved libhpip to hpijs sub-package (bug #212531). + +* Fri Sep 29 2006 Tim Waugh 1.6.7-4 +- Don't wake up every half a second (bug #204725). + +* Mon Sep 25 2006 Tim Waugh +- Fixed package URL. + +* Mon Aug 21 2006 Tim Waugh 1.6.7-3 +- Don't look up username in PWDB in the fax backend (removed redundant code). + +* Mon Aug 7 2006 Tim Waugh 1.6.7-2 +- 1.6.7. +- Conflict with selinux-policy < 2.3.4 to make sure new port numbers are + known about (bug #201357). + +* Wed Jul 12 2006 Jesse Keating - (none):1.6.6a-3.1 +- rebuild + +* Tue Jul 4 2006 Tim Waugh 1.6.6a-3 +- libhpip should link against libm (bug #197599). + +* Wed Jun 28 2006 Tim Waugh 1.6.6a-2 +- 1.6.6a. + +* Mon Jun 26 2006 Tim Waugh +- Patchlevel 1. +- Fixed libsane-hpaio %%post scriptlet (bug #196663). + +* Fri Jun 16 2006 Tim Waugh 1.6.6-2 +- 1.6.6. + +* Mon Jun 12 2006 Tim Waugh 0.9.11-6 +- Build requires autoconf (bug #194682). + +* Fri May 26 2006 Tim Waugh 0.9.11-5 +- Include doc files (bug #192790). + +* Mon May 15 2006 Tim Waugh 0.9.11-4 +- Patchlevel 2. + +* Wed May 10 2006 Tim Waugh 0.9.11-3 +- Move hpijs to 0.9.11 too. + +* Wed May 10 2006 Tim Waugh 0.9.11-2 +- 0.9.11. +- Keep hpijs at 0.9.8 for now. + +* Fri Apr 21 2006 Tim Waugh 0.9.10-6 +- Patchlevel 2. + +* Wed Apr 19 2006 Tim Waugh +- Don't package COPYING twice (bug #189162). + +* Tue Apr 18 2006 Tim Waugh 0.9.10-5 +- Patchlevel 1. +- Fixed another case-sensitive match. +- Require hpijs sub-package (bug #189140). +- Don't package unneeded files (bug #189162). +- Put fax PPD in the right place (bug #186213). + +* Tue Apr 4 2006 Tim Waugh 0.9.10-4 +- Use case-insensitive matching. 0.9.8 gave all-uppercase in some + situations. +- Last known working hpijs comes from 0.9.8, so use that. + +* Tue Mar 28 2006 Tim Waugh 0.9.10-3 +- Always use /usr/lib/cups/backend. + +* Tue Mar 28 2006 Tim Waugh 0.9.10-2 +- 0.9.10. +- Ship PPDs. + +* Fri Mar 24 2006 Tim Waugh 0.9.9-7 +- Include hpfax. +- Build requires libusb-devel. + +* Thu Mar 23 2006 Tim Waugh 0.9.9-6 +- CUPS backend directory is always in /usr/lib. + +* Mon Mar 13 2006 Tim Waugh 0.9.9-4 +- Quieten hpssd on startup. + +* Sat Mar 11 2006 Tim Waugh 0.9.9-3 +- Patchlevel 1. + +* Thu Mar 9 2006 Tim Waugh 0.9.9-2 +- 0.9.9. No longer need quiet or 0.9.8-4 patches. + +* Wed Mar 01 2006 Karsten Hopp 0.9.8-6 +- Buildrequires: desktop-file-utils + +* Mon Feb 27 2006 Tim Waugh 0.9.8-5 +- Patchlevel 4. + +* Tue Feb 14 2006 Tim Waugh 0.9.8-4 +- Added Obsoletes: hpoj tags back in (bug #181476). + +* Fri Feb 10 2006 Jesse Keating - (none):0.9.8-3.1 +- bump again for double-long bug on ppc(64) + +* Tue Feb 7 2006 Tim Waugh 0.9.8-3 +- Patchlevel 3. + +* Fri Feb 3 2006 Tim Waugh 0.9.8-2 +- Patchlevel 2. + +* Thu Feb 2 2006 Tim Waugh 0.9.8-1 +- 0.9.8. +- No longer need initscript patch. +- Don't package hpfax yet. + +* Wed Jan 18 2006 Tim Waugh 0.9.7-8 +- Don't package PPD files. + +* Thu Jan 5 2006 Tim Waugh 0.9.7-7 +- Fix initscript (bug #176966). + +* Mon Jan 2 2006 Tim Waugh 0.9.7-6 +- Rebuild. + +* Fri Dec 23 2005 Tim Waugh 0.9.7-5 +- Rebuild. + +* Wed Dec 21 2005 Tim Waugh 0.9.7-4 +- Build requires python-devel, libjpeg-devel (bug #176317). + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Wed Dec 7 2005 Tim Waugh 0.9.7-3 +- Use upstream patch 0.9.7-2. +- No longer need lpgetstatus or compile patches. + +* Fri Nov 25 2005 Tim Waugh 0.9.7-2 +- Prevent LPGETSTATUS overrunning format buffer. + +* Thu Nov 24 2005 Tim Waugh 0.9.7-1 +- 0.9.7. + +* Fri Nov 18 2005 Tim Waugh 0.9.6-7 +- Fix compilation. + +* Wed Nov 9 2005 Tomas Mraz 0.9.6-6 +- rebuilt against new openssl + +* Mon Nov 7 2005 Tim Waugh 0.9.6-5 +- Rebuilt. + +* Wed Oct 26 2005 Tim Waugh 0.9.6-4 +- Ship initscript in %%{_sysconfdir}/rc.d/init.d. + +* Fri Oct 14 2005 Tim Waugh +- Install the desktop file with Hidden=True (bug #170762). + +* Fri Oct 14 2005 Tim Waugh 0.9.6-3 +- Don't install desktop file (bug #170762). +- Quieten the hpssd daemon at startup (bug #170762). + +* Wed Oct 12 2005 Tim Waugh 0.9.6-2 +- 0.9.6. + +* Tue Sep 20 2005 Tim Waugh 0.9.5-3 +- Apply upstream patch to fix scanning in LaserJets and parallel InkJets. + +* Mon Sep 19 2005 Tim Waugh 0.9.5-2 +- 0.9.5. +- No longer need condrestart patch. +- Fix compile errors. + +* Tue Jul 26 2005 Tim Waugh 0.9.4-3 +- Fix condrestart in the initscript. + +* Mon Jul 25 2005 Tim Waugh 0.9.4-2 +- Use 'condrestart' not 'restart' in %%post scriptlet. + +* Fri Jul 22 2005 Tim Waugh 0.9.4-1 +- forward-decl patch not needed. +- 0.9.4. + +* Fri Jul 1 2005 Tim Waugh 0.9.3-8 +- Removed Obsoletes: hpoj tags (bug #162222). + +* Thu Jun 30 2005 Tim Waugh 0.9.3-7 +- Rebuild to get Python modules precompiled. + +* Wed Jun 22 2005 Tim Waugh 0.9.3-6 +- For libsane-hpaio ExcludeArch: s390 s390x, because it requires + sane-backends. + +* Wed Jun 15 2005 Tim Waugh 0.9.3-5 +- Use static IP ports (for SELinux policy). + +* Tue Jun 14 2005 Tim Waugh 0.9.3-4 +- Conflicts: hpijs from before this package provided it. +- Conflicts: system-config-printer < 0.6.132 (i.e. before HPLIP support + was added) + +* Thu Jun 9 2005 Tim Waugh 0.9.3-3 +- Added Obsoletes: for xojpanel and hpoj-devel (but we don't actually package + devel files yet). + +* Thu Jun 9 2005 Tim Waugh 0.9.3-2 +- Add 'hpaio' to SANE config file, not 'hpoj' (bug #159954). + +* Thu Jun 9 2005 Tim Waugh 0.9.3-1 +- Use /usr/share/applications for putting desktop files in (bug #159932). +- Requires PyQt (bug #159932). + +* Tue Jun 7 2005 Tim Waugh 0.9.3-0.1 +- Initial package, based on Mandriva spec file.