commit b0d9109826665312c01b4b950d79c98eaaa3ed9f Author: Rosa Date: Wed Feb 1 15:16:03 2012 +0400 Automatic import for version 3.11.5 diff --git a/.abf.yml b/.abf.yml new file mode 100644 index 0000000..1578644 --- /dev/null +++ b/.abf.yml @@ -0,0 +1,2 @@ +sources: + "hplip-3.11.5.tar.gz": e3604752b7a1ab0f492a1b4d470f8fa75e8959e5 diff --git a/10_shebang_fixes.dpatch b/10_shebang_fixes.dpatch new file mode 100644 index 0000000..ad06279 --- /dev/null +++ b/10_shebang_fixes.dpatch @@ -0,0 +1,15 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_hashbang_fixes.dpatch by Henrique de Moraes Holschuh +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix missing, weird or otherwise broken shebang lines + +@DPATCH@ +diff -urNad hplip~/__init__.py hplip/__init__.py +--- hplip~/__init__.py 2007-01-26 12:24:33.000000000 -0200 ++++ hplip/__init__.py 2007-01-26 15:21:09.158181349 -0200 +@@ -1,3 +1,4 @@ ++#!/usr/bin/env python + # -*- coding: utf-8 -*- + # + # (c) Copyright 2003-2007 Hewlett-Packard Development Company, L.P. diff --git a/85_rebuild_python_ui.dpatch b/85_rebuild_python_ui.dpatch new file mode 100644 index 0000000..fed974f --- /dev/null +++ b/85_rebuild_python_ui.dpatch @@ -0,0 +1,33 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 85_rebuild_python_ui.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' hplip-3.11.1~/Makefile.am hplip-3.11.1/Makefile.am +--- hplip-3.11.1~/Makefile.am 2011-01-19 06:18:26.000000000 +0100 ++++ hplip-3.11.1/Makefile.am 2011-01-23 23:50:17.895291308 +0100 +@@ -4,6 +4,10 @@ + # (c) 2004-2010 Copyright Hewlett-Packard Development Company, LP + # Author: David Suffield, Naga Samrat Chowdary Narla, + ++# Generic rules ++%.py: %.ui ++ $(PYUIC4) -x -o $@ $< ++ + INCLUDES = -Iip -Iio/hpmud -Iscan/sane -Iprnt/hpijs + + hplipdir = $(datadir)/hplip +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' hplip-3.11.1~/configure.in hplip-3.11.1/configure.in +--- hplip-3.11.1~/configure.in 2011-01-19 06:19:05.000000000 +0100 ++++ hplip-3.11.1/configure.in 2011-01-23 23:51:08.845262676 +0100 +@@ -508,6 +508,8 @@ + AC_MSG_RESULT("using $PYTHONINCLUDEDIR") + AC_ARG_VAR(PYTHONINCLUDEDIR, [path to Python.h C header file]) + AC_CHECK_HEADERS(python$PYTHON_VERSION/Python.h, ,[AC_MSG_ERROR([cannot find python-devel support], 6)]) ++ AC_ARG_VAR([PYUIC4], [PyQT pyuic4 .ui to .py compiler command]) ++ AC_CHECK_TOOLS([PYUIC4], [pyuic4]) + fi + + if test "$hpijs_only_build" = "no" && test "$scan_build" = "yes" && test "$hpcups_only_build" = "no"; then diff --git a/87_move_documentation.dpatch b/87_move_documentation.dpatch new file mode 100644 index 0000000..aedf2c5 --- /dev/null +++ b/87_move_documentation.dpatch @@ -0,0 +1,17 @@ +--- hplip-3.11.1/Makefile.am~ 2011-02-07 11:08:59.220529956 -0700 ++++ hplip-3.11.1/Makefile.am 2011-02-07 11:23:49.465530073 -0700 +@@ -27,11 +27,11 @@ + + if DOC_BUILD + wwwsrc = doc +-www0dir = $(docdir) ++www0dir = $(hpdocdir)/HTML + dist_www0_DATA = $(wwwsrc)/index.html $(wwwsrc)/commandline.html $(wwwsrc)/copying.html $(wwwsrc)/devicemanager.html $(wwwsrc)/faxtrouble.html $(wwwsrc)/gettinghelp.html $(wwwsrc)/hpscan.html $(wwwsrc)/mainttask.html $(wwwsrc)/plugins.html $(wwwsrc)/print.html $(wwwsrc)/printing.html $(wwwsrc)/printoptions.html $(wwwsrc)/printtroubleshooting.html $(wwwsrc)/scanning.html $(wwwsrc)/scantrouble.html $(wwwsrc)/sendfax.html $(wwwsrc)/setup.html $(wwwsrc)/systray.html $(wwwsrc)/troubleshooting.html $(wwwsrc)/uninstalling.html $(wwwsrc)/upgrading.html +-www3dir = $(docdir)/styles ++www3dir = $(www0dir)/styles + dist_www3_DATA = $(wwwsrc)/styles/* +-www4dir = $(docdir)/images ++www4dir = $(www0dir)/images + dist_www4_DATA = $(wwwsrc)/images/* + endif + diff --git a/delayed-hp-systray-start.dpatch b/delayed-hp-systray-start.dpatch new file mode 100644 index 0000000..c50129d --- /dev/null +++ b/delayed-hp-systray-start.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## delayed-hp-systray-start.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad hplip-3.9.4b~/hplip-systray.desktop.in hplip-3.9.4b/hplip-systray.desktop.in +--- hplip-3.9.4b~/hplip-systray.desktop.in 2009-04-29 22:39:07.000000000 +0200 ++++ hplip-3.9.4b/hplip-systray.desktop.in 2009-05-15 23:45:40.000000000 +0200 +@@ -4,7 +4,7 @@ + Name=HP System Tray Service + GenericName=Printer Status Applet + Comment=HP System Tray Service +-Exec=hp-systray ++Exec=sh -c "sleep 15; exec hp-systray" + Icon=@abs_datadir@/hplip/data/images/128x128/hp_logo.png + Terminal=false + Categories=Application;Utility; diff --git a/hp-check_debian.dpatch b/hp-check_debian.dpatch new file mode 100644 index 0000000..6755d6f --- /dev/null +++ b/hp-check_debian.dpatch @@ -0,0 +1,32 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## hp-check_debian.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Debian/ Ubuntu place hpaio in /etc/sane.d/dll.d/hplip, so lets check there too + +@DPATCH@ +diff -urNad hplip-2.8.12~/check.py hplip-2.8.12/check.py +--- hplip-2.8.12~/check.py 2008-12-18 07:41:18.000000000 +1100 ++++ hplip-2.8.12/check.py 2009-01-22 14:01:40.000000000 +1100 +@@ -693,6 +693,21 @@ + if 'hpaio' in line: + found = True + ++ # Debian/ Ubuntu place hpaio in /etc/sane.d/dll.d/hplip, so lets check there too ++ ++ if not found: ++ log.info(log.bold("'hpaio' in '/etc/sane.d/dll.d/hplip'...")) ++ try: ++ f = file('/etc/sane.d/dll.d/hplip', 'r') ++ except IOError: ++ log.error("'/etc/sane.d/dll.d/hplip' not found.") ++ num_errors += 1 ++ else: ++ found = False ++ for line in f: ++ if 'hpaio' in line: ++ found = True ++ + if found: + log.info("OK, found. SANE backend 'hpaio' is properly set up.") + else: diff --git a/hpcups-update-ppds.sh b/hpcups-update-ppds.sh new file mode 100755 index 0000000..15b899d --- /dev/null +++ b/hpcups-update-ppds.sh @@ -0,0 +1,111 @@ +#!/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" + + # Does it have an hpPrinterLanguage attribute? + grep -q '^\*hpPrinterLanguage:' "$ppd" &>/dev/null && continue + $debug && echo "No hpPrinterLanguage attribute" + + # 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/hplip-2.7.6-14_charsign_fixes.patch b/hplip-2.7.6-14_charsign_fixes.patch new file mode 100644 index 0000000..6bf6655 --- /dev/null +++ b/hplip-2.7.6-14_charsign_fixes.patch @@ -0,0 +1,84 @@ +--- hplip-2.7.6/scan/sane/pml.c.14charsign 2007-07-22 00:21:18.000000000 +0800 ++++ hplip-2.7.6/scan/sane/pml.c 2007-07-22 00:26:22.000000000 +0800 +@@ -228,7 +228,7 @@ + int maxlen ) + { + int type, len; +- unsigned char prefix[2]; ++ char prefix[2]; + + if( PmlGetPrefixValue( obj, &type, 0, 0, 0, 0 ) == ERROR ) + { +@@ -242,7 +242,8 @@ + } + if( pSymbolSet ) + { +- *pSymbolSet = ( ( prefix[0] << 8 ) | prefix[1] ); ++ *pSymbolSet = ( ( (unsigned char)prefix[0] << 8 ) | ++ (unsigned char)prefix[1] ); + } + + return len; +@@ -251,7 +252,7 @@ + int __attribute__ ((visibility ("hidden"))) PmlGetIntegerValue( PmlObject_t obj, int * pType, int * pValue ) + { + int type; +- unsigned char svalue[sizeof( int )]; ++ char svalue[sizeof( int )]; + int accum = 0, i, len; + + if( !pType ) +@@ -267,7 +268,7 @@ + + for( i = 0; i < len; i++ ) + { +- accum = ( ( accum << 8 ) | ( svalue[i] & 0xFF ) ); ++ accum = ( ( accum << 8 ) | ( (unsigned char)svalue[i] ) ); + } + if( pValue ) + { +@@ -348,7 +349,7 @@ + + int __attribute__ ((visibility ("hidden"))) PmlRequestGet( int deviceid, int channelid, PmlObject_t obj ) + { +- unsigned char data[PML_MAX_DATALEN]; ++ char data[PML_MAX_DATALEN]; + int datalen=0, stat=ERROR, type, pml_result; + enum HPMUD_RESULT result; + +@@ -358,7 +359,7 @@ + + if (result == HPMUD_R_OK) + { +- PmlSetValue(obj, type, (char *)data, datalen); ++ PmlSetValue(obj, type, data, datalen); + stat = OK; + } + +--- hplip-2.7.6/scan/sane/scl.c.14charsign 2007-07-22 00:26:32.000000000 +0800 ++++ hplip-2.7.6/scan/sane/scl.c 2007-07-22 00:28:07.000000000 +0800 +@@ -36,10 +36,11 @@ + #define DEBUG_DECLARE_ONLY + #include "sanei_debug.h" + +-static int SclBufferIsPartialReply( unsigned char * data, int datalen ) ++static int SclBufferIsPartialReply( void * dataptr, int datalen ) + { + int i = 0, value = 0; +- unsigned char d; ++ unsigned char * const data = dataptr; ++ unsigned int d; + + if( i >= datalen ) + { +--- hplip-2.7.6/ip/xpnm.c.14charsign 2007-07-22 00:28:28.000000000 +0800 ++++ hplip-2.7.6/ip/xpnm.c 2007-07-22 00:28:46.000000000 +0800 +@@ -422,7 +422,7 @@ + *pdwInputNextPos = g->dwInNextPos; + *pdwOutputThisPos = g->dwOutNextPos; + if (g->fIsEncode && !g->fDidHeader) { +- BYTE buffer[MAX_ENCODE_HEADER_SIZE]; ++ char buffer[MAX_ENCODE_HEADER_SIZE]; + DWORD maxval=(2<<((g->traits.iBitsPerPixel/ + g->traits.iComponentsPerPixel)-1))-1; + int len; diff --git a/hplip-3.11.3-link.patch b/hplip-3.11.3-link.patch new file mode 100644 index 0000000..c73548b --- /dev/null +++ b/hplip-3.11.3-link.patch @@ -0,0 +1,38 @@ +--- Makefile.am.link 2011-03-14 08:59:11.000000000 +0100 ++++ Makefile.am 2011-05-07 07:24:25.111390562 +0200 +@@ -213,6 +217,7 @@ + pcardextdir = $(pyexecdir) + pcardext_LTLIBRARIES = pcardext.la + pcardext_la_LDFLAGS = -module -avoid-version ++pcardext_la_LIBADD = -lpython$(PYTHON_VERSION) + pcardext_la_SOURCES = pcard/pcardext/pcardext.c pcard/fat.c + pcardext_la_CFLAGS = -I$(PYTHONINCLUDEDIR) + +@@ -226,7 +231,7 @@ + cupsext_la_LDFLAGS = -module -avoid-version + cupsext_la_SOURCES = prnt/cupsext/cupsext.c + cupsext_la_CFLAGS = -I$(PYTHONINCLUDEDIR) +-cupsext_la_LIBADD = -lcups ++cupsext_la_LIBADD = -lcups -lpython$(PYTHON_VERSION) + + if SCAN_BUILD + # scan +@@ -236,7 +241,8 @@ + # scanext + scanextdir = $(pyexecdir) + scanext_LTLIBRARIES = scanext.la +-scanext_la_LDFLAGS = -module -avoid-version -lsane ++scanext_la_LDFLAGS = -module -avoid-version ++scanext_la_LIBADD = -lsane -lpython$(PYTHON_VERSION) + scanext_la_SOURCES = scan/scanext/scanext.c + scanext_la_CFLAGS = -I$(PYTHONINCLUDEDIR) + endif +@@ -246,7 +252,7 @@ + hpmudext_LTLIBRARIES = hpmudext.la + hpmudext_la_LDFLAGS = -module -avoid-version + hpmudext_la_SOURCES = io/mudext/hpmudext.c +-hpmudext_la_LIBADD = libhpmud.la ++hpmudext_la_LIBADD = libhpmud.la -lpython$(PYTHON_VERSION) + hpmudext_la_CFLAGS = -I$(PYTHONINCLUDEDIR) + # ui (qt3) + if GUI_BUILD diff --git a/hplip-3.9.8-dlopen-libhpmud.patch b/hplip-3.9.8-dlopen-libhpmud.patch new file mode 100644 index 0000000..07079d5 --- /dev/null +++ b/hplip-3.9.8-dlopen-libhpmud.patch @@ -0,0 +1,35 @@ +Only in hplip-3.9.8: :wq +diff -ur hplip-3.9.8.orig/scan/sane/marvell.c hplip-3.9.8/scan/sane/marvell.c +--- hplip-3.9.8.orig/scan/sane/marvell.c 2009-08-04 23:36:06.000000000 +0200 ++++ hplip-3.9.8/scan/sane/marvell.c 2009-10-17 15:56:23.000000000 +0200 +@@ -63,8 +63,11 @@ + /* Load hpmud manually with symbols exported. Otherwise the plugin will not find it. */ + if ((ps->hpmud_handle = dlopen("libhpmud.so", RTLD_LAZY|RTLD_GLOBAL)) == NULL) + { +- BUG("unable to load restricted library: %s\n", dlerror()); +- goto bugout; ++ if ((ps->hpmud_handle = dlopen("libhpmud.so.0", RTLD_LAZY|RTLD_GLOBAL)) == NULL) ++ { ++ BUG("unable to load restricted library: %s\n", dlerror()); ++ goto bugout; ++ } + } + + /* Load math library manually with symbols exported (Ubuntu 8.04). Otherwise the plugin will not find it. */ +diff -ur hplip-3.9.8.orig/scan/sane/soap.c hplip-3.9.8/scan/sane/soap.c +--- hplip-3.9.8.orig/scan/sane/soap.c 2009-08-04 23:36:06.000000000 +0200 ++++ hplip-3.9.8/scan/sane/soap.c 2009-10-17 15:51:08.000000000 +0200 +@@ -71,8 +71,11 @@ + /* Load hpmud manually with symbols exported. Otherwise the plugin will not find it. */ + if ((ps->hpmud_handle = dlopen("libhpmud.so", RTLD_LAZY|RTLD_GLOBAL)) == NULL) + { +- BUG("unable to load restricted library: %s\n", dlerror()); +- goto bugout; ++ if ((ps->hpmud_handle = dlopen("libhpmud.so.0", RTLD_LAZY|RTLD_GLOBAL)) == NULL) ++ { ++ BUG("unable to load restricted library: %s\n", dlerror()); ++ goto bugout; ++ } + } + + /* Load math library manually with symbols exported (Ubuntu 8.04). Otherwise the plugin will not find it. */ diff --git a/hplip-CVE-2010-4267.patch b/hplip-CVE-2010-4267.patch new file mode 100644 index 0000000..452d055 --- /dev/null +++ b/hplip-CVE-2010-4267.patch @@ -0,0 +1,12 @@ +diff -up hplip-3.10.9/io/hpmud/pml.c.CVE-2010-4267 hplip-3.10.9/io/hpmud/pml.c +--- hplip-3.10.9/io/hpmud/pml.c.CVE-2010-4267 2010-09-26 18:07:25.000000000 +0100 ++++ hplip-3.10.9/io/hpmud/pml.c 2011-01-17 17:21:26.018127900 +0000 +@@ -504,6 +504,8 @@ enum HPMUD_RESULT hpmud_get_pml(HPMUD_DE + p += 2; /* eat type and length */ + } + ++ if (dLen > buf_size) ++ dLen = buf_size; + memcpy(buf, p, dLen); + *bytes_read = dLen; + *type = dt; diff --git a/hplip-UnicodeDecodeError.patch b/hplip-UnicodeDecodeError.patch new file mode 100644 index 0000000..6bdd9dc --- /dev/null +++ b/hplip-UnicodeDecodeError.patch @@ -0,0 +1,12 @@ +diff -up hplip-3.10.9/ui4/printsettingstoolbox.py.UnicodeDecodeError hplip-3.10.9/ui4/printsettingstoolbox.py +--- hplip-3.10.9/ui4/printsettingstoolbox.py.UnicodeDecodeError 2010-09-26 19:07:19.000000000 +0200 ++++ hplip-3.10.9/ui4/printsettingstoolbox.py 2010-10-22 15:01:13.000000000 +0200 +@@ -459,7 +459,7 @@ class PrintSettingsToolbox(QToolBox): + + self.beginControlGroup(g, QString(text)) + +- log.debug(" Text: %s" % unicode(text)) ++ log.debug(" Text: %s" % repr(text)) + log.debug("Num subgroups: %d" % num_subgroups) + + options = cups.getOptionList(g) diff --git a/hplip-addprinter.patch b/hplip-addprinter.patch new file mode 100644 index 0000000..59800bd --- /dev/null +++ b/hplip-addprinter.patch @@ -0,0 +1,10 @@ +--- hplip-3.11.1/prnt/cupsext/cupsext.c~ 2011-01-18 22:15:27.000000000 -0700 ++++ hplip-3.11.1/prnt/cupsext/cupsext.c 2011-02-07 10:59:31.370530033 -0700 +@@ -323,6 +323,7 @@ + }; + + /* Connect to the HTTP server */ ++ cupsSetUser ("root"); + if ( ( http = httpConnectEncrypt( cupsServer(), ippPort(), cupsEncryption() ) ) == NULL ) + { + goto abort; diff --git a/hplip-bad-low-ink-warning.patch b/hplip-bad-low-ink-warning.patch new file mode 100644 index 0000000..bd51d64 --- /dev/null +++ b/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/hplip-clear-old-state-reasons.patch b/hplip-clear-old-state-reasons.patch new file mode 100644 index 0000000..3d8852e --- /dev/null +++ b/hplip-clear-old-state-reasons.patch @@ -0,0 +1,18 @@ +diff -up hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.clear-old-state-reasons hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp +--- hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.clear-old-state-reasons 2010-04-28 12:23:08.296730566 +0100 ++++ hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp 2010-04-28 12:25:25.493730293 +0100 +@@ -479,6 +479,14 @@ 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/hplip-dbglog-newline.patch b/hplip-dbglog-newline.patch new file mode 100644 index 0000000..ee1253c --- /dev/null +++ b/hplip-dbglog-newline.patch @@ -0,0 +1,205 @@ +diff -Naurp hplip-3.11.5/prnt/hpcups/HPCupsFilter.cpp hplip-3.11.5.oden/prnt/hpcups/HPCupsFilter.cpp +--- hplip-3.11.5/prnt/hpcups/HPCupsFilter.cpp 2011-05-15 19:44:05.955883969 +0200 ++++ hplip-3.11.5.oden/prnt/hpcups/HPCupsFilter.cpp 2011-05-15 19:42:20.480884033 +0200 +@@ -350,7 +350,7 @@ DRIVER_ERROR HPCupsFilter::startPage (cu + (attr->value != NULL)) { + strncpy(m_JA.printer_platform, attr->value, sizeof(m_JA.printer_platform)-1); + if (m_iLogLevel & BASIC_LOG) { +- dbglog("HPCUPS: found Printer Platform, it is - %s", attr->value); ++ dbglog("HPCUPS: found Printer Platform, it is - %s\n", attr->value); + } + if(strcmp(m_JA.printer_platform, "ljzjscolor") == 0) + { +@@ -370,7 +370,7 @@ DRIVER_ERROR HPCupsFilter::startPage (cu + } + strncpy(m_JA.printer_language, attr->value, sizeof(m_JA.printer_language)-1); + if (m_iLogLevel & BASIC_LOG) { +- dbglog("HPCUPS: found Printer Language, it is - %s", attr->value); ++ dbglog("HPCUPS: found Printer Language, it is - %s\n", attr->value); + } + + // Fill in the other PCL header info +@@ -415,14 +415,14 @@ DRIVER_ERROR HPCupsFilter::startPage (cu + { + if (err == PLUGIN_LIBRARY_MISSING) + fputs ("STATE: +hplip.plugin-error\n", stderr); +- dbglog ("m_Job initialization failed with error = %d", err); ++ dbglog ("m_Job initialization failed with error = %d\n", err); + ppdClose(m_ppd); + m_ppd = NULL; + return err; + } + + if (m_iLogLevel & BASIC_LOG) { +- dbglog("HPCUPS: returning NO_ERROR from startPage"); ++ dbglog("HPCUPS: returning NO_ERROR from startPage\n"); + } + + m_pPrinterBuffer = new BYTE[cups_header->cupsWidth * 4 + 32]; +@@ -509,7 +509,7 @@ int HPCupsFilter::StartPrintJob(int arg + close(fd); + } + if (m_iLogLevel & BASIC_LOG) +- dbglog("HPCUPS: processRasterData returned %d, calling closeFilter()", err); ++ dbglog("HPCUPS: processRasterData returned %d, calling closeFilter()\n", err); + closeFilter(); + cupsRasterClose(cups_raster); + return 1; +@@ -519,7 +519,7 @@ int HPCupsFilter::StartPrintJob(int arg + close(fd); + } + if (m_iLogLevel & BASIC_LOG) +- dbglog("HPCUPS: StartPrintJob end of job, calling closeFilter()"); ++ dbglog("HPCUPS: StartPrintJob end of job, calling closeFilter()\n"); + closeFilter(); + cupsRasterClose(cups_raster); + return 0; +diff -Naurp hplip-3.11.5/prnt/hpcups/Lidil.cpp hplip-3.11.5.oden/prnt/hpcups/Lidil.cpp +--- hplip-3.11.5/prnt/hpcups/Lidil.cpp 2011-05-14 20:24:00.000000000 +0200 ++++ hplip-3.11.5.oden/prnt/hpcups/Lidil.cpp 2011-05-15 19:43:34.300883972 +0200 +@@ -103,7 +103,7 @@ DRIVER_ERROR Lidil::Configure(Pipeline * + if (m_pPM->BaseResX != m_pQA->horizontal_resolution || + m_pPM->BaseResY != m_pQA->vertical_resolution) + { +- dbglog("Requested resolution not supported with requested printmode"); ++ dbglog("Requested resolution not supported with requested printmode\n"); + return UNSUPPORTED_PRINTMODE; + } + +@@ -166,7 +166,7 @@ DRIVER_ERROR Lidil::StartJob(SystemServi + + if (!selectPrintMode()) + { +- dbglog("selectPrintMode failed, PrintMode name = %s", m_pQA->print_mode_name); ++ dbglog("selectPrintMode failed, PrintMode name = %s\n", m_pQA->print_mode_name); + return UNSUPPORTED_PRINTMODE; + } + +@@ -174,7 +174,7 @@ DRIVER_ERROR Lidil::StartJob(SystemServi + if (m_pPM->BaseResX != m_pQA->horizontal_resolution || + m_pPM->BaseResY != m_pQA->vertical_resolution) + { +- dbglog("Requested resolution not supported with requested printmode"); ++ dbglog("Requested resolution not supported with requested printmode\n"); + dbglog(" m_pPM->BaseResX = %d\n",m_pPM->BaseResX); + dbglog(" m_pPM->BaseResY = %d\n",m_pPM->BaseResY); + dbglog(" m_pQA->horizontal_resolution = %d\n",m_pQA->horizontal_resolution); +@@ -193,7 +193,7 @@ DRIVER_ERROR Lidil::StartJob(SystemServi + err = allocateSwathBuffers(); + if (err != NO_ERROR) + { +- dbglog("allocateSwathBuffers failed, err = %d", err); ++ dbglog("allocateSwathBuffers failed, err = %d\n", err); + return err; + } + +@@ -625,7 +625,7 @@ bool Lidil::selectPrintMode() + { + if (m_pJA->printer_platform[0] == 0) + { +- dbglog("printer_platform is undefined"); ++ dbglog("printer_platform is undefined\n"); + return false; + } + for (unsigned int i = 0; i < sizeof(lidil_print_modes_table) / sizeof(lidil_print_modes_table[0]); i++) +@@ -635,7 +635,7 @@ bool Lidil::selectPrintMode() + return selectPrintMode(i); + } + } +- dbglog("Unsupported printer_platform: %s", m_pJA->printer_platform); ++ dbglog("Unsupported printer_platform: %s\n", m_pJA->printer_platform); + return false; + } + +diff -Naurp hplip-3.11.5/prnt/hpcups/Pcl3.cpp hplip-3.11.5.oden/prnt/hpcups/Pcl3.cpp +--- hplip-3.11.5/prnt/hpcups/Pcl3.cpp 2011-05-14 20:24:00.000000000 +0200 ++++ hplip-3.11.5.oden/prnt/hpcups/Pcl3.cpp 2011-05-15 19:42:20.482884014 +0200 +@@ -66,13 +66,13 @@ DRIVER_ERROR Pcl3::Configure(Pipeline ** + + if (!selectPrintMode()) + { +- dbglog("selectPrintMode failed, PrintMode name = %s", m_pQA->print_mode_name); ++ dbglog("selectPrintMode failed, PrintMode name = %s\n", m_pQA->print_mode_name); + return UNSUPPORTED_PRINTMODE; + } + if (m_pPM->BaseResX != m_pQA->horizontal_resolution || + m_pPM->BaseResY != m_pQA->vertical_resolution) + { +- dbglog("Requested resolution not supported with requested printmode"); ++ dbglog("Requested resolution not supported with requested printmode\n"); + return UNSUPPORTED_PRINTMODE; + } + +@@ -220,7 +220,7 @@ void Pcl3::configureRasterData() + { + if (m_pPM == NULL) + { +- dbglog("configureRasterData: m_pPM is NULL"); ++ dbglog("configureRasterData: m_pPM is NULL\n"); + return; + } + BYTE *p = cur_pcl_buffer_ptr; +@@ -255,7 +255,7 @@ bool Pcl3::selectPrintMode() + { + if (m_pJA->printer_platform[0] == 0) + { +- dbglog("printer_platform is undefined"); ++ dbglog("printer_platform is undefined\n"); + return false; + } + for (unsigned int i = 0; i < sizeof(pcl3_print_modes_table) / sizeof(pcl3_print_modes_table[0]); i++) +@@ -265,7 +265,7 @@ bool Pcl3::selectPrintMode() + return selectPrintMode(i); + } + } +- dbglog("Unsupported printer_platform: %s", m_pJA->printer_platform); ++ dbglog("Unsupported printer_platform: %s\n", m_pJA->printer_platform); + return false; + } + +diff -Naurp hplip-3.11.5/prnt/hpcups/Pcl3Gui.cpp hplip-3.11.5.oden/prnt/hpcups/Pcl3Gui.cpp +--- hplip-3.11.5/prnt/hpcups/Pcl3Gui.cpp 2011-05-14 20:24:00.000000000 +0200 ++++ hplip-3.11.5.oden/prnt/hpcups/Pcl3Gui.cpp 2011-05-15 19:42:20.485883974 +0200 +@@ -66,13 +66,13 @@ DRIVER_ERROR Pcl3Gui::Configure(Pipeline + + if (!selectPrintMode()) + { +- dbglog("selectPrintMode failed, PrintMode name = %s", m_pQA->print_mode_name); ++ dbglog("selectPrintMode failed, PrintMode name = %s\n", m_pQA->print_mode_name); + return UNSUPPORTED_PRINTMODE; + } + if (m_pPM->BaseResX != m_pQA->horizontal_resolution || + m_pPM->BaseResY != m_pQA->vertical_resolution) + { +- dbglog("Requested resolution not supported with requested printmode"); ++ dbglog("Requested resolution not supported with requested printmode\n"); + return UNSUPPORTED_PRINTMODE; + } + +@@ -224,7 +224,7 @@ void Pcl3Gui::configureRasterData() + { + if (m_pPM == NULL) + { +- dbglog("configureRasterData: m_pPM is NULL"); ++ dbglog("configureRasterData: m_pPM is NULL\n"); + return; + } + BYTE *p = cur_pcl_buffer_ptr; +@@ -259,7 +259,7 @@ bool Pcl3Gui::selectPrintMode() + { + if (m_pJA->printer_platform[0] == 0) + { +- dbglog("printer_platform is undefined"); ++ dbglog("printer_platform is undefined\n"); + return false; + } + for (unsigned int i = 0; i < sizeof(pcl3_gui_print_modes_table) / sizeof(pcl3_gui_print_modes_table[0]); i++) +@@ -269,7 +269,7 @@ bool Pcl3Gui::selectPrintMode() + return selectPrintMode(i); + } + } +- dbglog("Unsupported printer_platform: %s", m_pJA->printer_platform); ++ dbglog("Unsupported printer_platform: %s\n", m_pJA->printer_platform); + return false; + } + diff --git a/hplip-dbus-exception.patch b/hplip-dbus-exception.patch new file mode 100644 index 0000000..b32fc3d --- /dev/null +++ b/hplip-dbus-exception.patch @@ -0,0 +1,18 @@ +diff -up hplip-3.10.9/ui4/sendfaxdialog.py~ hplip-3.10.9/ui4/sendfaxdialog.py +--- hplip-3.10.9/ui4/sendfaxdialog.py~ 2010-09-26 18:07:19.000000000 +0100 ++++ hplip-3.10.9/ui4/sendfaxdialog.py 2010-12-13 16:44:56.857648866 +0000 +@@ -915,8 +915,12 @@ class SendFaxDialog(QDialog, Ui_Dialog): + def CheckTimer_timeout(self): + if not self.busy: + #log.debug("Checking for incoming faxes...") +- device_uri, printer_name, event_code, username, job_id, title, timedate, fax_file = \ +- self.service.CheckForWaitingFax(self.device_uri, prop.username, self.last_job_id) ++ try: ++ device_uri, printer_name, event_code, username, job_id, title, timedate, fax_file = \ ++ self.service.CheckForWaitingFax(self.device_uri, prop.username, self.last_job_id) ++ except Exception, e: ++ log.debug("Exception caught: %s" % e) ++ fax_file = None + + if fax_file: + self.last_job_id = 0 diff --git a/hplip-dbus-threads.patch b/hplip-dbus-threads.patch new file mode 100644 index 0000000..ceae607 --- /dev/null +++ b/hplip-dbus-threads.patch @@ -0,0 +1,16 @@ +diff -up hplip-3.10.9/toolbox.py.dbus-threads hplip-3.10.9/toolbox.py +--- hplip-3.10.9/toolbox.py.dbus-threads 2010-12-15 10:54:17.178739842 +0000 ++++ hplip-3.10.9/toolbox.py 2010-12-15 10:57:09.923712662 +0000 +@@ -100,8 +100,11 @@ if ui_toolkit == 'qt3': + try: + from dbus import SessionBus + import dbus.service +- from dbus.mainloop.glib import DBusGMainLoop ++ from dbus.mainloop.glib import DBusGMainLoop, threads_init + from gobject import MainLoop ++ import glib ++ glib.threads_init(); ++ dbus.mainloop.glib.threads_init() + except ImportError: + log.error("Unable to load dbus - Automatic status updates in HPLIP Device Manager will be disabled.") + disable_dbus = True diff --git a/hplip-device-reconnected.patch b/hplip-device-reconnected.patch new file mode 100644 index 0000000..40c5bf8 --- /dev/null +++ b/hplip-device-reconnected.patch @@ -0,0 +1,36 @@ +diff -up hplip-3.9.10/prnt/backend/hp.c.device-reconnected hplip-3.9.10/prnt/backend/hp.c +--- hplip-3.9.10/prnt/backend/hp.c.device-reconnected 2009-11-03 21:45:10.000000000 +0000 ++++ hplip-3.9.10/prnt/backend/hp.c 2009-11-04 16:25:30.719129509 +0000 +@@ -645,6 +645,7 @@ int main(int argc, char *argv[]) + HPMUD_DEVICE hd=-1; + HPMUD_CHANNEL cd=-1; + int n, total=0, retry=0, size, pages; ++ int consecutive_failures=0; + enum HPMUD_RESULT stat; + char *printer = getenv("PRINTER"); + +@@ -809,11 +810,24 @@ int main(int argc, char *argv[]) + { + exit_stat = BACKEND_STOP; /* stop queue */ + goto bugout; ++ } ++ ++ if (++consecutive_failures == 5) ++ { ++ /* hpmud_write_channel has failed several times in ++ * succession but the Device ID-based status says ++ * the printer is happy. Time to face the fact that ++ * the device has probably reconnected, and our USB ++ * channel is invalidated. */ ++ ++ BUG("ERROR: device reconnected?"); ++ goto bugout; + } + } + else + { + /* Data was sent to device successfully. */ ++ consecutive_failures = 0; + if (pa.pjl_device) + { + /* Laserjets have a large data buffer, so manually check for operator intervention condition. */ diff --git a/hplip-deviceIDs-drv.patch b/hplip-deviceIDs-drv.patch new file mode 100644 index 0000000..1953f2b --- /dev/null +++ b/hplip-deviceIDs-drv.patch @@ -0,0 +1,1586 @@ +diff -up hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.10.9/prnt/drv/hpcups.drv.in +--- hplip-3.10.9/prnt/drv/hpcups.drv.in.deviceIDs-drv 2010-09-26 19:09:24.000000000 +0200 ++++ hplip-3.10.9/prnt/drv/hpcups.drv.in 2010-12-03 17:28:05.000000000 +0100 +@@ -442,7 +442,7 @@ Manufacturer "HP" + ModelName "HP Officejet v40xi" + Attribute "NickName" "" "HP Officejet v40xi, $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)" + } +@@ -450,7 +450,7 @@ Manufacturer "HP" + ModelName "HP Officejet v40" + Attribute "NickName" "" "HP Officejet v40, $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)" +@@ -467,7 +467,7 @@ Manufacturer "HP" + ModelName "HP Officejet g55" + Attribute "NickName" "" "HP Officejet g55, $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)" + } +@@ -515,7 +515,7 @@ Manufacturer "HP" + ModelName "HP Officejet g85" + Attribute "NickName" "" "HP Officejet g85, $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)" + } +@@ -531,7 +531,7 @@ Manufacturer "HP" + ModelName "HP Officejet g95" + Attribute "NickName" "" "HP Officejet g95, $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)" + } +@@ -547,7 +547,7 @@ Manufacturer "HP" + ModelName "HP PSC 750xi" + Attribute "NickName" "" "HP PSC 750xi, $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)" + } +@@ -555,7 +555,7 @@ Manufacturer "HP" + ModelName "HP PSC 750" + Attribute "NickName" "" "HP PSC 750, $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)" + } +@@ -587,7 +587,7 @@ Manufacturer "HP" + ModelName "HP PSC 900 Series" + Attribute "NickName" "" "HP PSC 900 Series, $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)" + } +@@ -603,7 +603,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 920c" + Attribute "NickName" "" "HP Deskjet 920c, $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)" +@@ -622,7 +622,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 930c" + Attribute "NickName" "" "HP Deskjet 930c, $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)" +@@ -663,7 +663,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 940c" + Attribute "NickName" "" "HP Deskjet 940c, $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)" +@@ -682,7 +682,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 950c" + Attribute "NickName" "" "HP Deskjet 950c, $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)" + } +@@ -739,7 +739,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 959c" + Attribute "NickName" "" "HP Deskjet 959c, $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)" + } +@@ -747,7 +747,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 970c" + Attribute "NickName" "" "HP Deskjet 970c, $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)" +@@ -767,7 +767,7 @@ Manufacturer "HP" + ModelName "HP Photosmart p1000" + Attribute "NickName" "" "HP Photosmart p1000, $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)" +@@ -776,7 +776,7 @@ Manufacturer "HP" + ModelName "HP Photosmart p1100" + Attribute "NickName" "" "HP Photosmart p1100, $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)" +@@ -810,7 +810,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 3820" + Attribute "NickName" "" "HP Deskjet 3820, $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)" +@@ -848,7 +848,7 @@ Manufacturer "HP" + ModelName "HP Officejet 5105" + Attribute "NickName" "" "HP Officejet 5105, $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)" + } +@@ -856,7 +856,7 @@ Manufacturer "HP" + ModelName "HP Officejet 5110v" + Attribute "NickName" "" "HP Officejet 5110v, $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)" + } +@@ -907,7 +907,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 1220c" + Attribute "NickName" "" "HP Deskjet 1220c, $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)" +@@ -1103,7 +1103,7 @@ Manufacturer "HP" + ModelName "HP 2000c" + Attribute "NickName" "" "HP 2000c, $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)" +@@ -1545,7 +1545,7 @@ Manufacturer "HP" + ModelName "HP Officejet D Series" + Attribute "NickName" "" "HP Officejet D Series, $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)" +@@ -1568,7 +1568,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 960c" + Attribute "NickName" "" "HP Deskjet 960c, $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)" +@@ -1578,7 +1578,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 980c" + Attribute "NickName" "" "HP Deskjet 980c, $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)" +@@ -1587,7 +1587,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 990c" + Attribute "NickName" "" "HP Deskjet 990c, $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)" +@@ -1650,7 +1650,7 @@ Manufacturer "HP" + ModelName "HP Color Inkjet cp1700" + Attribute "NickName" "" "HP Color Inkjet cp1700, $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)" + } +@@ -1658,7 +1658,7 @@ Manufacturer "HP" + ModelName "HP PSC 2100 Series" + Attribute "NickName" "" "HP PSC 2100 Series, $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)" +@@ -1671,7 +1671,7 @@ Manufacturer "HP" + ModelName "HP PSC 2150 Series" + Attribute "NickName" "" "HP PSC 2150 Series, $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)" + } +@@ -1679,7 +1679,7 @@ Manufacturer "HP" + ModelName "HP PSC 2170 Series" + Attribute "NickName" "" "HP PSC 2170 Series, $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)" +@@ -1716,7 +1716,7 @@ Manufacturer "HP" + ModelName "HP Officejet 7100 Series" + Attribute "NickName" "" "HP Officejet 7100 Series, $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)" +@@ -1946,7 +1946,7 @@ Manufacturer "HP" + ModelName "HP Business Inkjet 2200" + Attribute "NickName" "" "HP Business Inkjet 2200, $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)" +@@ -1956,7 +1956,7 @@ Manufacturer "HP" + ModelName "HP Business Inkjet 2230" + Attribute "NickName" "" "HP Business Inkjet 2230, $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)" + } +@@ -1964,7 +1964,7 @@ Manufacturer "HP" + ModelName "HP Business Inkjet 2250" + Attribute "NickName" "" "HP Business Inkjet 2250 pcl3, $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)" +@@ -1973,7 +1973,7 @@ Manufacturer "HP" + ModelName "HP Business Inkjet 2280" + Attribute "NickName" "" "HP Business Inkjet 2280 pcl3, $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)" +@@ -2494,7 +2494,7 @@ Manufacturer "HP" + ModelName "HP PSC 1600 Series" + Attribute "NickName" "" "HP PSC 1600 Series, $Version" + Attribute "ShortNickName" "" "HP PSC 1600 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 1600 series;DES:psc 1600 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:psc 1600 series;DES:psc 1600 series;" + PCFileName "hp-psc_1600_series.ppd" + Attribute "Product" "" "(HP PSC 1600 All-in-one Printer)" + Attribute "Product" "" "(HP PSC 1603 All-in-one Printer)" +@@ -2510,7 +2510,7 @@ Manufacturer "HP" + ModelName "HP PSC 2200 Series" + Attribute "NickName" "" "HP PSC 2200 Series, $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)" + } +@@ -2528,7 +2528,7 @@ Manufacturer "HP" + ModelName "HP PSC 2300 Series" + Attribute "NickName" "" "HP PSC 2300 Series, $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)" +@@ -2537,7 +2537,7 @@ Manufacturer "HP" + ModelName "HP PSC 2350 Series" + Attribute "NickName" "" "HP PSC 2350 Series, $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)" +@@ -2554,7 +2554,7 @@ Manufacturer "HP" + ModelName "HP PSC 2400 Series" + Attribute "NickName" "" "HP PSC 2400 Series, $Version" + Attribute "ShortNickName" "" "HP PSC 2400 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:psc 2400 series;DES:psc 2400 series;" ++ Attribute "1284DeviceID" "" "MFG:hp;MDL:psc 2400 series;" + PCFileName "hp-psc_2400_series.ppd" + Attribute "Product" "" "(HP PSC 2405 Photosmart All-in-one Printer)" + Attribute "Product" "" "(HP PSC 2410xi Photosmart All-in-one Printer)" +@@ -2580,7 +2580,7 @@ Manufacturer "HP" + ModelName "HP PSC 2500 Series" + Attribute "NickName" "" "HP PSC 2500 Series, $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)" +@@ -3041,7 +3041,7 @@ Manufacturer "HP" + ModelName "HP Officejet j5700 Series" + Attribute "NickName" "" "HP Officejet j5700 Series, $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)" +@@ -3114,7 +3114,7 @@ Manufacturer "HP" + ModelName "HP Officejet 6100 Series" + Attribute "NickName" "" "HP Officejet 6100 Series, $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)" +@@ -3169,7 +3169,7 @@ Manufacturer "HP" + ModelName "HP Officejet 6300 Series" + Attribute "NickName" "" "HP Officejet 6300 Series, $Version" + Attribute "ShortNickName" "" "HP Officejet 6300 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet 6300 series;DES:officejet 6300 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet 6300 series;DES:officejet 6300 series;" + PCFileName "hp-officejet_6300_series.ppd" + Attribute "Product" "" "(HP Officejet 6301 All-in-one Printer)" + Attribute "Product" "" "(HP Officejet 6304 All-in-one Printer)" +@@ -3338,7 +3338,7 @@ Manufacturer "HP" + ModelName "HP Officejet 7200 Series" + Attribute "NickName" "" "HP Officejet 7200 Series, $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)" +@@ -3423,7 +3423,7 @@ Manufacturer "HP" + ModelName "HP Officejet 7400 Series" + Attribute "NickName" "" "HP Officejet 7400 Series, $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)" +@@ -8196,7 +8196,7 @@ Manufacturer "HP" + ModelName "HP PSC 1100 Series" + Attribute "NickName" "" "HP PSC 1100 Series, $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)" +@@ -8206,7 +8206,7 @@ Manufacturer "HP" + ModelName "HP PSC 1200 Series" + Attribute "NickName" "" "HP PSC 1200 Series, $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)" +@@ -8389,7 +8389,7 @@ Manufacturer "HP" + ModelName "HP Deskjet 3940" + Attribute "NickName" "" "HP Deskjet 3940, $Version" + Attribute "ShortNickName" "" "HP Deskjet 3940" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:deskjet 3940;DES:deskjet 3940;" ++ Attribute "1284DeviceID" "" "MFG:HP;MDL:Deskjet 3900;DES:3940;" + PCFileName "hp-deskjet_3940.ppd" + Attribute "Product" "" "(HP Deskjet 3940 Color Inkjet Printer)" + Attribute "Product" "" "(HP Deskjet 3940v Color Inkjet Printer)" +@@ -8398,7 +8398,7 @@ Manufacturer "HP" + ModelName "HP Officejet 4100 Series" + Attribute "NickName" "" "HP Officejet 4100 Series, $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)" +@@ -8425,7 +8425,7 @@ Manufacturer "HP" + ModelName "HP Officejet 4300 Series" + Attribute "NickName" "" "HP Officejet 4300 Series, $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)" +@@ -8731,7 +8731,7 @@ Manufacturer "HP" + ModelName "HP Officejet j3600 Series" + Attribute "NickName" "" "HP Officejet j3600 Series, $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)" +@@ -8802,7 +8802,7 @@ Manufacturer "HP" + ModelName "HP Officejet 4200 Series" + Attribute "NickName" "" "HP Officejet 4200 Series, $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)" +@@ -9299,6 +9299,7 @@ Manufacturer "HP" + Attribute "NickName" "" "HP Photosmart 380 Series, $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)" +@@ -9726,7 +9727,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 4 Plus" + Attribute "NickName" "" "HP LaserJet 4 Plus pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 4 Plus" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4 plus;DES:hp laserjet 4 plus;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 4 Plus;DES:hp laserjet 4 plus;" + PCFileName "hp-laserjet_4_plus-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 4 Plus Printer)" + Attribute "Product" "" "(HP LaserJet 4m Plus Printer)" +@@ -9752,7 +9753,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 5mp" + Attribute "NickName" "" "HP LaserJet 5mp pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 5mp" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5mp;DES:hp laserjet 5mp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5MP;DES:Hewlett-Packard LaserJet 5MP Printer;" + PCFileName "hp-laserjet_5mp-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 5mp Printer)" + } +@@ -9760,7 +9761,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 5l" + Attribute "NickName" "" "HP LaserJet 5l, $Version" + Attribute "ShortNickName" "" "HP LaserJet 5l" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5l;DES:hp laserjet 5l;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5L;DES:Hewlett-Packard LaserJet 5L Printer;" + PCFileName "hp-laserjet_5l.ppd" + Attribute "Product" "" "(HP LaserJet 5l Printer)" + Attribute "Product" "" "(HP LaserJet 5l-fs Printer)" +@@ -9770,7 +9771,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 5p" + Attribute "NickName" "" "HP LaserJet 5p, $Version" + Attribute "ShortNickName" "" "HP LaserJet 5p" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5p;DES:hp laserjet 5p;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5P;DES:Hewlett-Packard LaserJet 5P Printer;" + PCFileName "hp-laserjet_5p.ppd" + Attribute "Product" "" "(HP LaserJet 5p Printer)" + } +@@ -9778,7 +9779,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 6l" + Attribute "NickName" "" "HP LaserJet 6l, $Version" + Attribute "ShortNickName" "" "HP LaserJet 6l" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 6l;DES:hp laserjet 6l;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 6L;DES:hp laserjet 6l;" + PCFileName "hp-laserjet_6l.ppd" + Attribute "Product" "" "(HP LaserJet 6l Printer)" + Attribute "Product" "" "(HP LaserJet 6lse Printer)" +@@ -9790,7 +9791,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 6p" + Attribute "NickName" "" "HP LaserJet 6p, $Version" + Attribute "ShortNickName" "" "HP LaserJet 6p" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 6p;DES:hp laserjet 6p;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 6P;DES:Hewlett-Packard LaserJet 6P Printer;" + PCFileName "hp-laserjet_6p.ppd" + Attribute "Product" "" "(HP LaserJet 6p Printer)" + } +@@ -9798,7 +9799,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 6mp" + Attribute "NickName" "" "HP LaserJet 6mp pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 6mp" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 6mp;DES:hp laserjet 6mp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 6MP;DES:Hewlett-Packard LaserJet 6MP Printer;" + PCFileName "hp-laserjet_6mp-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 6mp Printer)" + Attribute "Product" "" "(HP LaserJet 6mp Se Printer)" +@@ -9808,7 +9809,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1015" + Attribute "NickName" "" "HP LaserJet 1015, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1015" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1015;DES:hp laserjet 1015;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1015;DES:hp laserjet 1015;" + PCFileName "hp-laserjet_1015.ppd" + Attribute "Product" "" "(HP LaserJet 1015 Printer)" + } +@@ -9850,7 +9851,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1100" + Attribute "NickName" "" "HP LaserJet 1100, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1100" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1100;DES:hp laserjet 1100;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 1100;DES:HP LaserJet 1100 Printer;" + PCFileName "hp-laserjet_1100.ppd" + Attribute "Product" "" "(HP LaserJet 1100 Printer)" + Attribute "Product" "" "(HP LaserJet 1100se Printer)" +@@ -9868,7 +9869,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1150" + Attribute "NickName" "" "HP LaserJet 1150, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1150" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1150;DES:hp laserjet 1150;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1150;DES:Hewlett-Packard LaserJet 1150;" + PCFileName "hp-laserjet_1150.ppd" + Attribute "Product" "" "(HP LaserJet 1150 Printer)" + } +@@ -9885,7 +9886,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1160 Series" + Attribute "NickName" "" "HP LaserJet 1160 Series, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1160 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1160 series;DES:hp laserjet 1160 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1160 series;DES:Hewlett-Packard LaserJet 1160 series;" + PCFileName "hp-laserjet_1160_series.ppd" + Attribute "Product" "" "(HP LaserJet 1160 Series Printer)" + } +@@ -9893,7 +9894,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1200" + Attribute "NickName" "" "HP LaserJet 1200 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1200" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1200;DES:hp laserjet 1200;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 1200;DES:hp laserjet 1200;" + PCFileName "hp-laserjet_1200-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 1200 Printer)" + Attribute "Product" "" "(HP LaserJet 1200se Printer)" +@@ -9918,7 +9919,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1220" + Attribute "NickName" "" "HP LaserJet 1220 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1220" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1220;DES:hp laserjet 1220;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 1220;DES:Hewlett-Packard LaserJet 1220;" + PCFileName "hp-laserjet_1220-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 1220 All-in-one Printer)" + } +@@ -9926,7 +9927,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1300" + Attribute "NickName" "" "HP LaserJet 1300 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1300" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1300;DES:hp laserjet 1300;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1300;DES:Hewlett-Packard LaserJet 1300;" + PCFileName "hp-laserjet_1300-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 1300 Printer)" + Attribute "Product" "" "(HP LaserJet 1300t Printer)" +@@ -9951,7 +9952,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1320 Series" + Attribute "NickName" "" "HP LaserJet 1320 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1320 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1320 series;DES:hp laserjet 1320 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" + PCFileName "hp-laserjet_1320_series-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 1320 Series Printer)" + } +@@ -9975,7 +9976,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1320" + Attribute "NickName" "" "HP LaserJet 1320, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1320" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1320;DES:hp laserjet 1320;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" + PCFileName "hp-laserjet_1320.ppd" + Attribute "Product" "" "(HP LaserJet 1320 Printer)" + Attribute "Product" "" "(HP LaserJet 1320t Printer)" +@@ -10048,7 +10049,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet p2015 Series" + Attribute "NickName" "" "HP LaserJet p2015 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet p2015 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2015 series;DES:hp laserjet p2015 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;" + PCFileName "hp-laserjet_p2015_series-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet p2015 Printer)" + } +@@ -10112,7 +10113,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 2100" + Attribute "NickName" "" "HP LaserJet 2100, $Version" + Attribute "ShortNickName" "" "HP LaserJet 2100" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2100;DES:hp laserjet 2100;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 2100 Series;DES:hp laserjet 2100;" + PCFileName "hp-laserjet_2100.ppd" + Attribute "Product" "" "(HP LaserJet 2100 Printer)" + Attribute "Product" "" "(HP LaserJet 2100m Printer)" +@@ -10124,7 +10125,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 2100 Series" + Attribute "NickName" "" "HP LaserJet 2100 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 2100 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2100 series;DES:hp laserjet 2100 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 2100 Series;DES:Hewlett-Packard LaserJet 2100 Series;" + PCFileName "hp-laserjet_2100_series-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 2100 Series Printer)" + } +@@ -10140,7 +10141,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 2200" + Attribute "NickName" "" "HP LaserJet 2200 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 2200" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2200;DES:hp laserjet 2200;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 2200;DES:Hewlett-Packard LaserJet 2200;" + PCFileName "hp-laserjet_2200-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 2200 Printer)" + Attribute "Product" "" "(HP LaserJet 2200d Printer)" +@@ -10153,7 +10154,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 2300" + Attribute "NickName" "" "HP LaserJet 2300 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 2300" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2300;DES:hp laserjet 2300;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series;" + PCFileName "hp-laserjet_2300-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 2300 Printer)" + Attribute "Product" "" "(HP LaserJet 2300n Printer)" +@@ -10166,7 +10167,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 2300 Series" + Attribute "NickName" "" "HP LaserJet 2300 Series, $Version" + Attribute "ShortNickName" "" "HP LaserJet 2300 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2300 series;DES:hp laserjet 2300 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series;" + PCFileName "hp-laserjet_2300_series.ppd" + Attribute "Product" "" "(HP LaserJet 2300 Series Printer)" + } +@@ -10182,7 +10183,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 2420" + Attribute "NickName" "" "HP LaserJet 2420 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 2420" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2420;DES:hp laserjet 2420;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 2420;DES:Hewlett-Packard LaserJet 2420;" + PCFileName "hp-laserjet_2420-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 2420 Printer)" + Attribute "Product" "" "(HP LaserJet 2420d Printer)" +@@ -10193,7 +10194,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 2430" + Attribute "NickName" "" "HP LaserJet 2430 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 2430" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 2430;DES:hp laserjet 2430;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 2430;DES:Hewlett-Packard LaserJet 2430;" + PCFileName "hp-laserjet_2430-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 2430t Printer)" + Attribute "Product" "" "(HP LaserJet 2430 Printer)" +@@ -10221,7 +10222,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet p3005" + Attribute "NickName" "" "HP LaserJet p3005 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet p3005" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p3005;DES:hp laserjet p3005;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P3005;DES:hp laserjet p3005;" + PCFileName "hp-laserjet_p3005-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet p3005 Printer)" + Attribute "Product" "" "(HP LaserJet p3005d Printer)" +@@ -10234,7 +10235,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet p3010 Series" + Attribute "NickName" "" "HP LaserJet p3010 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet p3010 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p3010 series;DES:hp laserjet p3010 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P3010 Series;DES:hp laserjet p3010 series;" + PCFileName "hp-laserjet_p3010_series-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet p3015 Printer)" + Attribute "Product" "" "(HP LaserJet p3011 Printer)" +@@ -10243,7 +10244,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3015" + Attribute "NickName" "" "HP LaserJet 3015 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3015" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3015;DES:hp laserjet 3015;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3015;DES:Hewlett-Packard LaserJet 3015;" + PCFileName "hp-laserjet_3015-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 3015 All-in-one Printer)" + } +@@ -10251,7 +10252,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3020" + Attribute "NickName" "" "HP LaserJet 3020 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3020" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3020;DES:hp laserjet 3020;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 3020;DES:Hewlett-Packard LaserJet 3020;" + PCFileName "hp-laserjet_3020-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 3020 All-in-one Printer)" + } +@@ -10259,7 +10260,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet m3027 MFP" + Attribute "NickName" "" "HP LaserJet m3027 MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet m3027 MFP" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m3027 mfp;DES:hp laserjet m3027 mfp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet M3027 MFP;DES:Hewlett-Packard LaserJet M3027 MFP;" + PCFileName "hp-laserjet_m3027_mfp-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet m3027 Multifunction Printer)" + Attribute "Product" "" "(HP LaserJet m3027x Multifunction Printer)" +@@ -10268,7 +10269,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3030" + Attribute "NickName" "" "HP LaserJet 3030 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3030" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3030;DES:hp laserjet 3030;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3030;DES:Hewlett-Packard LaserJet 3030;" + PCFileName "hp-laserjet_3030-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 3030 All-in-one Printer)" + } +@@ -10276,7 +10277,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3050" + Attribute "NickName" "" "HP LaserJet 3050 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3050" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3050;DES:hp laserjet 3050;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3050;DES:Hewlett-Packard LaserJet 3050;" + PCFileName "hp-laserjet_3050-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 3050 All-in-one Printer)" + Attribute "Product" "" "(HP LaserJet 3050z All-in-one Printer)" +@@ -10285,7 +10286,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3052" + Attribute "NickName" "" "HP LaserJet 3052 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3052" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3052;DES:hp laserjet 3052;" ++ Attribute "1284DeviceID" "" "MFG:HEwlett-Packard;MDL:HP LaserJet 3052;DES:Hewlett-Packard LaserJet 3052;" + PCFileName "hp-laserjet_3052-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 3052 All-in-one Printer)" + } +@@ -10293,7 +10294,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3055" + Attribute "NickName" "" "HP LaserJet 3055, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3055" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3055;DES:hp laserjet 3055;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3055;DES:Hewlett-Packard LaserJet 3055;" + PCFileName "hp-laserjet_3055.ppd" + Attribute "Product" "" "(HP LaserJet 3055 All-in-one Printer)" + } +@@ -10321,7 +10322,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3200m" + Attribute "NickName" "" "HP LaserJet 3200m pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3200m" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3200m;DES:hp laserjet 3200m;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3200M;DES:Hewlett-Packard LaserJet 3200M;" + PCFileName "hp-laserjet_3200m-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 3200m All-in-one Printer)" + } +@@ -10337,7 +10338,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3200" + Attribute "NickName" "" "HP LaserJet 3200, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3200" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3200;DES:hp laserjet 3200;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3200;DES:Hewlett-Packard LaserJet 3200;" + PCFileName "hp-laserjet_3200.ppd" + Attribute "Product" "" "(HP LaserJet 3200 All-in-one Printer)" + } +@@ -10357,7 +10358,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3330" + Attribute "NickName" "" "HP LaserJet 3330, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3330" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3330;DES:hp laserjet 3330;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3330;DES:Hewlett-Packard LaserJet 3330;" + PCFileName "hp-laserjet_3330.ppd" + Attribute "Product" "" "(HP LaserJet 3330 Multifunction Printer)" + } +@@ -10365,7 +10366,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3380" + Attribute "NickName" "" "HP LaserJet 3380 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3380" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3380;DES:hp laserjet 3380;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3380;DES:Hewlett-Packard LaserJet 3380;" + PCFileName "hp-laserjet_3380-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 3380 All-in-one Printer)" + } +@@ -10373,7 +10374,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 3390" + Attribute "NickName" "" "HP LaserJet 3390 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 3390" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 3390;DES:hp laserjet 3390;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 3390;DES:Hewlett-Packard LaserJet 3390;" + PCFileName "hp-laserjet_3390-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 3390 All-in-one Printer)" + } +@@ -10389,7 +10390,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 4000 Series" + Attribute "NickName" "" "HP LaserJet 4000 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 4000 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4000 series;DES:hp laserjet 4000 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 4000 Series;DES:Hewlett-Packard LaserJet 4000 Series;" + PCFileName "hp-laserjet_4000_series-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 4000 Printer)" + Attribute "Product" "" "(HP LaserJet 4000n Printer)" +@@ -10417,7 +10418,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet p4014" + Attribute "NickName" "" "HP LaserJet p4014, $Version" + Attribute "ShortNickName" "" "HP LaserJet p4014" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p4014;DES:hp laserjet p4014;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P4014;DES:hp laserjet p4014;" + PCFileName "hp-laserjet_p4014.ppd" + Attribute "Product" "" "(HP LaserJet p4014 Printer)" + } +@@ -10465,7 +10466,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 4050 Series" + Attribute "NickName" "" "HP LaserJet 4050 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 4050 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4050 series;DES:hp laserjet 4050 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 4050 Series ;DES:Hewlett-Packard LaserJet 4050 Series;" + PCFileName "hp-laserjet_4050_series-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 4050 Printer)" + Attribute "Product" "" "(HP LaserJet 4050n Printer)" +@@ -10477,7 +10478,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 4100 Series" + Attribute "NickName" "" "HP LaserJet 4100 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 4100 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4100 series;DES:hp laserjet 4100 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 4100 Series ;DES:Hewlett-Packard LaserJet 4100 Series;" + PCFileName "hp-laserjet_4100_series-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 410dtn Printer)" + Attribute "Product" "" "(HP LaserJet 4100tn Printer)" +@@ -10505,7 +10506,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 4200" + Attribute "NickName" "" "HP LaserJet 4200 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 4200" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4200;DES:hp laserjet 4200;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 4200;DES:Hewlett-Packard LaserJet 4200;" + PCFileName "hp-laserjet_4200-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 4200 Printer)" + Attribute "Product" "" "(HP LaserJet 4200l Printer)" +@@ -10530,7 +10531,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 4250" + Attribute "NickName" "" "HP LaserJet 4250 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 4250" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4250;DES:hp laserjet 4250;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 4250;DES:Hewlett-Packard LaserJet 4250;" + PCFileName "hp-laserjet_4250-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 4250 Printer)" + Attribute "Product" "" "(HP LaserJet 4250dtn Printer)" +@@ -10542,7 +10543,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 4300" + Attribute "NickName" "" "HP LaserJet 4300 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 4300" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4300;DES:hp laserjet 4300;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 4300;DES:hp laserjet 4300;" + PCFileName "hp-laserjet_4300-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 4300 Printer)" + Attribute "Product" "" "(HP LaserJet 4300dtn Printer)" +@@ -10555,7 +10556,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 4345 MFP" + Attribute "NickName" "" "HP LaserJet 4345 MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 4345 MFP" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4345 mfp;DES:hp laserjet 4345 mfp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 4345 mfp;DES:hp laserjet 4345 mfp;" + PCFileName "hp-laserjet_4345_mfp-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 4345 Multifunction Printer)" + Attribute "Product" "" "(HP LaserJet 4345x Multifunction Printer)" +@@ -10566,7 +10567,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet m4345 MFP" + Attribute "NickName" "" "HP LaserJet m4345 MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet m4345 MFP" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m4345 mfp;DES:hp laserjet m4345 mfp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet M4345 MFP;DES:Hewlett-Packard LaserJet M4345 MFP;" + PCFileName "hp-laserjet_m4345_mfp-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet m4345 Multifunction Printer)" + Attribute "Product" "" "(HP LaserJet m4345x Multifunction Printer)" +@@ -10585,7 +10586,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 4350" + Attribute "NickName" "" "HP LaserJet 4350 pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 4350" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 4350;DES:hp laserjet 4350;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 4350;DES:hp laserjet 4350;" + PCFileName "hp-laserjet_4350-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 4350 Printer)" + Attribute "Product" "" "(HP LaserJet 4350dtn Printer)" +@@ -10621,7 +10622,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet p4515" + Attribute "NickName" "" "HP LaserJet p4515, $Version" + Attribute "ShortNickName" "" "HP LaserJet p4515" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p4515;DES:hp laserjet p4515;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P4515;DES:hp laserjet p4515;" + PCFileName "hp-laserjet_p4515.ppd" + Attribute "Product" "" "(HP LaserJet p4515 Printer)" + } +@@ -10637,7 +10638,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 5000 Series" + Attribute "NickName" "" "HP LaserJet 5000 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 5000 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5000 series;DES:hp laserjet 5000 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5000 Series;DES:Hewlett-Packard LaserJet 5000 Series;" + PCFileName "hp-laserjet_5000_series-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 5000 Series Printer)" + } +@@ -10653,7 +10654,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 8000 Series" + Attribute "NickName" "" "HP LaserJet 8000 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 8000 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 8000 series;DES:hp laserjet 8000 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 8000 Series;DES:hp laserjet 8000 series;" + PCFileName "hp-laserjet_8000_series-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 8000 Series Printer)" + } +@@ -10747,7 +10748,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 5si" + Attribute "NickName" "" "HP LaserJet 5si pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 5si" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5si;DES:hp laserjet 5si;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5Si;DES:;" + PCFileName "hp-laserjet_5si-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 5si Printer)" + Attribute "Product" "" "(HP LaserJet 5si Hm Printer)" +@@ -10783,7 +10784,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet m3035 MFP" + Attribute "NickName" "" "HP LaserJet m3035 MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet m3035 MFP" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m3035 mfp;DES:hp laserjet m3035 mfp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet M3035 MFP;DES:Hewlett-Packard LaserJet M3035 MFP;" + PCFileName "hp-laserjet_m3035_mfp-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet m3035 Multifunction Printer)" + Attribute "Product" "" "(HP LaserJet m3035xs Multifunction Printer)" +@@ -10804,7 +10805,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet m5025 MFP" + Attribute "NickName" "" "HP LaserJet m5025 MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet m5025 MFP" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m5025 mfp;DES:hp laserjet m5025 mfp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet M5025 MFP;DES:Hewlett-Packard LaserJet M5025 MFP;" + PCFileName "hp-laserjet_m5025_mfp-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet m5025 Multifunction Printer)" + } +@@ -10812,7 +10813,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet m5035 MFP" + Attribute "NickName" "" "HP LaserJet m5035 MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet m5035 MFP" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m5035 mfp;DES:hp laserjet m5035 mfp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet M5035 MFP;DES:Hewlett-Packard LaserJet M5035 MFP;" + PCFileName "hp-laserjet_m5035_mfp-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet m5035 Multifunction Printer)" + Attribute "Product" "" "(HP LaserJet m5035x Multifunction Printer)" +@@ -10830,7 +10831,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 5100 Series" + Attribute "NickName" "" "HP LaserJet 5100 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 5100 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 5100 series;DES:hp laserjet 5100 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 5100 Series;DES:hp laserjet 5100 series;" + PCFileName "hp-laserjet_5100_series-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 5100 Printer)" + Attribute "Product" "" "(HP LaserJet 5100le Printer)" +@@ -10861,7 +10862,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 8000" + Attribute "NickName" "" "HP LaserJet 8000, $Version" + Attribute "ShortNickName" "" "HP LaserJet 8000" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 8000;DES:hp laserjet 8000;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 8000 Series;DES:hp laserjet 8000;" + PCFileName "hp-laserjet_8000.ppd" + Attribute "Product" "" "(HP LaserJet 8000 Printer)" + Attribute "Product" "" "(HP LaserJet 8000dn Printer)" +@@ -10881,7 +10882,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 8150 Series" + Attribute "NickName" "" "HP LaserJet 8150 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP LaserJet 8150 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 8150 series;DES:hp laserjet 8150 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 8150 Series;DES:Hewlett-Packard LaserJet 8150 Series;" + PCFileName "hp-laserjet_8150_series-pcl3.ppd" + Attribute "Product" "" "(HP LaserJet 8150 Printer)" + Attribute "Product" "" "(HP LaserJet 8150n Printer)" +@@ -11094,7 +11095,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet cm1312nfi MFP" + Attribute "NickName" "" "HP Color LaserJet cm1312nfi MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cm1312nfi MFP" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm1312nfi mfp;DES:hp color laserjet cm1312nfi mfp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM1312nfi MFP;" + PCFileName "hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cm1312nfi Multifunction Printer)" + } +@@ -11110,7 +11111,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet cp1515n" + Attribute "NickName" "" "HP Color LaserJet cp1515n pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cp1515n" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp1515n;DES:hp color laserjet cp1515n;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP1515n;DES:hp color laserjet cp1515n;" + PCFileName "hp-color_laserjet_cp1515n-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cp1515n Printer)" + } +@@ -11118,7 +11119,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet cp1518ni" + Attribute "NickName" "" "HP Color LaserJet cp1518ni pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cp1518ni" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp1518ni;DES:hp color laserjet cp1518ni;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP1518ni;DES:Hewlett-Packard Color LaserJet CP1518ni;" + PCFileName "hp-color_laserjet_cp1518ni-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cp1518ni Printer)" + } +@@ -11134,7 +11135,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet cp2025dn" + Attribute "NickName" "" "HP Color LaserJet cp2025dn pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cp2025dn" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp2025dn;DES:hp color laserjet cp2025dn;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP2025dn;DES:Hewlett-Packard Color LaserJet CP2025dn;" + PCFileName "hp-color_laserjet_cp2025dn-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cp2025dn Printer)" + } +@@ -11150,7 +11151,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet cp2025n" + Attribute "NickName" "" "HP Color LaserJet cp2025n pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cp2025n" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp2025n;DES:hp color laserjet cp2025n;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP2025n;DES:hp color laserjet cp2025n;" + PCFileName "hp-color_laserjet_cp2025n-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cp2025n Printer)" + } +@@ -11158,7 +11159,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Business Inkjet 2300" + Attribute "NickName" "" "HP Business Inkjet 2300 pcl3, $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)" +@@ -11192,7 +11193,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet cm2320nf MFP" + Attribute "NickName" "" "HP Color LaserJet cm2320nf MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cm2320nf MFP" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320nf mfp;DES:hp color laserjet cm2320nf mfp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM2320nf MFP;DES:hp color laserjet cm2320nf mfp;" + PCFileName "hp-color_laserjet_cm2320nf_mfp-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cm2320nf Multifunction Printer)" + } +@@ -11200,7 +11201,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 2500" + Attribute "NickName" "" "HP Color LaserJet 2500 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 2500" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 2500;DES:hp color laserjet 2500;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 2500;DES:hp color laserjet 2500;" + PCFileName "hp-color_laserjet_2500-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 2500 Printer)" + } +@@ -11241,7 +11242,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet cp3525" + Attribute "NickName" "" "HP Color LaserJet cp3525 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cp3525" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp3525;DES:hp color laserjet cp3525;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP3525;DES:hp color laserjet cp3525;" + PCFileName "hp-color_laserjet_cp3525-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cp3525 Printer)" + Attribute "Product" "" "(HP Color LaserJet cp3525n Printer)" +@@ -11252,7 +11253,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet cm3530 MFP" + Attribute "NickName" "" "HP Color LaserJet cm3530 MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cm3530 MFP" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm3530 mfp;DES:hp color laserjet cm3530 mfp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM3530 MFP;DES:hp color laserjet cm3530 mfp;" + PCFileName "hp-color_laserjet_cm3530_mfp-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cm3530 Multifunction Printer)" + Attribute "Product" "" "(HP Color LaserJet cm3530fs Multifunction Printer)" +@@ -11261,7 +11262,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 3700" + Attribute "NickName" "" "HP Color LaserJet 3700 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 3700" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3700;DES:hp color laserjet 3700;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 3700;DES:hp color laserjet 3700;" + PCFileName "hp-color_laserjet_3700-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 3700 Printer)" + } +@@ -11280,7 +11281,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 3800" + Attribute "NickName" "" "HP Color LaserJet 3800 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 3800" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3800;DES:hp color laserjet 3800;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet 3800;" + PCFileName "hp-color_laserjet_3800-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 3800 Printer)" + Attribute "Product" "" "(HP Color LaserJet 3800n Printer)" +@@ -11319,7 +11320,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet cp4520 Series" + Attribute "NickName" "" "HP Color LaserJet cp4520 Series pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cp4520 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp4520 series;DES:hp color laserjet cp4520 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP4520 Series;DES:hp color laserjet cp4520 series;" + PCFileName "hp-color_laserjet_cp4520_series-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cp4520 Series Printer)" + } +@@ -11327,7 +11328,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 4550" + Attribute "NickName" "" "HP Color LaserJet 4550 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 4550" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4550;DES:hp color laserjet 4550;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet 4550 ;DES:Hewlett-Packard Color LaserJet 4550;" + PCFileName "hp-color_laserjet_4550-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 4550 Printer)" + Attribute "Product" "" "(HP Color LaserJet 4550n Printer)" +@@ -11340,7 +11341,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 4600 Series" + Attribute "NickName" "" "HP Color LaserJet 4600 Series, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 4600 Series" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4600 series;DES:hp color laserjet 4600 series;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 4600;DES:Hewlett-Packard color LaserJet 4600;" + PCFileName "hp-color_laserjet_4600_series.ppd" + Attribute "Product" "" "(HP Color LaserJet 4600 Printer)" + Attribute "Product" "" "(HP Color LaserJet 4600dn Printer)" +@@ -11352,7 +11353,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 4600" + Attribute "NickName" "" "HP Color LaserJet 4600 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 4600" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4600;DES:hp color laserjet 4600;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 4600;DES:hp color laserjet 4600;" + PCFileName "hp-color_laserjet_4600-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 4600 Series Printer)" + } +@@ -11368,7 +11369,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 4650" + Attribute "NickName" "" "HP Color LaserJet 4650 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 4650" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4650;DES:hp color laserjet 4650;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 4650;DES:hp color laserjet 4650;" + PCFileName "hp-color_laserjet_4650-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 4650 Printer)" + Attribute "Product" "" "(HP Color LaserJet 4650n Printer)" +@@ -11380,7 +11381,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 4700" + Attribute "NickName" "" "HP Color LaserJet 4700 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 4700" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 4700;DES:hp color laserjet 4700;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet 4700;DES:hp color laserjet 4700;" + PCFileName "hp-color_laserjet_4700-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 4700 Printer)" + Attribute "Product" "" "(HP Color LaserJet 4700dn Printer)" +@@ -11392,7 +11393,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet cm4730 MFP" + Attribute "NickName" "" "HP Color LaserJet cm4730 MFP pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet cm4730 MFP" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm4730 mfp;DES:hp color laserjet cm4730 mfp;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM4730 MFP;DES:hp color laserjet cm4730 mfp;" + PCFileName "hp-color_laserjet_cm4730_mfp-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet cm4730 Multifunction Printer)" + Attribute "Product" "" "(HP Color LaserJet cm4730f Multifunction Printer)" +@@ -11438,7 +11439,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet 9100 Series" + Attribute "NickName" "" "HP Officejet 9100 Series pcl3, $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)" +@@ -11479,7 +11480,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Business Inkjet 2800" + Attribute "NickName" "" "HP Business Inkjet 2800 pcl3, $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)" +@@ -11514,7 +11515,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 5550" + Attribute "NickName" "" "HP Color LaserJet 5550 pcl3, $Version" + Attribute "ShortNickName" "" "HP Color LaserJet 5550" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 5550;DES:hp color laserjet 5550;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 5550 ;DES:hp color laserjet 5550;" + PCFileName "hp-color_laserjet_5550-pcl3.ppd" + Attribute "Product" "" "(HP Color LaserJet 5550n Printer)" + Attribute "Product" "" "(HP Color LaserJet 5550 Printer)" +@@ -11771,7 +11772,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1010" + Attribute "NickName" "" "HP LaserJet 1010, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1010" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1010;DES:hp laserjet 1010;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1010;DES:Hewlett-Packard LaserJet 1010;" + PCFileName "hp-laserjet_1010.ppd" + Attribute "Product" "" "(HP LaserJet 1010 Printer)" + } +@@ -11779,7 +11780,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1012" + Attribute "NickName" "" "HP LaserJet 1012, $Version" + Attribute "ShortNickName" "" "HP LaserJet 1012" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1012;DES:hp laserjet 1012;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp LaserJet 1012;DES:hp laserjet 1012;" + PCFileName "hp-laserjet_1012.ppd" + Attribute "Product" "" "(HP LaserJet 1012 Printer)" + } +@@ -11987,7 +11988,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet Lx" + Attribute "NickName" "" "HP Officejet Lx, $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)" + } +@@ -12151,7 +12152,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet Series 300" + Attribute "NickName" "" "HP Officejet Series 300, $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)" + } +@@ -12175,7 +12176,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 400" + Attribute "NickName" "" "HP Deskjet 400, $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)" +@@ -12192,7 +12193,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 540" + Attribute "NickName" "" "HP Deskjet 540, $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)" + } +@@ -12317,7 +12318,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 630c" + Attribute "NickName" "" "HP Deskjet 630c, $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)" + } +@@ -12333,7 +12334,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 656c" + Attribute "NickName" "" "HP Deskjet 656c, $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)" +@@ -12446,7 +12447,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 600" + Attribute "NickName" "" "HP Deskjet 600, $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)" +@@ -12468,7 +12469,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet Series 500" + Attribute "NickName" "" "HP Officejet Series 500, $Version" + Attribute "ShortNickName" "" "HP Officejet Series 500" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet series 500;DES:officejet series 500;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:OfficeJet Series 500;DES:officejet series 500;" + PCFileName "hp-officejet_series_500.ppd" + Attribute "Product" "" "(HP Officejet 500 All-in-one Printer)" + } +@@ -12508,7 +12509,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet Series 600" + Attribute "NickName" "" "HP Officejet Series 600, $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)" + } +@@ -12560,7 +12561,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 670c" + Attribute "NickName" "" "HP Deskjet 670c, $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)" + } +@@ -12712,7 +12713,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 610c" + Attribute "NickName" "" "HP Deskjet 610c, $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)" + } +@@ -12736,7 +12737,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 640c" + Attribute "NickName" "" "HP Deskjet 640c, $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)" +@@ -12756,7 +12757,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 690c" + Attribute "NickName" "" "HP Deskjet 690c, $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)" +@@ -12816,7 +12817,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet Series 700" + Attribute "NickName" "" "HP Officejet Series 700, $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)" + } +@@ -12959,7 +12960,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet T Series" + Attribute "NickName" "" "HP Officejet T Series, $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)" +@@ -12970,7 +12971,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet r40" + Attribute "NickName" "" "HP Officejet r40, $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)" + } +@@ -12994,7 +12995,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet r60" + Attribute "NickName" "" "HP Officejet r60, $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)" + } +@@ -13002,7 +13003,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet r65" + Attribute "NickName" "" "HP Officejet r65, $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)" + } +@@ -13018,7 +13019,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet r80" + Attribute "NickName" "" "HP Officejet r80, $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)" + } +@@ -13026,7 +13027,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP PSC 500" + Attribute "NickName" "" "HP PSC 500, $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)" +@@ -13043,7 +13044,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 812c" + Attribute "NickName" "" "HP Deskjet 812c, $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)" + } +@@ -13051,7 +13052,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 815c" + Attribute "NickName" "" "HP Deskjet 815c, $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)" + } +@@ -13083,7 +13084,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 840c" + Attribute "NickName" "" "HP Deskjet 840c, $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)" + } +@@ -13091,7 +13092,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 841c" + Attribute "NickName" "" "HP Deskjet 841c, $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)" + } +@@ -13107,7 +13108,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 843c" + Attribute "NickName" "" "HP Deskjet 843c, $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)" +@@ -13116,7 +13117,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 880c" + Attribute "NickName" "" "HP Deskjet 880c, $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)" + } +@@ -13132,7 +13133,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 895c" + Attribute "NickName" "" "HP Deskjet 895c, $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)" +@@ -13249,7 +13250,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 825c" + Attribute "NickName" "" "HP Deskjet 825c, $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)" +@@ -13258,7 +13259,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 845c" + Attribute "NickName" "" "HP Deskjet 845c, $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)" +@@ -13369,7 +13370,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 850c" + Attribute "NickName" "" "HP Deskjet 850c, $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)" +@@ -13388,7 +13389,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 870c" + Attribute "NickName" "" "HP Deskjet 870c, $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)" +@@ -13399,7 +13400,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet Pro 1150c" + Attribute "NickName" "" "HP Officejet Pro 1150c, $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)" +@@ -13513,7 +13514,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Deskjet 890c" + Attribute "NickName" "" "HP Deskjet 890c, $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)" +@@ -13522,7 +13523,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Officejet Pro 1170c Series" + Attribute "NickName" "" "HP Officejet Pro 1170c Series, $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)" +@@ -13664,7 +13665,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1018" + Attribute "NickName" "" "HP LaserJet 1018, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet 1018" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1018;DES:hp laserjet 1018;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 1018;DES:HP LaserJet 1018;" + PCFileName "hp-laserjet_1018.ppd" + Attribute "Product" "" "(HP LaserJet 1018 Printer)" + Attribute "Product" "" "(HP LaserJet 1018s Printer)" +@@ -13673,7 +13674,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet 1020" + Attribute "NickName" "" "HP LaserJet 1020, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet 1020" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1020;DES:hp laserjet 1020;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet 1020;DES:HP LaserJet 1020;" + PCFileName "hp-laserjet_1020.ppd" + Attribute "Product" "" "(HP LaserJet 1020 Printer)" + Attribute "Product" "" "(HP LaserJet 1020 Plus Printer)" +@@ -14150,7 +14151,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 2600n" + Attribute "NickName" "" "HP Color LaserJet 2600n, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP Color LaserJet 2600n" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 2600n;DES:hp color laserjet 2600n;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet 2600n;DES:HP Color LaserJet 2600n;" + PCFileName "hp-color_laserjet_2600n.ppd" + Attribute "Product" "" "(HP Color LaserJet 2600n Printer)" + } +@@ -14285,7 +14286,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 3500" + Attribute "NickName" "" "HP Color LaserJet 3500, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP Color LaserJet 3500" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3500;DES:hp color laserjet 3500;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 3500;DES:Hewlett-Packard color LaserJet 3500;" + PCFileName "hp-color_laserjet_3500.ppd" + Attribute "Product" "" "(HP Color LaserJet 3500 Printer)" + Attribute "Product" "" "(HP Color LaserJet 3500dn Printer)" +@@ -14295,7 +14296,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP Color LaserJet 3550" + Attribute "NickName" "" "HP Color LaserJet 3550, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP Color LaserJet 3550" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 3550;DES:hp color laserjet 3550;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color LaserJet 3550;DES:Hewlett-Packard color LaserJet 3550;" + PCFileName "hp-color_laserjet_3550.ppd" + Attribute "Product" "" "(HP Color LaserJet 3550 Printer)" + } +@@ -14589,7 +14590,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet p1006" + Attribute "NickName" "" "HP LaserJet p1006, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet p1006" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1006;DES:hp laserjet p1006;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P1006;DES:HP LaserJet P1006;" + PCFileName "hp-laserjet_p1006.ppd" + Attribute "Product" "" "(HP LaserJet p1006 Printer)" + } +@@ -14597,7 +14598,7 @@ Group "RLT/HP Real Life Technologies" + ModelName "HP LaserJet p1007" + Attribute "NickName" "" "HP LaserJet p1007, $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet p1007" +- Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1007;DES:hp laserjet p1007;" ++ Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP LaserJet P1007;DES:HP LaserJet P1007;" + PCFileName "hp-laserjet_p1007.ppd" + Attribute "Product" "" "(HP LaserJet p1007 Printer)" + } diff --git a/hplip-deviceIDs-ppd.patch b/hplip-deviceIDs-ppd.patch new file mode 100644 index 0000000..27bb4cb --- /dev/null +++ b/hplip-deviceIDs-ppd.patch @@ -0,0 +1,484 @@ +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_4250-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_4250-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_4250-ps.ppd.deviceIDs-ppd 2010-05-12 11:56:17.000000000 +0200 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_4250-ps.ppd 2010-05-12 11:58:30.000000000 +0200 +@@ -53,6 +53,7 @@ + *HPPDEPanel: "HPImagingOptions" + + *% Product Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 4250;DES:Hewlett-Packard LaserJet 4250;" + *Product: "(hp LaserJet 4250)" + *Product: "(Hewlett-Packard hp LaserJet 4250)" + *Product: "(HP LaserJet 4250)" +diff -up hplip-3.10.2/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-color_laserjet_2605dn-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.deviceIDs-ppd 2010-05-12 11:36:35.000000000 +0200 ++++ hplip-3.10.2/prnt/ps/hp-color_laserjet_2605dn-ps.ppd 2010-05-12 11:39:06.000000000 +0200 +@@ -50,6 +50,7 @@ + + *% Product Name and Version Information + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet 2605dn;DES:Hewlett-Packard Color LaserJet 2605dn;" + *Product: "(HP Color LaserJet 2605)" + *Product: "(Hewlett-Packard HP Color LaserJet 2605)" + *Product: "(HP Color LaserJet 2605dn)" +diff -up hplip-3.10.2/prnt/ps/hp-color_laserjet_2840-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-color_laserjet_2840-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-color_laserjet_2840-ps.ppd.deviceIDs-ppd 2010-04-16 22:24:03.049147700 +0100 ++++ hplip-3.10.2/prnt/ps/hp-color_laserjet_2840-ps.ppd 2010-04-16 22:25:34.077147648 +0100 +@@ -46,6 +46,7 @@ + + *% Product Name and Version Information + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;CMD:PJL,PML,MLC,PCL,POSTSCRIPT,PCLXL;MDL:HP Color LaserJet 2840;DES:Hewlett-Packard Color LaserJet 2840;" + *Product: "(HP Color LaserJet 2820)" + *Product: "(Hewlett-Packard HP Color LaserJet 2820)" + *Product: "(HP Color LaserJet 2830)" +diff -up hplip-3.10.2/prnt/ps/hp-color_laserjet_3800-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-color_laserjet_3800-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-color_laserjet_3800-ps.ppd.deviceIDs-ppd 2010-04-16 22:22:28.705273898 +0100 ++++ hplip-3.10.2/prnt/ps/hp-color_laserjet_3800-ps.ppd 2010-04-16 22:23:28.914273477 +0100 +@@ -51,6 +51,7 @@ + + *% Product Name and Version Information + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet 3800;CMD:PJL,MLC,BIDI-ECP,PCLXL,PCL,PDF,PJL,POSTSCRIPT;" + *Product: "(HP Color LaserJet 3800)" + *Product: "(Hewlett-Packard HP Color LaserJet 3800)" + *ModelName: "HP Color LaserJet 3800" +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:53.000000000 +0000 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_1200n-ps.ppd 2010-04-16 22:21:49.286273004 +0100 +@@ -56,6 +56,7 @@ + *Product: "(HP LaserJet 1200)" + *Product: "(Hewlett-Packard HP LaserJet 1200)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 1200;DES:Hewlett-Packard LaserJet 1200;" + *PSVersion: "(2014.116) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:53.000000000 +0000 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_1200-ps.ppd 2010-04-16 22:21:49.292272590 +0100 +@@ -56,6 +56,7 @@ + *Product: "(HP LaserJet 1200)" + *Product: "(Hewlett-Packard HP LaserJet 1200)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 1200;DES:Hewlett-Packard LaserJet 1200;" + *PSVersion: "(2014.116) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:54.000000000 +0000 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_1320n-ps.ppd 2010-04-16 22:21:49.300272653 +0100 +@@ -57,6 +57,7 @@ + *Product: "(Hewlett-Packard hp LaserJet 1320 series)" + *Product: "(HP LaserJet 1320 series)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" + *PSVersion: "(2014.116) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:54.000000000 +0000 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_1320nw-ps.ppd 2010-04-16 22:21:49.304148148 +0100 +@@ -57,6 +57,7 @@ + *Product: "(Hewlett-Packard hp LaserJet 1320 series)" + *Product: "(HP LaserJet 1320 series)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" + *PSVersion: "(2014.116) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:54.000000000 +0000 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_1320-ps.ppd 2010-04-16 22:21:49.317273026 +0100 +@@ -57,6 +57,7 @@ + *Product: "(Hewlett-Packard hp LaserJet 1320 series)" + *Product: "(HP LaserJet 1320 series)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" + *PSVersion: "(2014.116) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:54.000000000 +0000 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_1320_series-ps.ppd 2010-04-16 22:21:49.321272466 +0100 +@@ -57,6 +57,7 @@ + *Product: "(Hewlett-Packard hp LaserJet 1320 series)" + *Product: "(HP LaserJet 1320 series)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" + *PSVersion: "(2014.116) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:54.000000000 +0000 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_1320tn-ps.ppd 2010-04-16 22:21:49.334278100 +0100 +@@ -57,6 +57,7 @@ + *Product: "(Hewlett-Packard hp LaserJet 1320 series)" + *Product: "(HP LaserJet 1320 series)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1320 series;DES:Hewlett-Packard LaserJet 1320 series;" + *PSVersion: "(2014.116) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:54.000000000 +0000 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_2300-ps.ppd 2010-04-16 22:21:49.342272544 +0100 +@@ -61,6 +61,7 @@ + *Product: "(Hewlett-Packard hp LaserJet 2300L)" + *Product: "(HP LaserJet 2300L)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series" + *PSVersion: "(3010.107) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:54.000000000 +0000 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_2300_series-ps.ppd 2010-04-16 22:21:49.346272524 +0100 +@@ -61,6 +61,7 @@ + *Product: "(Hewlett-Packard hp LaserJet 2300L)" + *Product: "(HP LaserJet 2300L)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2300 series;DES:Hewlett-Packard LaserJet 2300 series" + *PSVersion: "(3010.107) 0" + + *%================================================= +diff -up hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd +--- hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd 2010-02-24 23:09:55.000000000 +0000 ++++ hplip-3.10.2/prnt/ps/hp-laserjet_p2015_series-ps.ppd 2010-04-16 22:21:49.376148194 +0100 +@@ -64,6 +64,7 @@ + *Product: "(HP LaserJet P2015 Series)" + *Product: "(Hewlett-Packard HP LaserJet P2015 Series)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P2015 Series;DES:Hewlett-Packard LaserJet P2015 series;" + *PSVersion: "(3010.107) 0" + + *%================================================= +diff -up hplip-3.10.6/prnt/ps/hp-laserjet_4000_series-ps.ppd.deviceIDs-ppd hplip-3.10.6/prnt/ps/hp-laserjet_4000_series-ps.ppd +--- hplip-3.10.6/prnt/ps/hp-laserjet_4000_series-ps.ppd.deviceIDs-ppd 2010-09-13 12:42:36.000000000 +0200 ++++ hplip-3.10.6/prnt/ps/hp-laserjet_4000_series-ps.ppd 2010-09-13 12:45:07.000000000 +0200 +@@ -51,6 +51,7 @@ + + + *% Product Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 4000 Series;DES:Hewlett-Packard LaserJet 4000 Series" + *Product: "(HP LaserJet 4000 Series)" + *Product: "(Hewlett-Packard HP LaserJet 4000 Series)" + *ModelName: "HP LaserJet 4000 Series" +diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_2500-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_2500-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-color_laserjet_2500-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-color_laserjet_2500-ps.ppd 2010-12-03 16:12:33.000000000 +0100 +@@ -44,6 +44,7 @@ + + + *% Product Name and Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 2500;" + *Manufacturer: "HP" + *Product: "(hp color LaserJet 2500)" + *Product: "(Hewlett-Packard hp color LaserJet 2500)" +diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_2500_series-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-color_laserjet_2500_series-ps.ppd 2010-12-03 16:12:11.000000000 +0100 +@@ -44,6 +44,7 @@ + + + *% Product Name and Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 2500;" + *Manufacturer: "HP" + *Product: "(hp color LaserJet 2500)" + *Product: "(Hewlett-Packard hp color LaserJet 2500)" +diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_2550_series-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-color_laserjet_2550_series-ps.ppd 2010-12-03 16:12:57.000000000 +0100 +@@ -44,6 +44,7 @@ + + + *% Product Name and Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 2550 series;" + *Manufacturer: "HP" + *Product: "(hp color LaserJet 2550 series)" + *Product: "(Hewlett-Packard hp color LaserJet 2550 series)" +diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_3700n-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_3700n-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-color_laserjet_3700n-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-color_laserjet_3700n-ps.ppd 2010-12-03 16:13:58.000000000 +0100 +@@ -43,6 +43,7 @@ + + + *% Product Name and Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 3700;" + *Manufacturer: "HP" + *Product: "(hp color LaserJet 3700)" + *Product: "(Hewlett-Packard hp color LaserJet 3700)" +diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_3700-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_3700-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-color_laserjet_3700-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-color_laserjet_3700-ps.ppd 2010-12-03 16:13:23.000000000 +0100 +@@ -43,6 +43,7 @@ + + + *% Product Name and Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 3700;" + *Manufacturer: "HP" + *Product: "(hp color LaserJet 3700)" + *Product: "(Hewlett-Packard hp color LaserJet 3700)" +diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_4550-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_4550-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-color_laserjet_4550-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-color_laserjet_4550-ps.ppd 2010-12-03 16:14:24.000000000 +0100 +@@ -43,6 +43,7 @@ + + + *% Product Name and Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet 4550 ;" + *Manufacturer: "HP" + *Product: "(HP Color LaserJet 4550 )" + *Product: "(Hewlett-Packard HP Color LaserJet 4550 )" +diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_4600-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_4600-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-color_laserjet_4600-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-color_laserjet_4600-ps.ppd 2010-12-03 16:14:49.000000000 +0100 +@@ -44,6 +44,7 @@ + + + *% Product Name and Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 4600;" + *Manufacturer: "HP" + *Product: "(hp color LaserJet 4600)" + *Product: "(Hewlett-Packard hp color LaserJet 4600)" +diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_4600_series-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-color_laserjet_4600_series-ps.ppd 2010-12-03 16:15:10.000000000 +0100 +@@ -44,6 +44,7 @@ + + + *% Product Name and Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 4600;" + *Manufacturer: "HP" + *Product: "(hp color LaserJet 4600)" + *Product: "(Hewlett-Packard hp color LaserJet 4600)" +diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_4650-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_4650-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-color_laserjet_4650-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-color_laserjet_4650-ps.ppd 2010-12-03 16:15:43.000000000 +0100 +@@ -47,6 +47,7 @@ + + + *% Product Name and Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 4650;" + *Manufacturer: "HP" + *Product: "(hp color LaserJet 4650)" + *Product: "(Hewlett-Packard hp color LaserJet 4650)" +diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_4700-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_4700-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-color_laserjet_4700-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-color_laserjet_4700-ps.ppd 2010-12-03 16:16:06.000000000 +0100 +@@ -49,6 +49,7 @@ + + + *% Product Name and Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet 4700;" + *Manufacturer: "HP" + *Product: "(HP Color LaserJet 4700)" + *Product: "(Hewlett-Packard HP Color LaserJet 4700)" +diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_5550-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_5550-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-color_laserjet_5550-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-color_laserjet_5550-ps.ppd 2010-12-03 16:16:29.000000000 +0100 +@@ -46,6 +46,7 @@ + + + *% Product Name and Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp color LaserJet 5550 ;" + *Manufacturer: "HP" + *Product: "(hp color LaserJet 5550 )" + *Product: "(Hewlett-Packard hp color LaserJet 5550 )" +diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd 2010-12-03 16:17:23.000000000 +0100 +@@ -49,6 +49,7 @@ + *%== Mac OS X specific end == + + *% Product Name and Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM4730 MFP;" + *Manufacturer: "HP" + *Product: "(HP Color LaserJet CM4730 MFP)" + *Product: "(Hewlett-Packard HP Color LaserJet CM4730 MFP)" +diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_cp3525-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-color_laserjet_cp3525-ps.ppd 2010-12-03 16:16:55.000000000 +0100 +@@ -51,6 +51,7 @@ + *%== Mac OS X specific end == + + *% Product Name and Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP3525;" + *Manufacturer: "HP" + *Product: "(HP Color LaserJet CP3525)" + *Product: "(Hewlett-Packard HP Color LaserJet CP3525)" +diff -up hplip-3.10.9/prnt/ps/hp-laserjet_2100-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_2100-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-laserjet_2100-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-laserjet_2100-ps.ppd 2010-12-03 16:04:48.000000000 +0100 +@@ -56,6 +56,7 @@ + *Product: "(HP LaserJet 2100 Series)" + *Product: "(Hewlett-Packard HP LaserJet 2100 Series)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 2100 Series;" + *PSVersion: "(2014.111) 1" + + *%================================================= +diff -up hplip-3.10.9/prnt/ps/hp-laserjet_2100_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_2100_series-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-laserjet_2100_series-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-laserjet_2100_series-ps.ppd 2010-12-03 16:05:22.000000000 +0100 +@@ -56,6 +56,7 @@ + *Product: "(HP LaserJet 2100 Series)" + *Product: "(Hewlett-Packard HP LaserJet 2100 Series)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 2100 Series;" + *PSVersion: "(2014.111) 1" + + *%================================================= +diff -up hplip-3.10.9/prnt/ps/hp-laserjet_2420-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_2420-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-laserjet_2420-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-laserjet_2420-ps.ppd 2010-12-03 16:05:51.000000000 +0100 +@@ -60,6 +60,7 @@ + *Product: "(Hewlett-Packard hp LaserJet 2420)" + *Product: "(HP LaserJet 2420)" + *Manufacturer: "HP" ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 2420;" + *PSVersion: "(3010.107) 0" + + *%================================================= +diff -up hplip-3.10.9/prnt/ps/hp-laserjet_4050_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_4050_series-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-laserjet_4050_series-ps.ppd.deviceIDs-ppd 2010-12-03 15:24:27.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-laserjet_4050_series-ps.ppd 2010-12-03 16:03:05.000000000 +0100 +@@ -52,6 +52,7 @@ + + + *% Product Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 4050 Series ;" + *Product: "(HP LaserJet 4050 Series )" + *Product: "(Hewlett-Packard HP LaserJet 4050 Series )" + *Product: "(HP LaserJet 4050 Series)" +diff -up hplip-3.10.9/prnt/ps/hp-laserjet_4100_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_4100_series-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-laserjet_4100_series-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-laserjet_4100_series-ps.ppd 2010-12-03 16:03:27.000000000 +0100 +@@ -51,6 +51,7 @@ + + + *% Product Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 4100 Series ;" + *Product: "(HP LaserJet 4100 Series )" + *Product: "(Hewlett-Packard HP LaserJet 4100 Series )" + *Product: "(HP LaserJet 4100 Series)" +diff -up hplip-3.10.9/prnt/ps/hp-laserjet_4200-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_4200-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-laserjet_4200-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-laserjet_4200-ps.ppd 2010-12-03 16:06:31.000000000 +0100 +@@ -52,6 +52,7 @@ + + + *% Product Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 4200;" + *Product: "(hp LaserJet 4200)" + *Product: "(Hewlett-Packard hp LaserJet 4200)" + *Product: "(HP LaserJet 4200)" +diff -up hplip-3.10.9/prnt/ps/hp-laserjet_4300-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_4300-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-laserjet_4300-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-laserjet_4300-ps.ppd 2010-12-03 16:07:07.000000000 +0100 +@@ -52,6 +52,7 @@ + + + *% Product Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 4300;" + *Product: "(hp LaserJet 4300)" + *Product: "(Hewlett-Packard hp LaserJet 4300)" + *Product: "(HP LaserJet 4300)" +diff -up hplip-3.10.9/prnt/ps/hp-laserjet_4350-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_4350-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-laserjet_4350-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-laserjet_4350-ps.ppd 2010-12-03 16:07:37.000000000 +0100 +@@ -53,6 +53,7 @@ + *HPPDEPanel: "HPImagingOptions" + + *% Product Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 4350;" + *Product: "(hp LaserJet 4350)" + *Product: "(Hewlett-Packard hp LaserJet 4350)" + *Product: "(HP LaserJet 4350)" +diff -up hplip-3.10.9/prnt/ps/hp-laserjet_5100_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_5100_series-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-laserjet_5100_series-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-laserjet_5100_series-ps.ppd 2010-12-03 16:08:01.000000000 +0100 +@@ -53,6 +53,7 @@ + + + *% Product Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 5100 Series;" + *Product: "(HP LaserJet 5100 Series)" + *Product: "(Hewlett-Packard HP LaserJet 5100 Series)" + *ModelName: "HP LaserJet 5100 Series" +diff -up hplip-3.10.9/prnt/ps/hp-laserjet_8000-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_8000-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-laserjet_8000-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-laserjet_8000-ps.ppd 2010-12-03 16:08:28.000000000 +0100 +@@ -55,6 +55,7 @@ + *%================================================= + *% Product Version Information + *%================================================= ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 8000 Series;" + *ModelName: "HP LaserJet 8000 Series" + *ShortNickName: "HP LaserJet 8000 Series" + *NickName: "HP LaserJet 8000 Series Postscript (recommended)" +diff -up hplip-3.10.9/prnt/ps/hp-laserjet_8000_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_8000_series-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-laserjet_8000_series-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-laserjet_8000_series-ps.ppd 2010-12-03 16:08:53.000000000 +0100 +@@ -55,6 +55,7 @@ + *%================================================= + *% Product Version Information + *%================================================= ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 8000 Series;" + *ModelName: "HP LaserJet 8000 Series" + *ShortNickName: "HP LaserJet 8000 Series" + *NickName: "HP LaserJet 8000 Series Postscript (recommended)" +diff -up hplip-3.10.9/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd 2010-12-03 16:10:19.000000000 +0100 +@@ -56,6 +56,7 @@ + *%================================================= + *% Product Version Information + *%================================================= ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet M3027 MFP;" + *ModelName: "HP LaserJet M3027 MFP" + *ShortNickName: "HP LaserJet M3027 MFP" + *NickName: "HP LaserJet M3027 MFP Postscript (recommended)" +diff -up hplip-3.10.9/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd 2010-12-03 16:10:41.000000000 +0100 +@@ -56,6 +56,7 @@ + *%================================================= + *% Product Version Information + *%================================================= ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet M3035 MFP;" + *ModelName: "HP LaserJet M3035 MFP" + *ShortNickName: "HP LaserJet M3035 MFP" + *NickName: "HP LaserJet M3035 MFP Postscript (recommended)" +diff -up hplip-3.10.9/prnt/ps/hp-laserjet_p3005-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_p3005-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-laserjet_p3005-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-laserjet_p3005-ps.ppd 2010-12-03 16:11:04.000000000 +0100 +@@ -57,6 +57,7 @@ + *%================================================= + *% Product Version Information + *%================================================= ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P3005;" + *ModelName: "HP LaserJet P3005" + *ShortNickName: "HP LaserJet P3005" + *NickName: "HP LaserJet P3005 Postscript (recommended)" +diff -up hplip-3.10.9/prnt/ps/hp-laserjet_p3010_series-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-laserjet_p3010_series-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-laserjet_p3010_series-ps.ppd.deviceIDs-ppd 2010-12-03 15:57:26.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-laserjet_p3010_series-ps.ppd 2010-12-03 16:11:32.000000000 +0100 +@@ -51,6 +51,7 @@ + *%== Mac OS X specific end == + + *% Product Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet P3010 Series;" + *Product: "(HP LaserJet P3015)" + *Product: "(Hewlett-Packard HP LaserJet P3015)" + *Product: "(HP LaserJet P3011)" +diff -up hplip-3.10.9/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.deviceIDs-ppd hplip-3.10.9/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd +--- hplip-3.10.9/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.deviceIDs-ppd 2010-12-03 17:40:35.000000000 +0100 ++++ hplip-3.10.9/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd 2010-12-03 17:41:03.000000000 +0100 +@@ -51,6 +51,7 @@ + *%== Mac OS X specific end == + + *% Product Name and Version Information ++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM3530 MFP;" + *Manufacturer: "HP" + *Product: "(HP Color LaserJet CM3530 MFP)" + *Product: "(Hewlett-Packard HP Color LaserJet CM3530 MFP)" diff --git a/hplip-discovery-method.patch b/hplip-discovery-method.patch new file mode 100644 index 0000000..cb277a3 --- /dev/null +++ b/hplip-discovery-method.patch @@ -0,0 +1,11 @@ +diff -up hplip-3.9.8/ui4/setupdialog.py.discovery-method hplip-3.9.8/ui4/setupdialog.py +--- hplip-3.9.8/ui4/setupdialog.py.discovery-method 2009-08-04 22:37:22.000000000 +0100 ++++ hplip-3.9.8/ui4/setupdialog.py 2009-09-16 15:34:36.509431266 +0100 +@@ -171,6 +171,7 @@ class SetupDialog(QDialog, Ui_Dialog): + QTimer.singleShot(0, self.showRemovePage) + else: + if self.skip_discovery: ++ self.discovery_method = 1 # mDNS + QTimer.singleShot(0, self.showDevicesPage) + else: + QTimer.singleShot(0, self.showDiscoveryPage) diff --git a/hplip-emit-SIGNAL.patch b/hplip-emit-SIGNAL.patch new file mode 100644 index 0000000..aa72dce --- /dev/null +++ b/hplip-emit-SIGNAL.patch @@ -0,0 +1,25 @@ +diff -up hplip-3.10.9/ui4/setupdialog.py.emit-SIGNAL hplip-3.10.9/ui4/setupdialog.py +--- hplip-3.10.9/ui4/setupdialog.py.emit-SIGNAL 2010-12-14 15:51:43.579041162 +0000 ++++ hplip-3.10.9/ui4/setupdialog.py 2010-12-14 15:52:02.631111875 +0000 +@@ -867,8 +867,8 @@ class SetupDialog(QDialog, Ui_Dialog): + self.printer_fax_names_same = False + self.printer_name_ok = True + +- self.FaxNameLineEdit.emit(SIGNAL("textChanged(const QString &)"), +- (self.FaxNameLineEdit.text(),)) ++ self.FaxNameLineEdit.emit(SIGNAL("textEdited(const QString &)"), ++ self.FaxNameLineEdit.text()) + + self.setIndicators() + self.setAddPrinterButton() +@@ -899,8 +899,8 @@ class SetupDialog(QDialog, Ui_Dialog): + self.printer_fax_names_same = False + self.fax_name_ok = True + +- self.PrinterNameLineEdit.emit(SIGNAL("textChanged(const QString&)"), +- (self.PrinterNameLineEdit.text(),)) ++ self.PrinterNameLineEdit.emit(SIGNAL("textEdited(const QString &)"), ++ self.PrinterNameLineEdit.text()) + + self.setIndicators() + self.setAddPrinterButton() diff --git a/hplip-fab-root-crash.patch b/hplip-fab-root-crash.patch new file mode 100644 index 0000000..a6e31d9 --- /dev/null +++ b/hplip-fab-root-crash.patch @@ -0,0 +1,33 @@ +diff -up hplip-3.10.9/fax/fax.py.fab-root-crash hplip-3.10.9/fax/fax.py +--- hplip-3.10.9/fax/fax.py.fab-root-crash 2010-11-12 10:36:30.504796972 +0000 ++++ hplip-3.10.9/fax/fax.py 2010-11-12 10:38:39.906166234 +0000 +@@ -203,17 +203,19 @@ class FaxAddressBook(object): # Pickle b + self.load() + + def load(self): +- self._fab = os.path.join(prop.user_dir, "fab.pickle") +- #old_fab = os.path.join(prop.user_dir, "fab.db") ++ self._fab = "/dev/null" ++ if prop.user_dir != None: ++ self._fab = os.path.join(prop.user_dir, "fab.pickle") ++ #old_fab = os.path.join(prop.user_dir, "fab.db") ++ ++ # Load the existing pickle if present ++ if os.path.exists(self._fab): ++ pickle_file = open(self._fab, "r") ++ self._data = cPickle.load(pickle_file) ++ pickle_file.close() + +- # Load the existing pickle if present +- if os.path.exists(self._fab): +- pickle_file = open(self._fab, "r") +- self._data = cPickle.load(pickle_file) +- pickle_file.close() +- +- else: +- self.save() # save the empty file to create the file ++ else: ++ self.save() # save the empty file to create the file + + + def set(self, name, title, firstname, lastname, fax, groups, notes): diff --git a/hplip-hpaio-segfault.patch b/hplip-hpaio-segfault.patch new file mode 100644 index 0000000..936c5d0 --- /dev/null +++ b/hplip-hpaio-segfault.patch @@ -0,0 +1,11 @@ +diff -up hplip-3.10.9/io/hpmud/hpmud.c.hpaio-segfault hplip-3.10.9/io/hpmud/hpmud.c +--- hplip-3.10.9/io/hpmud/hpmud.c.hpaio-segfault 2010-12-13 16:53:16.470306314 +0000 ++++ hplip-3.10.9/io/hpmud/hpmud.c 2010-12-13 16:53:17.423332321 +0000 +@@ -305,6 +305,7 @@ static int new_device(const char *uri, e + { + BUG("invalid uri %s\n", uri); + *result = HPMUD_R_INVALID_URI; ++ index = 0; + goto bugout; + } + msp->device[i].io_mode = mode; diff --git a/hplip-hpcups-sigpipe.patch b/hplip-hpcups-sigpipe.patch new file mode 100644 index 0000000..3dbe0b0 --- /dev/null +++ b/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/hplip-hpijs-marker-supply.patch b/hplip-hpijs-marker-supply.patch new file mode 100644 index 0000000..3ae7c16 --- /dev/null +++ b/hplip-hpijs-marker-supply.patch @@ -0,0 +1,31 @@ +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; + + 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/hplip-hpinfo-query-without-cups-queue.patch b/hplip-hpinfo-query-without-cups-queue.patch new file mode 100644 index 0000000..dc986f5 --- /dev/null +++ b/hplip-hpinfo-query-without-cups-queue.patch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## hpinfo-query-without-cups-queue.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad hplip-3.9.2~/info.py hplip-3.9.2/info.py +--- hplip-3.9.2~/info.py 2009-02-19 21:36:58.000000000 -0300 ++++ hplip-3.9.2/info.py 2009-02-25 17:20:56.000000000 -0300 +@@ -37,7 +37,7 @@ + from prnt import cups + + try: +- restrict = True ++ restrict = False + + devid_mode = '--id' in sys.argv # hack + if devid_mode: diff --git a/hplip-mucks-with-spooldir.patch b/hplip-mucks-with-spooldir.patch new file mode 100644 index 0000000..d110ce7 --- /dev/null +++ b/hplip-mucks-with-spooldir.patch @@ -0,0 +1,30 @@ +diff -up hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.mucks-with-spooldir hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp +--- hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp.mucks-with-spooldir 2010-02-26 12:07:47.170265651 +0000 ++++ hplip-3.10.2/prnt/hpcups/HPCupsFilter.cpp 2010-02-26 12:09:13.647265807 +0000 +@@ -443,26 +443,6 @@ int HPCupsFilter::StartPrintJob(int arg + + getLogLevel(); + m_JA.job_id = atoi(argv[1]); +- FILE *fp; +- char dFileName[32]; +- memset(dFileName, 0, sizeof(dFileName)); +- m_JA.job_id = atoi(argv[1]); +- snprintf (dFileName, sizeof(dFileName), "/var/spool/cups/d%05d-001", m_JA.job_id); +- if ((fp = fopen (dFileName, "r"))) +- { +- char line[258]; +- for (int i = 0; i < 10; i++) +- { +- fgets (line, 256, fp); +- if (!strncmp (line, "%%Pages:", 8)) +- { +- sscanf (line+9, "%d", &m_JA.total_pages); +- break; +- } +- } +- fclose (fp); +- } +- + m_ppd = ppdOpenFile(getenv("PPD")); + if (m_ppd == NULL) { + dbglog("DEBUG: ppdOpenFile failed for %s\n", getenv("PPD")); diff --git a/hplip-newline.patch b/hplip-newline.patch new file mode 100644 index 0000000..4d6602c --- /dev/null +++ b/hplip-newline.patch @@ -0,0 +1,12 @@ +diff -Naurp hplip-3.11.5/prnt/hpcups/HPCupsFilter.cpp hplip-3.11.5.oden/prnt/hpcups/HPCupsFilter.cpp +--- hplip-3.11.5/prnt/hpcups/HPCupsFilter.cpp 2011-05-15 19:45:28.389883973 +0200 ++++ hplip-3.11.5.oden/prnt/hpcups/HPCupsFilter.cpp 2011-05-15 19:45:47.041883971 +0200 +@@ -618,7 +618,7 @@ int HPCupsFilter::processRasterData(cups + dbglog("10......\n"); + } + +- fprintf(stderr, "PAGE: %d %s", current_page_number, m_argv[4]); ++ fprintf(stderr, "PAGE: %d %s\n", current_page_number, m_argv[4]); + // Iterating through the raster per page + for (int y = 0; y < (int) cups_header.cupsHeight; y++) { + cupsRasterReadPixels (cups_raster, m_pPrinterBuffer, cups_header.cupsBytesPerLine); diff --git a/hplip-no-asm.patch b/hplip-no-asm.patch new file mode 100644 index 0000000..92c283f --- /dev/null +++ b/hplip-no-asm.patch @@ -0,0 +1,49 @@ +diff -up hplip-3.9.8/ip/ipmain.c.no-asm hplip-3.9.8/ip/ipmain.c +--- hplip-3.9.8/ip/ipmain.c.no-asm 2009-08-04 22:37:28.000000000 +0100 ++++ hplip-3.9.8/ip/ipmain.c 2009-08-25 14:44:04.497202437 +0100 +@@ -265,9 +265,6 @@ static IP_XFORM_TBL * const xformJumpTab + void fatalBreakPoint (void) + { + /* do nothing */ +-#if defined _DEBUG +- __asm int 3; +-#endif + PRINT0 (_T("\nhit fatalBreakPoint!\n")); + } + +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/hplip-no-system-tray.patch b/hplip-no-system-tray.patch new file mode 100644 index 0000000..9a1db6c --- /dev/null +++ b/hplip-no-system-tray.patch @@ -0,0 +1,20 @@ +diff -up hplip-3.10.5/ui4/systemtray.py.no-system-tray hplip-3.10.5/ui4/systemtray.py +--- hplip-3.10.5/ui4/systemtray.py.no-system-tray 2010-05-13 01:45:04.000000000 +0200 ++++ hplip-3.10.5/ui4/systemtray.py 2010-05-17 15:03:12.000000000 +0200 +@@ -74,6 +74,7 @@ HIDE_INACTIVE_DELAY = 5000 + BLIP_DELAY = 2000 + SET_MENU_DELAY = 1000 + MAX_MENU_EVENTS = 10 ++TRAY_AVAILABLE_TIMEOUT = 180 + + ERROR_STATE_TO_ICON = { + ERROR_STATE_CLEAR: QSystemTrayIcon.Information, +@@ -706,7 +707,7 @@ def run(read_pipe): + app.setQuitOnLastWindowClosed(False) # If not set, settings dlg closes app + + i = 0 +- while i < 10: ++ while i < TRAY_AVAILABLE_TIMEOUT: + if QSystemTrayIcon.isSystemTrayAvailable(): + break + time.sleep(1.0) diff --git a/hplip-notification-exception.patch b/hplip-notification-exception.patch new file mode 100644 index 0000000..f0a7fb8 --- /dev/null +++ b/hplip-notification-exception.patch @@ -0,0 +1,23 @@ +diff -up hplip-3.10.9/ui4/systemtray.py.notification-exception hplip-3.10.9/ui4/systemtray.py +--- hplip-3.10.9/ui4/systemtray.py.notification-exception 2011-01-05 10:45:57.000000000 +0100 ++++ hplip-3.10.9/ui4/systemtray.py 2011-01-05 12:34:18.000000000 +0100 +@@ -27,6 +27,7 @@ import os + import signal + import os.path + import time ++import gobject + + + # Local +@@ -662,7 +663,10 @@ class SystemTrayApp(QApplication): + else: + n.set_timeout(TRAY_MESSAGE_DELAY) + +- n.show() ++ try: ++ n.show() ++ except gobject.GError: ++ log.error("Failed to show notification!") + + else: # Use "standard" message bubbles + icon = ERROR_STATE_TO_ICON.get(error_state, QSystemTrayIcon.Information) diff --git a/hplip-photosmart_b9100_support.patch b/hplip-photosmart_b9100_support.patch new file mode 100644 index 0000000..6dbf0c6 --- /dev/null +++ b/hplip-photosmart_b9100_support.patch @@ -0,0 +1,23 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## hp_photosmart_pro_b9100_support.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad hplip-3.9.10~55~/data/models/models.dat hplip-3.9.10~55/data/models/models.dat +--- hplip-3.9.10~55~/data/models/models.dat 2009-11-04 11:06:38.000000000 +0100 ++++ hplip-3.9.10~55/data/models/models.dat 2009-11-10 10:11:32.000000000 +0100 +@@ -40174,9 +40174,9 @@ + status-type=2 + support-released=True + support-subtype=219b2b +-support-type=0 +-support-ver=0.0.0 +-tech-class=Undefined ++support-type=2 ++support-ver=2.8.4 ++tech-class=PSB9100 + tech-subclass=Normal + tech-type=2 + usb-pid=bd02 diff --git a/hplip-pjl-duplex-binding.patch b/hplip-pjl-duplex-binding.patch new file mode 100644 index 0000000..5091b08 --- /dev/null +++ b/hplip-pjl-duplex-binding.patch @@ -0,0 +1,74 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## pjl-duplex-binding.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: https://bugs.launchpad.net/hplip/+bug/244295 + +@DPATCH@ +diff -urNad hplip-2.8.7~/prnt/hpijs/ljcolor.cpp hplip-2.8.7/prnt/hpijs/ljcolor.cpp +--- hplip-2.8.7~/prnt/hpijs/ljcolor.cpp 2008-07-30 18:44:30.000000000 +0200 ++++ hplip-2.8.7/prnt/hpijs/ljcolor.cpp 2008-09-23 13:17:01.000000000 +0200 +@@ -325,6 +325,19 @@ + + err = thePrinter->Send ((const BYTE *) res, strlen (res)); + ++// Binding directive ++ ++ strcpy (res, "@PJL SET BINDING=LONGEDGE\015\012"); ++ ++#ifdef APDK_AUTODUPLEX ++ if (thePrintContext->QueryDuplexMode () == DUPLEXMODE_TABLET) ++ { ++ strcpy (res, "@PJL SET BINDING=SHORTEDGE\015\012"); ++ } ++#endif ++ ++ err = thePrinter->Send ((const BYTE *) res, strlen (res)); ++ + + err = thePrinter->Send ((const BYTE*) EnterLanguage, sizeof (EnterLanguage)); + ERRCHECK; +diff -urNad hplip-2.8.7~/prnt/hpijs/ljjetready.cpp hplip-2.8.7/prnt/hpijs/ljjetready.cpp +--- hplip-2.8.7~/prnt/hpijs/ljjetready.cpp 2008-07-30 18:44:30.000000000 +0200 ++++ hplip-2.8.7/prnt/hpijs/ljjetready.cpp 2008-09-23 13:17:01.000000000 +0200 +@@ -324,6 +324,17 @@ + err = thePrinter->Send ((const BYTE *) szScratchStr, strlen (szScratchStr)); + ERRCHECK; + ++ // Send the Binding command ++ strcpy (szScratchStr, "@PJL SET BINDING=LONGEDGE\015\012"); ++#ifdef APDK_AUTODUPLEX ++ if (thePrintContext->QueryDuplexMode () == DUPLEXMODE_TABLET) ++ { ++ strcpy (szScratchStr, "@PJL SET BINDING=SHORTEDGE\015\012"); ++ } ++#endif ++ err = thePrinter->Send ((const BYTE *) szScratchStr, strlen (szScratchStr)); ++ ERRCHECK; ++ + //Set the resolution to 600 + err = thePrinter->Send ((const BYTE*)ccpPJLSetRes,sizeof(ccpPJLSetRes)); + ERRCHECK; +diff -urNad hplip-2.8.7~/prnt/hpijs/ljmono.cpp hplip-2.8.7/prnt/hpijs/ljmono.cpp +--- hplip-2.8.7~/prnt/hpijs/ljmono.cpp 2008-07-30 18:44:30.000000000 +0200 ++++ hplip-2.8.7/prnt/hpijs/ljmono.cpp 2008-09-23 13:17:01.000000000 +0200 +@@ -207,6 +207,19 @@ + err = thePrinter->Send ((const BYTE *) res, strlen (res)); + ERRCHECK; + ++// Binding directive ++ ++ strcpy (res, "@PJL SET BINDING=LONGEDGE\015\012"); ++ ++#ifdef APDK_AUTODUPLEX ++ if (thePrintContext->QueryDuplexMode () == DUPLEXMODE_TABLET) ++ { ++ strcpy (res, "@PJL SET BINDING=SHORTEDGE\015\012"); ++ } ++#endif ++ err = thePrinter->Send ((const BYTE *) res, strlen (res)); ++ ERRCHECK; ++ + err = thePrinter->Send ((const BYTE*) EnterLanguage, sizeof (EnterLanguage)); + ERRCHECK; + diff --git a/hplip-pstotiff-is-rubbish.patch b/hplip-pstotiff-is-rubbish.patch new file mode 100644 index 0000000..37cccbe --- /dev/null +++ b/hplip-pstotiff-is-rubbish.patch @@ -0,0 +1,60 @@ +diff -up hplip-3.10.5/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.10.5/fax/filters/pstotiff +--- hplip-3.10.5/fax/filters/pstotiff.pstotiff-is-rubbish 2010-05-13 01:44:57.000000000 +0200 ++++ hplip-3.10.5/fax/filters/pstotiff 2010-05-17 14:39:55.000000000 +0200 +@@ -1,40 +1,16 @@ +-#!/usr/bin/env python +- +-import os +-import os.path +-import time +-import sys +-import tempfile +- +-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 -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) +- 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 -dNOPAUSE -dBATCH \ ++ -dSAFER -dPARANOIDSAFER \ ++ -dSHORTERRORS -dWRITESYSTEMDICT -dGHOSTSCRIPT \ ++ -sstdout=%stderr -sOutputFile="$TMPFILE" "$IN" ++RET=$? ++cat "$TMPFILE" ++rm -f "$TMPFILE" ++exit $RET diff --git a/hplip-raw_deviceID-traceback.patch b/hplip-raw_deviceID-traceback.patch new file mode 100644 index 0000000..062c331 --- /dev/null +++ b/hplip-raw_deviceID-traceback.patch @@ -0,0 +1,24 @@ +diff -up hplip-3.10.9/base/device.py.raw_deviceID-traceback hplip-3.10.9/base/device.py +--- hplip-3.10.9/base/device.py.raw_deviceID-traceback 2010-10-18 17:22:55.138868192 +0100 ++++ hplip-3.10.9/base/device.py 2010-10-18 17:24:02.965869220 +0100 +@@ -1368,6 +1368,8 @@ class Device(object): + + def getDeviceID(self): + needs_close = False ++ self.raw_deviceID = '' ++ self.deviceID = {} + if self.io_state != IO_STATE_HP_OPEN: + try: + self.open() +@@ -1377,10 +1379,7 @@ class Device(object): + + result_code, data = hpmudext.get_device_id(self.device_id) + +- if result_code != hpmudext.HPMUD_R_OK: +- self.raw_deviceID = '' +- self.deviceID = {} +- else: ++ if result_code == hpmudext.HPMUD_R_OK: + self.raw_deviceID = data + self.deviceID = parseDeviceID(data) + diff --git a/hplip-retry-open.patch b/hplip-retry-open.patch new file mode 100644 index 0000000..3667108 --- /dev/null +++ b/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/hplip-rss.patch b/hplip-rss.patch new file mode 100644 index 0000000..5311779 --- /dev/null +++ b/hplip-rss.patch @@ -0,0 +1,111 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## rss.dpatch by Torsten Landschoff +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Blank-ink-only patch by Richard Spencer-Smith + +@DPATCH@ +diff -urNad hplip~/prnt/hpijs/breaks_open.cpp hplip/prnt/hpijs/breaks_open.cpp +--- hplip~/prnt/hpijs/breaks_open.cpp 2006-03-16 11:12:00.000000000 -0300 ++++ hplip/prnt/hpijs/breaks_open.cpp 2006-03-16 11:22:28.984082881 -0300 +@@ -1078,7 +1078,10 @@ + + { + 0, 0, 255, 0, +-0, 1, 255, 0, ++// 2001.06.16 mrb: changed the value to 0. With the original "1" ++// the printer sometimes prints empty lines... ++//0, 1, 255, 0, ++0, 0, 255, 0, + 0, 3, 255, 0, + 0, 5, 255, 0, + 0, 7, 255, 0, +diff -urNad hplip~/prnt/hpijs/dj660_maps.cpp hplip/prnt/hpijs/dj660_maps.cpp +--- hplip~/prnt/hpijs/dj660_maps.cpp 2006-03-16 11:12:00.000000000 -0300 ++++ hplip/prnt/hpijs/dj660_maps.cpp 2006-03-16 11:22:28.984082881 -0300 +@@ -38,7 +38,10 @@ + //const + uint32_t ulMapDJ660_CCM_KCMY[ 9 * 9 * 9 ]= + { +- 422720226UL, 142187374UL, 94354238UL, 62442785UL, 45668877UL, 27648516UL, 8972032UL, 7335680UL, 5895424UL, ++// 2001.06.14 mrb: Replaced the first entry so the printer will ++// use only the black pen when he should print real black. ++// 422720226UL, 142187374UL, 94354238UL, 62442785UL, 45668877UL, 27648516UL, 8972032UL, 7335680UL, 5895424UL, ++ 226UL, 142187374UL, 94354238UL, 62442785UL, 45668877UL, 27648516UL, 8972032UL, 7335680UL, 5895424UL, + 2519110233UL, 807846483UL, 391693109UL, 260029471UL, 143570703UL, 42776580UL, 8501760UL, 7782400UL, 6539520UL, + 3072173868UL, 1881129514UL, 841465387UL, 524792087UL, 358391818UL, 174364420UL, 40408577UL, 6920704UL, 6530560UL, + 3407591425UL, 2551891200UL, 1612695808UL, 824489479UL, 506699268UL, 306153730UL, 105283329UL, 5144320UL, 5737216UL, +diff -urNad hplip~/prnt/hpijs/dj690_maps.cpp hplip/prnt/hpijs/dj690_maps.cpp +--- hplip~/prnt/hpijs/dj690_maps.cpp 2006-03-16 11:12:00.000000000 -0300 ++++ hplip/prnt/hpijs/dj690_maps.cpp 2006-03-16 11:22:28.984082881 -0300 +@@ -38,7 +38,10 @@ + uint32_t ulMapDJ690_CMYK[ 9 * 9 * 9 ]= + // DJ690_CMYK + { +- 337848575UL, 37838470UL, 155209268UL, 137905152UL, 36454656UL, 2310144UL, ++// 2001.06.14 mrb: Replaced the first entry so the printer will ++// use only the black pen when he should print real black. ++// 337848575UL, 37838470UL, 155209268UL, 137905152UL, 36454656UL, 2310144UL, ++ 226UL, 37838470UL, 155209268UL, 137905152UL, 36454656UL, 2310144UL, + 2179072UL, 2051072UL, 1733120UL, 2013280119UL, 385897321UL, 303379741UL, + 270610688UL, 102772224UL, 1844992UL, 1911552UL, 1847296UL, 1784832UL, + 2080387626UL, 1157643294UL, 452996881UL, 335555072UL, 202384384UL, 50991872UL, +diff -urNad hplip~/prnt/hpijs/dj895_maps.cpp hplip/prnt/hpijs/dj895_maps.cpp +--- hplip~/prnt/hpijs/dj895_maps.cpp 2006-03-16 11:12:00.000000000 -0300 ++++ hplip/prnt/hpijs/dj895_maps.cpp 2006-03-16 11:22:28.985082758 -0300 +@@ -37,7 +37,10 @@ + + uint32_t ulMapDJ895_KCMY[ 9*9*9 ]= + { +-1819176703UL, 79494215UL, 112983330UL, 79035667UL, 78183948UL, 60489224UL, 59571718UL, 42007811UL, 7405312UL, ++// 2001.06.14 mrb: Replaced the first entry so the printer will ++// use only the black pen when he should print real black. ++//1819176703UL, 79494215UL, 112983330UL, 79035667UL, 78183948UL, 60489224UL, 59571718UL, 42007811UL, 7405312UL, ++226UL, 79494215UL, 112983330UL, 79035667UL, 78183948UL, 60489224UL, 59571718UL, 42007811UL, 7405312UL, + 4230922555UL, 655358293UL, 176553263UL, 128253208UL, 61209869UL, 60751368UL, 26606852UL, 9305345UL, 8650496UL, + 4248940299UL, 3776766759UL, 756415798UL, 308083743UL, 142671120UL, 59440646UL, 9239553UL, 9109248UL, 8779520UL, + 4248086274UL, 4214276619UL, 2786390812UL, 942206231UL, 491516427UL, 224131588UL, 6616320UL, 7399168UL, 7857664UL, +diff -urNad hplip~/prnt/hpijs/dj895_maps2.cpp hplip/prnt/hpijs/dj895_maps2.cpp +--- hplip~/prnt/hpijs/dj895_maps2.cpp 2006-03-16 11:12:00.000000000 -0300 ++++ hplip/prnt/hpijs/dj895_maps2.cpp 2006-03-16 11:22:28.985082758 -0300 +@@ -163,7 +163,10 @@ + + uint32_t ulMapDJ895_Binary_KCMY[ 9*9*9 ]= + { +-1819176648UL, 64158794UL, 80805158UL, 80215318UL, 62389519UL, 61406730UL, ++// 2001.06.14 mrb: Replaced the first entry so the printer will ++// use only the black pen when he should print real black. ++//1819176648UL, 64158794UL, 80805158UL, 80215318UL, 62389519UL, 61406730UL, ++226UL, 64158794UL, 80805158UL, 80215318UL, 62389519UL, 61406730UL, + 60292615UL, 42401028UL, 7601920UL, 4230922301UL, 571406681UL, 160889651UL, + 113048859UL, 62717200UL, 45415944UL, 27917573UL, 10419457UL, 9238272UL, + 4248940557UL, 3743081259UL, 790296119UL, 325515810UL, 127007505UL, 27196678UL, +diff -urNad hplip~/prnt/hpijs/dj970_maps.cpp hplip/prnt/hpijs/dj970_maps.cpp +--- hplip~/prnt/hpijs/dj970_maps.cpp 2006-03-16 11:12:00.000000000 -0300 ++++ hplip/prnt/hpijs/dj970_maps.cpp 2006-03-16 11:22:28.985082758 -0300 +@@ -127,7 +127,11 @@ + + uint32_t ulMapDJ970_KCMY[ 9*9*9 ]= + { +- 673723135UL, 26007371UL, 9756717UL, 10020638UL, 10022677UL, 10153743UL, ++// 2003.06.05 rss: Replaced the first entry so the printer will ++// (hopefully) use only the black pen when he should print real black. ++// Please report as a bug if it doesn't, or something worse happens. ++// 673723135UL, 26007371UL, 9756717UL, 10020638UL, 10022677UL, 10153743UL, ++ 226UL, 26007371UL, 9756717UL, 10020638UL, 10022677UL, 10153743UL, + 10285066UL, 10416133UL, 9169408UL, 3405886809UL, 59743UL, 23980849UL, + 9366812UL, 10153744UL, 10285066UL, 10153990UL, 10087424UL, 9169408UL, + 3858807091UL, 2197868343UL, 60220UL, 4714015UL, 7270155UL, 8646656UL, +diff -urNad hplip~/prnt/hpijs/dj970_maps3.cpp hplip/prnt/hpijs/dj970_maps3.cpp +--- hplip~/prnt/hpijs/dj970_maps3.cpp 2006-03-16 11:12:00.000000000 -0300 ++++ hplip/prnt/hpijs/dj970_maps3.cpp 2006-03-16 11:22:28.985082758 -0300 +@@ -37,7 +37,8 @@ + + uint32_t ulMapDJ970_Draft_KCMY[ 9*9*9 ]= + { +-1802205183UL, 22740362UL, 5832524UL, 5635892UL, 5570340UL, 5308188UL, ++//1802205183UL, 22740362UL, 5832524UL, 5635892UL, 5570340UL, 5308188UL, ++ 226UL, 22740362UL, 5832524UL, 5635892UL, 5570340UL, 5308188UL, + 5308180UL, 5504778UL, 5504768UL, 4278239136UL, 65446UL, 4194132UL, + 5308210UL, 5373728UL, 5308182UL, 5504784UL, 5504776UL, 5504768UL, + 4278498896UL, 1862336354UL, 65388UL, 2621242UL, 4128540UL, 4718348UL, diff --git a/hplip-skip-blank-lines.patch b/hplip-skip-blank-lines.patch new file mode 100644 index 0000000..288a887 --- /dev/null +++ b/hplip-skip-blank-lines.patch @@ -0,0 +1,11 @@ +diff -up hplip-3.10.2/prnt/hpcups/LJColor.h.skip-blank-lines hplip-3.10.2/prnt/hpcups/LJColor.h +--- hplip-3.10.2/prnt/hpcups/LJColor.h.skip-blank-lines 2010-02-24 23:04:09.000000000 +0000 ++++ hplip-3.10.2/prnt/hpcups/LJColor.h 2010-04-15 21:46:48.375754707 +0100 +@@ -48,6 +48,7 @@ public: + DRIVER_ERROR Configure(Pipeline **pipeline); + DRIVER_ERROR EndJob(); + DRIVER_ERROR FormFeed(); ++ bool CanSkipRasters() {return false;} + protected: + virtual DRIVER_ERROR addJobSettings(); + void configureRasterData(); diff --git a/hplip-strstr-const.patch b/hplip-strstr-const.patch new file mode 100644 index 0000000..f2ac91b --- /dev/null +++ b/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/hplip-udev-rules.patch b/hplip-udev-rules.patch new file mode 100644 index 0000000..c4037f2 --- /dev/null +++ b/hplip-udev-rules.patch @@ -0,0 +1,20 @@ +diff -up hplip-3.10.5/data/rules/56-hpmud_support.rules.udev-rules hplip-3.10.5/data/rules/56-hpmud_support.rules +--- hplip-3.10.5/data/rules/56-hpmud_support.rules.udev-rules 2010-05-13 01:44:22.000000000 +0200 ++++ hplip-3.10.5/data/rules/56-hpmud_support.rules 2010-05-17 16:12:42.000000000 +0200 +@@ -6,10 +6,11 @@ SUBSYSTEM!="usb_device", GOTO="hpmud_rul + + LABEL="pid_test" + ++ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p" + # Check for LaserJet products (0x03f0xx17). +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", ENV{hp_model}="$attr{product}", ENV{hp_test}="yes" + # Check for LaserJet products (0x03f0xx2a). +-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??2a", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes" +-ENV{hp_test}=="yes", RUN+="bin/sh -c '/usr/bin/hp-mkuri -c &'" ++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", ENV{hp_model}="$attr{product}", ENV{hp_test}="yes" ++ENV{hp_test}=="yes", RUN+="/bin/sh -c '/usr/bin/hp-mkuri -c &'" + +-LABEL="hpmud_rules_end" +\ No newline at end of file ++LABEL="hpmud_rules_end" diff --git a/hplip-ui-optional.patch b/hplip-ui-optional.patch new file mode 100644 index 0000000..d77b2c9 --- /dev/null +++ b/hplip-ui-optional.patch @@ -0,0 +1,28 @@ +diff -up hplip-3.9.6b/base/utils.py.ui-optional hplip-3.9.6b/base/utils.py +--- hplip-3.9.6b/base/utils.py.ui-optional 2009-06-25 20:05:53.000000000 +0100 ++++ hplip-3.9.6b/base/utils.py 2009-07-28 10:10:57.984991878 +0100 +@@ -597,6 +597,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 + +@@ -642,7 +649,10 @@ def checkPyQtImport(): # qt3 + def checkPyQtImport4(): + try: + import PyQt4 ++ import ui4 + except ImportError: ++ # 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/hplip.spec b/hplip.spec new file mode 100644 index 0000000..90506a3 --- /dev/null +++ b/hplip.spec @@ -0,0 +1,1473 @@ +# Define if you want to build the sane backend (default) +%define sane_backend 1 +%{?_with_sane: %global sane_backend 1} +%{?_without_sane: %global sane_backend 0} + +%define hpip_major 0 +%define hpip_libname %mklibname hpip %{hpip_major} + +%define sane_hpaio_major 1 +%define sane_hpaio_libname %mklibname sane-hpaio %{sane_hpaio_major} + +# Suppress automatically generated Requires for devel packages +%define _requires_exceptions devel\(.*\) + +#define extraversion -RC1 +%define extraversion %nil + +Summary: HP printer/all-in-one driver infrastructure +Name: hplip +Version: 3.11.5 +Release: %mkrel 2 +License: GPLv2+ and MIT +Group: System/Printing +Source: http://heanet.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}%{extraversion}.tar.gz +Source1: hpcups-update-ppds.sh +# dlopen libhpmud.so.0 instad of libhpmud.so, in order not to depend on +# devel package (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=548379) +Patch0: hplip-3.9.8-dlopen-libhpmud.patch +Patch1: hplip-3.11.3-link.patch + +# Fedora patches +Patch101: hplip-pstotiff-is-rubbish.patch +Patch102: hplip-strstr-const.patch +Patch103: hplip-ui-optional.patch +Patch104: hplip-no-asm.patch +Patch105: hplip-deviceIDs-drv.patch +Patch106: hplip-mucks-with-spooldir.patch +Patch107: hplip-udev-rules.patch +Patch108: hplip-retry-open.patch +Patch110: hplip-discovery-method.patch +Patch111: hplip-device-reconnected.patch +Patch112: hplip-clear-old-state-reasons.patch +Patch114: hplip-hpcups-sigpipe.patch +Patch116: hplip-bad-low-ink-warning.patch +Patch117: hplip-deviceIDs-ppd.patch +Patch118: hplip-skip-blank-lines.patch +Patch119: hplip-dbglog-newline.patch +Patch120: hplip-no-system-tray.patch +Patch122: hplip-hpijs-marker-supply.patch +Patch124: hplip-raw_deviceID-traceback.patch +Patch125: hplip-UnicodeDecodeError.patch +Patch126: hplip-emit-SIGNAL.patch +Patch127: hplip-fab-root-crash.patch +Patch128: hplip-addprinter.patch +Patch129: hplip-dbus-exception.patch +Patch130: hplip-hpaio-segfault.patch +Patch131: hplip-newline.patch +Patch132: hplip-dbus-threads.patch +Patch133: hplip-notification-exception.patch +Patch135: hplip-CVE-2010-4267.patch + +# Debian/Ubuntu patches +Patch202: hplip-hpinfo-query-without-cups-queue.patch +Patch203: hplip-pjl-duplex-binding.patch +Patch204: hplip-photosmart_b9100_support.patch +Patch205: 85_rebuild_python_ui.dpatch +Patch206: hplip-rss.patch +Patch207: hplip-2.7.6-14_charsign_fixes.patch +Patch208: 10_shebang_fixes.dpatch +Patch210: 87_move_documentation.dpatch +Patch211: hp-check_debian.dpatch +Patch212: delayed-hp-systray-start.dpatch + +Url: http://hplip.sourceforge.net/ +%if %{sane_backend} +BuildRequires: libsane-devel, xsane +%endif +%py_requires -d +BuildRequires: python-sip >= 4.1.1 +BuildRequires: net-snmp-devel +BuildRequires: libusb-devel >= 0.1.8 +BuildRequires: imagemagick +BuildRequires: autoconf +BuildRequires: libcups-devel +BuildRequires: libjpeg-devel +BuildRequires: python-devel +BuildRequires: desktop-file-utils +BuildRequires: libdbus-devel +BuildRequires: udev-devel +BuildRequires: polkit +BuildRequires: gphoto2-devel +BuildRequires: libv4l-devel +Requires: cups +# For dynamic ppd generation. +Requires: cupsddk-drivers >= 1.2.3-2mdv +Requires: foomatic-filters +Requires: hplip-model-data hplip-hpijs +Requires: hplip-hpijs-ppds +Requires: python-sip >= 4.1.1 +# Needed for communicating with ethernet-connected printers +Requires: net-snmp-mibs +# Needed to generate fax cover pages +Requires: python-reportlab +# Needed since 2.8.4 for IPC +Requires: python-dbus +Requires: polkit-agent +Requires: usermode-consoleonly +Requires: python-gobject +# Required by hp-scan for command line scanning +Suggests: python-imaging +# Some HP ppds are in foomatic-db and foomatic-db-hpijs (bug #47415) +Suggests: foomatic-db-hpijs + +%ifarch x86_64 +Conflicts: cups < 1.2.0-0.5361.0mdk +%endif +# Due to fax ppds. +Conflicts: hplip-hpijs-ppds <= 2.8.2-1mdv +# foomatic-db-hpijs drivers are provided by hp and by this package now +# NOTE: remove the foomatic-db-hpijs deps sometime in 2010-10-?? ? +Provides: foomatic-db-hpijs = %{version}-%{release} +Obsoletes: foomatic-db-hpijs +BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot + +%description +This is the HP driver package to supply Linux support for most +Hewlett-Packard DeskJet, LaserJet, PSC, OfficeJet, and PhotoSmart +printers and all-in-one peripherals (also known as Multi-Function +Peripherals or MFPs), which can print, scan, copy, fax, and/or access +flash memory cards. + +It is work in progress, but printing, scanning, memory card access, +ink/toner/battery/consumable level checking, and inkjet printer +maintenance are supported on most models, when either connected to the +USB or LAN (built-in interfaces or selected HP JetDirect models) on a +Linux workstation with CUPS printing system. + +For status and consumable checking and also for inkjet maintenance +there is the graphical tool "hp-toolbox" available (Menu: +"System"/"Monitoring"/"HP Printer Toolbox"). + +%package -n %{hpip_libname} +Summary: Dynamic library for the "hplip" HP printer/all-in-one drivers +Group: System/Printing + +%description -n %{hpip_libname} +Library needed for the "hplip" HP printer/all-in-one drivers + +%package -n %{hpip_libname}-devel +Summary: Headers and links to compile against the "%{hpip_libname}" ("hplip") library +Group: Development/C +Requires: %{hpip_libname} >= %{version}-%{release} +Provides: libhpip-devel = %{version}-%{release} + +%description -n %{hpip_libname}-devel +This package contains all files which one needs to compile programs using +the "%{hpip_libname}" library. + +%if %{sane_backend} +%package -n %{sane_hpaio_libname} +Summary: SANE driver for scanners in HP's multi-function devices (from HPLIP) +Group: System/Printing +Requires: sane-backends +%define _requires_exceptions devel(libcrypto)\\|devel(libdl)\\|devel(libhpip)\\|devel(libm)\\|devel(libsnmp) +%endif + +%if %{sane_backend} +%description -n %{sane_hpaio_libname} +SANE driver for scanners in HP's multi-function devices (from HPLIP) +%endif + +%if 0 +%if %{sane_backend} +%package -n %{sane_hpaio_libname}-devel +Summary: Headers and links to compile against the "%{sane_hpaio_libname}" ("sane-hpaio") library +Group: Development/C +Requires: %{sane_hpaio_libname} >= %{version}-%{release} +Provides: libsane-hpaio-devel = %{version}-%{release} +%endif + +%if %{sane_backend} +%description -n %{sane_hpaio_libname}-devel +This package contains all files which one needs to compile programs using +the "%{sane_hpaio_libname}" library. +%endif +%endif + +%package model-data +Summary: Data file listing the HP printer models supported by HPLIP +Group: System/Printing + +%description model-data +HPLIP supports most current HP printers and multifunction devices, but +there are some older models not supported. This package contains the +list of supported models. Printerdrake installs it automatically to +determine whether HPLIP has to be installed or not. + +%package gui +Summary: HPLIP graphical tools +Group: System/Printing +Requires:python-qt4-gui +Requires: %{name} = %{version}-%{release} +Requires: usermode +Conflicts: hplip < 2.8.12-4 + +%description gui +HPLIP graphical tools. + + +%package hpijs +Summary: HPs printer driver IJS plug-in for GhostScript +Group: System/Printing +Requires: ghostscript +Provides: hpijs +Conflicts: printer-filters < 10.2 +Conflicts: hplip <= 1.6.7-1mdv2007.0 + +%description hpijs +HPs printer driver IJS plug-in for GhostScript. This driver gives full +printing support for nearly all non-PostScript inkjet and laser +printers made by HP. + +%package hpijs-ppds +Summary: PPD files for the HPIJS printer driver +Group: System/Printing +Requires: foomatic-filters, hplip-hpijs + +%description hpijs-ppds +PPD files to use the HPIJS printer driver with foomatic-rip and a +printer spooler like CUPS, LPRng, PDQ, ... + +%package doc +Summary: Documentation for HPLIP +Group: System/Printing + +%description doc +This package contains documentation for the HPLIP driver. + +This is the HP driver package to supply Linux support for most +Hewlett-Packard DeskJet, LaserJet, PSC, OfficeJet, and PhotoSmart +printers and all-in-one peripherals (also known as Multi-Function +Peripherals or MFPs), which can print, scan, copy, fax, and/or access +flash memory cards. + +%prep +rm -rf $RPM_BUILD_DIR/%{name}-%{version}%{extraversion} +%setup -q -n %{name}-%{version}%{extraversion} + +%patch0 -p1 -b .dlopen +%patch1 -p0 -b .link + +# Fedora patches + +# The pstotiff filter is rubbish so replace it (launchpad #528394). +%patch101 -p1 -b .pstotiff-is-rubbish + +# Fix compilation. +%patch102 -p1 -b .strstr-const + +# Make utils.checkPyQtImport() look for the gui sub-package (RH bug #243273). +%patch103 -p1 -b .ui-optional + +# Make sure to avoid handwritten asm. +%patch104 -p1 -b .no-asm + +# Corrected several IEEE 1284 Device IDs using foomatic data. +# HP Color LaserJet CM1312nfi (bug #581005). +# HP Color LaserJet 3800 (bug #581935). +# HP Color LaserJet 2840 (bug #582215). +%patch105 -p1 -b .device-ids + +# Stopped hpcups pointlessly trying to read spool files +# directly (RH bug #552572). +%patch106 -p1 -b .mucks-with-spooldir + +# Removed SYSFS use in udev rules and actually made them work +# (RH bug #560754). +%patch107 -p1 -b .udev-rules + +# Retry when connecting to device fails (RH bug #532112). +%patch108 -p1 -b .retry-open + +# Fixed hp-setup traceback when discovery page is skipped (RH bug #523685). +%patch110 -p1 -b .discovery-method + +# Give up trying to print a job to a reconnected device (RH bug #515481). +%patch111 -p1 -b .device-reconnected + +# Clear old printer-state-reasons we used to manage (bug #510926). +%patch112 -p1 -b .clear-old-state-reasons + +# Avoid busy loop in hpcups when backend has exited (RH bug #525944). +%patch114 -p1 -b .hpcups-sigpipe + +# Fixed Device ID parsing code in hpijs's dj9xxvip.c (RH bug #510926). +%patch116 -p1 -b .bad-low-ink-warning + +# Add Device ID for +# HP LaserJet 1200 (bug #577308) +# HP LaserJet 1320 series (bug #579920) +# HP LaserJet 2300 (bug #576928) +# HP LaserJet P2015 Series (bug #580231) +# HP Color LaserJet 3800 (bug #581935). +# HP Color LaserJet 2840 (bug #582215). +for ppd_file in $(grep '^diff' %{PATCH117} | cut -d " " -f 4); +do + gunzip ${ppd_file#*/}.gz +done +%patch117 -p1 -b .deviceIDs-ppd +for ppd_file in $(grep '^diff' %{PATCH117} | cut -d " " -f 4); +do + gzip -n ${ppd_file#*/} +done + +# Hpcups (ljcolor) was putting black lines where should be blank lines (RH bug #579461). +%patch118 -p1 -b .skip-blank-lines + +# Added missing newline to string argument in dbglog() call (bug #585275). +%patch119 -p1 -b .dbglog-newline + +# Wait for max 30s to see if a system tray becomes available (bug #569969). +%patch120 -p1 -b .no-system-tray + +# Fixed bogus low ink warnings from hpijs driver (bug #643643). +%patch122 -p1 -b .hpijs-marker-supply + +# Fixed traceback on error condition in device.py (bug #628125). +%patch124 -p1 -b .raw_deviceID-traceback + +# Avoid UnicodeDecodeError in printsettingstoolbox.py (bug #645739). +%patch125 -p1 -b .UnicodeDecodeError + +# Don't emit SIGNALs in ui4.setupdialog.SetupDialog the PyQt3 way (bug #623834). +%patch126 -p1 -b .emit-SIGNAL + +# Prevent hp-fab traceback when run as root. +%patch127 -p1 -b .fab-root-crash + +# Call cupsSetUser in cupsext's addPrinter method before connecting so +# that we can get an authentication callback (bug #538352). +%patch128 -p1 -b .addprinter + +# Catch D-Bus exceptions in fax dialog (bug #645316). +%patch129 -p1 -b .dbus-exception + +# Prevent hpaio segfaulting on invalid URIs (bug #649092). +%patch130 -p1 -b .hpaio-segfault + +# Another missing newline in filter output (Ubuntu #418053). +%patch131 -p1 -b .newline + +# Enable D-Bus threading (and require pygobject2) (bug #600932). +%patch132 -p1 -b .dbus-threads + +# Catch GError exception when notification showing failed (bug #665577). +%patch133 -p1 -b .notification-exception + +# Applied patch to fix CVE-2010-4267, remote stack overflow +# vulnerability (bug #670252). +%patch135 -p1 -b .CVE-2010-4267 + +# Debian/Ubuntu patches + +# Allow hp-info to query URIs for which there is no CUPS queue +# (Launchpad bug #329220) +%patch202 -p1 -b .query + +# FixsShort-edge duplex printing if duplex is PJL-controlled +# https://bugs.launchpad.net/hplip/+bug/244295 +%patch203 -p1 -b .pjl-duplex + +# Corrections on the models.dat entry for the HP PhotoSmart Pro B9100, +# especially for the correct color calibration mode. +%patch204 -p1 -b .b9100 + +# compiling ui files to py +%patch205 -p1 -b .rebuildui + +# This patch tries to make sure that black is printed with just +# the black pen, if the printer supports it +%patch206 -p1 -b .rss + +# code cleanup related to char signedness +%patch207 -p1 -b .14charsign + +# shebang fixes +%patch208 -p1 + +# place html documentation under hplip-doc/HTML/ +%patch210 -p1 + +# Check for hpaio module in /etc/sane.d/dll.d/hplip too +%patch211 -p1 + +# Delay start-up of notification utility +%patch212 -p1 + +# Make all files in the source user-writable +chmod -R u+w . + +%build +%serverbuild +#needed by patch205 +libtoolize --copy --force +aclocal --force +autoconf -f +#needed by patches 205 and 210 +automake -f --foreign + +%if !%{sane_backend} +WITHOUT_SANE="--without-sane" +%endif +%configure2_5x $WITHOUT_SANE \ + --disable-foomatic-rip-hplip-install \ + --enable-scan-build \ + --enable-gui-build \ + --enable-fax-build \ + --enable-pp-build \ + --enable-qt4 --disable-qt3 \ + --enable-hpcups-install \ + --enable-cups-drv-install \ + --enable-cups-ppd-install \ + --enable-hpijs-install \ + --enable-udev-acl-rules \ + --enable-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 + +# convert icons to required sizes +#convert data/images/print.png -resize 16x16 %{name}.mini.png +#convert data/images/print.png -resize 32x32 %{name}.png +#convert data/images/print.png -resize 48x48 %{name}.large.png + +%install +rm -rf %{buildroot} +mkdir -p %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_includedir} +mkdir -p %{buildroot}%{_initrddir} +mkdir -p %{buildroot}%{_sysconfdir}/hp +mkdir -p %{buildroot}/var/run/hplip + +# Do not use the macro here, use the standard DESTDIR method as it works +# with HPLIP, in contrary to the non-standard Mandriva method +#make test-destdir DESTDIR=%{buildroot} +make install DESTDIR=%{buildroot} + +# Install files which the "make install" missed to install +install -m 644 ip/hpip.h %{buildroot}%{_includedir} +install -m 644 ip/xform.h %{buildroot}%{_includedir} + +# Move doc in sub-package +mv %{buildroot}%{_docdir}/%{name}-%{version}%{extraversion} %{buildroot}%{_docdir}/%{name}-doc-%{version}%{extraversion} + +# Remove static libraries of SANE driver +rm -f %{buildroot}%{_libdir}/sane/libsane-hpaio*.so +rm -f %{buildroot}%{_libdir}/sane/libsane-hpaio*.la +rm -f %{buildroot}%{_sysconfdir}/sane.d/dll.conf + +# Remove other unneeded files +rm -f %{buildroot}%{py_platsitedir}/*.la + +# install menu icons +#mkdir -p %{buildroot}%{_iconsdir}/locolor/16x16/apps/ +#install -m 644 %{name}.png -D %{buildroot}%{_iconsdir}/%{name}.png +#install -m 644 %{name}.mini.png -D %{buildroot}%{_miconsdir}/%{name}.png +#install -m 644 %{name}.large.png -D %{buildroot}%{_liconsdir}/%{name}.png + +mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications +desktop-file-install --vendor='' \ + --dir=%{buildroot}%{_datadir}/applications \ + --remove-category='Application' \ + --remove-category='Utility' \ + --add-category='System' \ + --add-category='Settings' \ + --add-category='Printing' \ + --add-category='Qt' \ + --add-category='HardwareSettings' \ + --add-category='X-MandrivaLinux-CrossDesktop' \ + --remove-key='Version' \ + %{buildroot}%{_datadir}/applications/hplip.desktop + +cat > $RPM_BUILD_ROOT%{_datadir}/applications/mandriva-hp-sendfax.desktop << EOF +[Desktop Entry] +Name=HP Sendfax +Comment=Utility for sending faxes with HP's multi-function devices +Exec=%{_bindir}/hp-sendfax +Icon=%{_datadir}/%{name}/data/images/32x32/fax_machine.png +Terminal=false +Type=Application +Categories=TelephonyTools;Qt;Printing;Utility;X-MandrivaLinux-CrossDesktop; +EOF +#' #Fix vim's stupid syntax + +rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop + +# switched to udev, no need for hal information +rm -rf %{buildroot}%{_datadir}/hal/fdi + +# Regenerate hpcups PPDs on upgrade if necessary (bug #579355). +install -p -m755 %{SOURCE1} %{buildroot}%{_bindir}/hpcups-update-ppds + +# Fedora pstotiff +rm -f %{buildroot}%{_sysconfdir}/cups/pstotiff.types +rm -f %{buildroot}%{_datadir}/cups/mime/pstotiff.types +rm -f %{buildroot}%{_datadir}/hplip/fax/pstotiff* +rm -f %{buildroot}%{_prefix}/lib/cups/filter/hpcac + +# bork? +install -d %{buildroot}%{_sysconfdir}/cups +cp -p %{buildroot}%{_datadir}/cups/mime/pstotiff.convs %{buildroot}%{_sysconfdir}/cups/pstotiff.convs + +# set up consolehelper +mkdir -p %{buildroot}%{_sbindir} +mv %{buildroot}%{_bindir}/hp-setup %{buildroot}%{_sbindir}/hp-setup +ln -s consolehelper %{buildroot}%{_bindir}/hp-setup + +# Make sure pyc files are generated, otherwise we can get +# difficult to debug problems +pushd %{buildroot}%{_datadir}/%{name} +python -m compileall . +popd + +%triggerin -- hplip < 2.7.7 +chkconfig --del hplip + +%post +%if %mdkversion < 200900 +%{update_menus} +%endif +# Restart CUPS to make the Fax PPD known to it +if [ -f /etc/init.d/cups ]; then + /sbin/service cups condrestart || : +fi + +%post -n hplip-hpijs-ppds +# Restart CUPS to make the printing PPDs known to it +if [ -f /etc/init.d/cups ]; then + /sbin/service cups condrestart || : +fi + +%post -n hplip-hpijs +%{_bindir}/hpcups-update-ppds &>/dev/null ||: + +%post -n hplip-model-data +/sbin/udevadm trigger --subsystem-match=usb --attr-match=idVendor=03f0 + +%if %mdkversion < 200900 +%post -n %{hpip_libname} -p /sbin/ldconfig +%endif + +%if %{sane_backend} +%post -n %{sane_hpaio_libname} +%if %mdkversion < 200900 +/sbin/ldconfig +%endif +# Add HPLIP driver to /etc/sane.d/dll.conf +if ! grep ^hpaio /etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \ + echo hpaio >> /etc/sane.d/dll.conf; \ +fi +%endif + +%if %{sane_backend} +%preun -n %{sane_hpaio_libname} +# Remove HPLIP driver from /etc/sane.d/dll.conf +if [ "$1" = 0 ]; then \ + if grep ^hpaio /etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \ + sed '/hpaio/d' /etc/sane.d/dll.conf > /tmp/$$; \ + cp -f /tmp/$$ /etc/sane.d/dll.conf; \ + rm -f /tmp/$$; \ + fi; \ +fi +%endif + +%postun +%if %mdkversion < 200900 +%{update_menus} +%endif +# Restart CUPS to make the removal of the Fax PPD known to it +if [ -f /etc/init.d/cups ]; then + /sbin/service cups condrestart || : +fi + +%postun -n hplip-hpijs-ppds +# Restart CUPS to make the removal of the printing PPDs known to it +if [ -f /etc/init.d/cups ]; then + /sbin/service cups condrestart || : +fi + +%if %mdkversion < 200900 +%postun -n %{hpip_libname} -p /sbin/ldconfig +%endif + +%if %{sane_backend} +%postun -n %{sane_hpaio_libname} +%if %mdkversion < 200900 +/sbin/ldconfig +%endif +%endif + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +#doc COPYING doc/* +%config(noreplace) %{_sysconfdir}/hp +%dir /var/run/hplip/ +%{_bindir}/hp-align +%{_bindir}/hp-clean +%{_bindir}/hp-colorcal +%{_bindir}/hp-devicesettings +%{_bindir}/hp-fab +%{_bindir}/hp-faxsetup +%{_bindir}/hp-firmware +%{_bindir}/hp-info +%{_bindir}/hp-levels +%{_bindir}/hp-linefeedcal +%{_bindir}/hp-makecopies +%{_bindir}/hp-makeuri +%{_bindir}/hp-mkuri +%{_bindir}/hp-pkservice +%{_bindir}/hp-plugin +%{_bindir}/hp-pqdiag +%{_bindir}/hp-printsettings +%{_bindir}/hp-probe +%{_bindir}/hp-query +%{_bindir}/hp-scan +%{_bindir}/hp-sendfax +%{_bindir}/hp-setup +%{_sbindir}/hp-setup +%{_bindir}/hp-testpage +%{_bindir}/hp-timedate +%{_bindir}/hp-unload +%{_bindir}/hp-wificonfig + +%exclude %{_datadir}/hplip/data/models +# C libraries for Python +%{_libdir}/python*/*/*.so* +# CUPS backends (0755 permissions, so that CUPS 1.2 runs these backends +# as lp user) +# Note: this must be /usr/lib not %{_libdir}, since that's the +# CUPS serverbin directory. +%attr(0755,root,root) %{_prefix}/lib/cups/backend/hp* +%{_prefix}/lib/cups/filter/hpps +%{_prefix}/lib/cups/filter/hplipjs +%{_prefix}/lib/cups/filter/hpcups +%{_prefix}/lib/cups/filter/hpcupsfax +%{_prefix}/lib/cups/filter/pstotiff +%{_datadir}/cups/mime/pstotiff.convs +%config(noreplace) %{_sysconfdir}/cups/pstotiff.convs +%{_datadir}/ppd/HP/HP-Fax*.ppd* +%{_datadir}/cups/drv/hp/hpcups.drv +# Files +%dir %{_datadir}/hplip +%{_datadir}/hplip/align.py* +%{_datadir}/hplip/clean.py* +%{_datadir}/hplip/colorcal.py* +%{_datadir}/hplip/devicesettings.py* +%{_datadir}/hplip/fab.py* +%{_datadir}/hplip/fax +%{_datadir}/hplip/faxsetup.py* +%{_datadir}/hplip/firmware.py* +%{_datadir}/hplip/hpdio.py* +%{_datadir}/hplip/hpssd* +%{_datadir}/hplip/info.py* +%{_datadir}/hplip/__init__.py* +%{_datadir}/hplip/levels.py* +%{_datadir}/hplip/linefeedcal.py* +%{_datadir}/hplip/makecopies.py* +%{_datadir}/hplip/makeuri.py* +%{_datadir}/hplip/pkservice.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 +%dir %{_datadir}/hplip/data +%{_datadir}/hplip/data/ldl +%{_datadir}/hplip/data/localization +%{_datadir}/hplip/data/models +%{_datadir}/hplip/data/pcl +%{_datadir}/hplip/data/ps +%{_datadir}/hplip/installer +%{_datadir}/hplip/pcard +%{_datadir}/hplip/prnt +%{_datadir}/hplip/scan +%{_datadir}/polkit-1/actions/com.hp.hplip.policy +%{_datadir}/dbus-1/system-services/com.hp.hplip.service +%{_localstatedir}/lib/hp/hplip.state +%config(noreplace) %{_sysconfdir}/dbus-1/system.d/com.hp.hplip.conf + +%files doc +%defattr(-,root,root) +%doc %{_docdir}/%{name}-doc-%{version}%{extraversion} + +%files -n %{hpip_libname} +%defattr(-,root,root) +%{_libdir}/libhpip*.so.* +%{_libdir}/libhpmud.so.* + +%files -n %{hpip_libname}-devel +%defattr(-,root,root) +%{_includedir}/hpip.h +%{_includedir}/xform.h +%{_libdir}/libhpip*.so +%{_libdir}/libhpip*.la +%{_libdir}/libhpmud.so +%{_libdir}/libhpmud.la + +%if %{sane_backend} + +%files -n %{sane_hpaio_libname} +%defattr(-,root,root) +%{_libdir}/sane/libsane-hpaio*.so.* + +%if 0 +%files -n %{sane_hpaio_libname}-devel +%defattr(-,root,root) +#%{_libdir}/libsane-hpaio*.so +#%{_libdir}/libsane-hpaio*.a +#%{_libdir}/libsane-hpaio*.la +#%{_libdir}/sane/libsane-hpaio*.so +#%{_libdir}/sane/libsane-hpaio*.a +#%{_libdir}/sane/libsane-hpaio*.la +%endif + +%endif + +%files model-data +%defattr(-,root,root) +%{_sysconfdir}/udev/rules.d/*.rules +%{_datadir}/hplip/data/models + +%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 hpijs +%defattr(-,root,root) +%{_bindir}/hpijs +# Needed for both printing and fax PPDs. They all need HPIJS, therefore +# the link is here +%dir %{_datadir}/ppd +%dir %{_datadir}/ppd/HP +%{_bindir}/hpcups-update-ppds + +%files hpijs-ppds +%defattr(-,root,root) +%{_datadir}/ppd/HP/apollo*.ppd* +%{_datadir}/ppd/HP/hp-*.ppd* + + +%changelog +* Mon Jul 18 2011 Oden Eriksson 3.11.5-2 ++ Revision: 690293 +- rebuilt against new net-snmp libs + +* Sun May 15 2011 Oden Eriksson 3.11.5-1 ++ Revision: 674938 +- 3.11.5 +- rediff patches +- adjust the deviceIDs patch because these ones are gone: + hp-laserjet_p2015dn_series-ps.ppd + hp-laserjet_p2015n_series-ps.ppd + hp-laserjet_p2015_series-ps.ppd + hp-laserjet_p2015x_series-ps.ppd + +* Sat May 07 2011 Funda Wang 3.11.3-1 ++ Revision: 672097 +- update linkage patch +- fix linkage +- update file list +- new version 3.11.3 + +* Wed May 04 2011 Oden Eriksson 3.11.1-3 ++ Revision: 665446 +- mass rebuild + +* Sun Feb 27 2011 Funda Wang 3.11.1-2 ++ Revision: 640208 +- rebuild to obsolete old packages + +* Mon Feb 07 2011 Matthew Dawkins 3.11.1-1 ++ Revision: 636746 +- added back missing portion of the patch +- new version 3.11.1 +- p119 hplip-dbglog-newline.patch rediffed +- p121 hplip-openPPD.patch upstreamed +- p122 hplip-hpijs-marker-supply.patch fix from fedora +- p123 hplip-addgroup.patch upstreamed +- p128 hplip-addprinter.patch rediffed +- p134 hplip-cups-web.patch upstreamed +- p205 85_rebuild_python_ui.dpatch rediffed +- p210 87_move_documentation.dpatch rediffed +- p213 hplip-3.10.9-alt-undefined-DBG.patch upstreamed + +* Tue Jan 25 2011 Eugeni Dodonov 3.10.9-3 ++ Revision: 632564 +- Make it installable again. + +* Sat Jan 22 2011 Oden Eriksson 3.10.9-2 ++ Revision: 632373 +- fix deps (duh!) + +* Thu Jan 20 2011 Oden Eriksson 3.10.9-1 ++ Revision: 631828 +- 3.10.9 (sync with hplip-3.10.9-14.fc15.src.rpm, P122 -> P135) +- P135: fixes CVE-2010-4267 (MDVSA-2011:013) +- P213: fix undefined DBG (alt linux) + +* Mon Nov 01 2010 Götz Waschk 3.10.6-4mdv2011.0 ++ Revision: 591553 +- fix build with broken new rpm's exclude logic + +* Mon Oct 11 2010 Funda Wang 3.10.6-3mdv2011.0 ++ Revision: 584967 +- rebuild + +* Wed Sep 01 2010 Funda Wang 3.10.6-2mdv2011.0 ++ Revision: 575043 +- rebuild for new python-sip + +* Tue Aug 17 2010 Matthew Dawkins 3.10.6-1mdv2011.0 ++ Revision: 570727 +- new version 3.10.6 +- rediff hplip-pstotiff-is-rubbish.patch +- rediff hplip-udev-rules.patch +- fixed patch macro for patches 120 & 121 + + + Nicolas Lécureuil + - Add patches from fedora : + - Wait for max 30s to see if a system tray becomes available (RHBZ bug #569969). + - Prevent segfault in cupsext when opening PPD file (RHBZ bug #572775). + +* Tue May 11 2010 Nicolas Lécureuil 3.10.2-5mdv2010.1 ++ Revision: 544497 +- Fix file list +- Fix buildrequires +- Install hpcups-update-ppds +- Clear old printer-state-reasons we used to manage (RH bug #510926). +- Fix patch119 +- Added missing newline to string argument in dbglog() call (RH bug #585275). +- Add more infos about added printers +- Fixed black/blank lines in ljcolor hpcups output (RH bug #579461). + Work-around is to send entire blank raster lines instead of skipping them. +- Added/corrected more IEEE 1284 Device IDs P117 ( from fedora ) +- Regenerate hpcups PPDs on upgrade if necessary (rhbz #579355). + CCBUG:58607 + +* Mon Apr 05 2010 Tiago Salem 3.10.2-2mdv2010.1 ++ Revision: 531857 +- set cups backend permissions to 755, then cups can run them as lp user +- bump release + +* Tue Mar 02 2010 Frederik Himpe 3.10.2-1mdv2010.1 ++ Revision: 513618 +- Update to new version 3.10.2 +- Sync patches with Fedora: + * The pstotiff filter is rubbish so replace it (launchpad #528394). + * Corrected several IEEE 1284 Device IDs using foomatic data. + * Stopped hpcups pointlessly trying to read spool files directly (RH bug #552572). + * Removed SYSFS use in udev rules and actually made them work (RH bug #560754) (replaces sed hack in SPEC file) + * Retry when connecting to device fails (RH bug #532112). + * Fixed Device ID parsing code in hpijs's dj9xxvip.c (RH bug #510926). +- Updated hplip-rebuild_python_ui.patch from Ubuntu + +* Thu Jan 14 2010 Frederic Crozat 3.9.12-3mdv2010.1 ++ Revision: 491515 +- Fix obsolete syntax in udev rules + +* Sun Jan 10 2010 Oden Eriksson 3.9.12-2mdv2010.1 ++ Revision: 488764 +- rebuilt against libjpeg v8 + + + Frederik Himpe + - Remove unrecognized ./configure options + - Add %%post script which triggers udev rules necessary for setting + correct permissions on HP USB devices, so that scanning works without + rebooting or replugging scanner (bug #56678) + +* Tue Dec 22 2009 Frederic Crozat 3.9.12-1mdv2010.1 ++ Revision: 481482 +- Release 3.9.12 +- Remove patches 101 and 115 (merged upstream) + +* Sun Nov 22 2009 Frederik Himpe 3.9.10-1mdv2010.1 ++ Revision: 469152 +- Update to new version 3.9.10 +- Remove patches integrated upstream +- Sync Debian and Fedora patches +- Require polkit-agent instead of just polkit + +* Fri Oct 23 2009 Nicolas Lécureuil 3.9.8-8mdv2010.0 ++ Revision: 458992 +- Install more ppd files + +* Mon Oct 19 2009 Frederik Himpe 3.9.8-7mdv2010.0 ++ Revision: 458264 +- Start hp-setup with consolehelper again, because it still does not work + as non-root user (bug #53800) +- Run automake in order to install correct polkit-1 file instead of + obsolete policykit file. Fixes installation of plug-in as non-root + (bug #53800 comment #4) +- Add patch to dlopen libhpmud.so.0 instad of libhpmud.so, in order not + to depend on devel package + (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=548379). Should fix + network scanning + +* Thu Oct 15 2009 Oden Eriksson 3.9.8-6mdv2010.0 ++ Revision: 457613 +- rebuilt against new net-snmp libs + +* Wed Oct 14 2009 Oden Eriksson 3.9.8-5mdv2010.0 ++ Revision: 457379 +- fix deps + +* Mon Oct 05 2009 Frederik Himpe 3.9.8-4mdv2010.0 ++ Revision: 454177 +- Fix BuildRequires +- Sync with Fedora and Debian patches: + * Uses policykit-1 now +- Enable parallel port support + +* Thu Sep 03 2009 Frederic Crozat 3.9.8-3mdv2010.0 ++ Revision: 427740 +- Switch to udev-acl (partially fixes Mdv bug #52951) + +* Sat Aug 15 2009 Oden Eriksson 3.9.8-2mdv2010.0 ++ Revision: 416526 +- rebuilt against libjpeg v7 + +* Wed Aug 05 2009 Frederik Himpe 3.9.8-1mdv2010.0 ++ Revision: 410391 +- Update to new version 3.9.8 +- Sync Fedora patches (most were integrated upstream) +- Don't set up consolehelper links anymore, now policykit is used + +* Mon Aug 03 2009 Frederik Himpe 3.9.6b-1mdv2010.0 ++ Revision: 408492 +- Fix BuildRequires +- Update to new version 3.9.6b +- Sync patches with Fedora +- Remove Debian patch now included upstream +- Update string format patch +- Remove unresolved symbols patch: not needed anymore +- Remove consolehelper patch: not needed anymore because hplip now uses + policykit +- Run autoconf instead of autoreconf and libtoolize because the latter + two break the build +- Sync configure options with Fedora + +* Tue Mar 17 2009 Frederik Himpe 3.9.2-2mdv2009.1 ++ Revision: 356869 +- Remove kdesu patch, instead use consolehelper to run hp-setup + and hp-plugin +- Build pyc files, otherwise this can lead to hard to debug problems + py files run as root are moved in a new version +- Package fax pdd (fixes #48657) +- Renumber patch11 to patch207 to reflect the fact that it + comes from Debian +- Add patch to make hp-toolbox look for kdesu in the right directory + (partially fixes bug #48870) + +* Tue Mar 17 2009 Frederik Himpe 3.9.2-1mdv2009.1 ++ Revision: 356312 +- Update to new version 3.9.2 (important bug fixes for QT4 GUI and + support for new printer models) +- Redif patch fixing unresolved symbols +- Remove utf-8 patch: fixed upstream +- Sync patches with Fedora (add build fix, remove quit patch integrated + upstream) +- Add some Debian/Ubuntu patches (rss patch to improve black on some + printers, correct PhotoSmart B9100 colour profile, make it possible + to use hpinfo without cups queue, rebuild ui files to py, fix duplex + binding on PJL, upstream fix preventing hang and crashes in hpdio + settings dialog) +- Don't install udev rules and hal preprobe fdi file, they cause + many problems (launchpad bugs #319660, #319661, #319662, #319665, + RH bug #479648) +- Install Fedora's fdi file to set correct permissions on devices + +* Tue Feb 03 2009 Frederik Himpe 2.8.12-4mdv2009.1 ++ Revision: 337069 +- sync with Fedora: : + * Crash fix (RH bug #479808 comment 6) + * fix quit menu in device manager (RH bug #479751) + * Don't read config file in /root (RH bug 241776) + * Don't use rpath + * Split out gui in separate hplip-gui package +- run libtoolize to build with new libtool +- remove obsolete configure option +- suggest foomatic-db-hpijs (bug #47415) +- Remove old unapplied patches + +* Thu Dec 25 2008 Funda Wang 2.8.12-3mdv2009.1 ++ Revision: 318837 +- rebuild for new python + +* Wed Dec 24 2008 Funda Wang 2.8.12-2mdv2009.1 ++ Revision: 318236 +- drop python qt3 requirement +- update license + +* Wed Dec 24 2008 Frederik Himpe 2.8.12-1mdv2009.1 ++ Revision: 318159 +- Update to new version 2.8.12 +- Remove script for creation of Hal fdi file, fixed upstream +- Remove patches for problems fixed upstream: A3, Photosmart 1750~, + no-root-config +- Resync relevant patches with Fedora +- Add patch fixing built with -Werror=format-security +- Add patch fixing unresolved symbols, and integrate libsane linking + patch from Fedora in this patch +- Only build QT4 GUI, don't build QT3 GUI, remove patch to force QT4 + systray + + + Oden Eriksson + - lowercase ImageMagick + +* Sun Nov 02 2008 Olivier Blin 2.8.7-6mdv2009.1 ++ Revision: 299304 +- fix icon for sendfax tool in desktop entry + +* Wed Sep 10 2008 Tiago Salem 2.8.7-5mdv2009.0 ++ Revision: 283509 +- add patch to fix A3 paper size (#43337) + see (https://bugs.launchpad.net/ubuntu/+source/hplip/+bug/258881) +- bump release + +* Thu Sep 04 2008 Tiago Salem 2.8.7-4mdv2009.0 ++ Revision: 280933 +- remove non-working patch to disable autostart. +- remove the desktop file to prevent hp-systray autostart +- bump release + +* Tue Sep 02 2008 Tiago Salem 2.8.7-3mdv2009.0 ++ Revision: 279258 +- add patch to fix https://qa.mandriva.com/show_bug.cgi?id=35782 +- bump release + +* Mon Aug 18 2008 Tiago Salem 2.8.7-2mdv2009.0 ++ Revision: 273274 +- disabling system tray applet auto start + hplip needs to be installed even if you dont have a hp printer. +- bump release + +* Thu Jul 31 2008 Frederik Himpe 2.8.7-1mdv2009.0 ++ Revision: 257938 +- update to new version 2.8.7 + +* Wed Jul 30 2008 Frederik Himpe 2.8.6b-1mdv2009.0 ++ Revision: 256258 +- update to new version 2.8.6b + +* Mon Jun 23 2008 Tiago Salem 2.8.6-1mdv2009.0 ++ Revision: 228452 +- Version 2.8.6 +- change some patches to apply on the new version +- prevent errors related to cups service when removing package. + + + Pixel + - rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas + - do not call ldconfig in %%post/%%postun, it is now handled by filetriggers + +* Sat May 17 2008 Frederik Himpe 2.8.5-2mdv2009.0 ++ Revision: 208467 +- Make hplip depend on hplip-hpijs-ppds (fixes bug #39091: PPD file + for OfficeJet 9100 missing) + +* Sun May 11 2008 Frederik Himpe 2.8.5-1mdv2009.0 ++ Revision: 205808 +- Remove all obsolete patches and references to them in the SPEC file +- Remove hack in SPEC file which fixes Gentoo bug #161926, it was fixed + upstream already in 2.7.7 +- New upstream version 2.8.5 +- Remove OpenSUSE patch to prevent loading of systray applet: it is integrated + upstream +- Remove unload-traceback.patch: the file it patches no longer exists +- Create 70-hpmud.fdi hal file so that hal/consolekit will set the correct + permissions when a HP scanner is plugged in (script from OpenSUSE/Ubuntu) +- Use QT4 for system tray applet GUI, because the QT3 version does + not embed correctly in GNOME's notification area and Mandriva + 2009.0 uses QT4/KDE4 by default anyway +- Add BuildRequires: libdbus-devel +- Update to 2.8.4 +- Comment some obsolete patches +- Add patch from OpenSUSE preventing system tray applet from starting + if no HP printer is present + +* Wed Feb 13 2008 Marcelo Ricardo Leitner 2.8.2-2mdv2008.1 ++ Revision: 167077 +- Move HP-Fax*ppd from hplip-hpijs-ppds to hplip main package, as we are using cupsddk for ppds by now. +- Enhance .desktop categories for hp-sendfax tool. + + + Thierry Vignaud + - fix spacing at top of description + +* Mon Feb 11 2008 Marcelo Ricardo Leitner 2.8.2-1mdv2008.1 ++ Revision: 165458 +- Removed patch marker-supply: applied upstream. +- Adds requires to cupsddk-drivers >= 1.2.3-2mdv, for dynamic ppd generation. +- New upstream: 2.8.2 + +* Mon Jan 28 2008 Marcelo Ricardo Leitner 2.7.12-2mdv2008.1 ++ Revision: 159259 +- Do not hide cups service restart output. + + + Olivier Blin + - restore BuildRoot + +* Thu Dec 20 2007 Marcelo Ricardo Leitner 2.7.12-1mdv2008.1 ++ Revision: 135754 +- New upstream: 2.7.12 + + + Thierry Vignaud + - kill re-definition of %%buildroot on Pixel's request + +* Mon Oct 22 2007 Marcelo Ricardo Leitner 2.7.10-1mdv2008.1 ++ Revision: 101112 +- New upstream: 2.7.10 + +* Wed Oct 10 2007 Marcelo Ricardo Leitner 2.7.9-1mdv2008.1 ++ Revision: 96925 +- New upstream: 2.7.9 + + + Thierry Vignaud + - do not harcode icon extension + +* Wed Sep 19 2007 Nicolas Lécureuil 2.7.7-8mdv2008.0 ++ Revision: 90111 +- Fix menu categories (Bug #33079) + +* Wed Sep 12 2007 Marcelo Ricardo Leitner 2.7.7-7mdv2008.0 ++ Revision: 84647 +- Cleanup old initscript when upgrading from an old package. Closes: #32398 + + + Thierry Vignaud + - kill desktop-file-validate's 'warning: key "Encoding" in group "Desktop Entry" is deprecated' + +* Wed Aug 22 2007 Oden Eriksson 2.7.7-6mdv2008.0 ++ Revision: 68945 +- ehh, i meant System/Printing :) +- fix deps sip/python-sip +- use the new System/Printers RPM GROUP + +* Wed Aug 08 2007 Oden Eriksson 2.7.7-5mdv2008.0 ++ Revision: 60202 +- rebuilt against new net-snmp libs + +* Wed Aug 08 2007 Funda Wang 2.7.7-4mdv2008.0 ++ Revision: 60116 +- BR desktop-file-utils +- Add desktop file patch from fedora +- use hplip's own desktop file + +* Wed Aug 08 2007 Funda Wang 2.7.7-3mdv2008.0 ++ Revision: 60079 +- No more hardware category (bug#32383) +- fix typo +- add more appropriate desktop entry category + +* Sat Aug 04 2007 Funda Wang 2.7.7-1mdv2008.0 ++ Revision: 58934 +- New version 2.7.7 + +* Wed Jul 25 2007 Funda Wang 2.7.6-1mdv2008.0 ++ Revision: 55449 +- Add gentoo fix for gentoobug#161926, to be fixed in upstream 2.7.7 +- fix desktop entry categories +- no more service +- fix file list +- kill old menu +- Merge fedora patches +- Rediff patch11 +- add official patch +- New version + +* Wed Jun 20 2007 Marcelo Ricardo Leitner 1.7.4a-2mdv2008.0 ++ Revision: 41898 +- Use py_requires macro. + +* Sun May 13 2007 Funda Wang 1mdv2008.0-current ++ Revision: 26583 +- remove python sitepackages la files +- New upstream version + + +* Tue Jan 30 2007 Olivier Blin 1.6.12-2mdv2007.0 ++ Revision: 115330 +- move doc in subpackage + +* Tue Jan 23 2007 Marcelo Ricardo Leitner 1.6.12-1mdv2007.1 ++ Revision: 112622 +- New upstream: 1.6.12 +- Rediff hplip-1.6.12-HP-PhotoSmart_7150tilde.patch and + hplip-1.6.12-14_charsign_fixes.patch due to data file format + change. + +* Thu Dec 14 2006 Nicolas Lécureuil 1.6.10-1mdv2007.1 ++ Revision: 96768 +- Fix python macro +- Add sources +- New Version 1.6.10 +- Import hplip + +* Tue Sep 19 2006 Till Kamppeter 1.6.9-1mdv2007.0 +- Updated to version 1.6.9 final (Added support for HP PhotoSmart A310, + C5100, C6100, C7100, D5100, D5060, and B8300 series printers, many + bug fixes, especially on faxing and on documentation). + +* Thu Sep 14 2006 Till Kamppeter 1.6.9-0.1mdv2007.0 +- Updated to version 1.6.9-rc3. + +* Sat Aug 05 2006 Till Kamppeter 1.6.7-2mdv2007.0 +- /usr/bin/hpijs was included twice, fixed (bug 24111). + +* Fri Aug 04 2006 Till Kamppeter 1.6.7-1mdv2007.0 +- Updated to version 1.6.7 (Improved auto-assosiation of PPD files to detected + printers and faxes by the web interface of CUPS 1.2; static IP ports for the + daemons; tons of bug fixes; new printers models: HP Photosmart D6100 and + D7100). + +* Sat Jul 01 2006 Till Kamppeter 1.6.6-4mdv2007.0 +- Uncompressed patches. + +* Thu Jun 29 2006 Till Kamppeter 1.6.6-3mdk +- Updated to version 1.6.6a (Bug fixes, should make fax really usable + again). + +* Sat Jun 24 2006 Till Kamppeter 1.6.6-2mdk +- Updated to version 1.6.6a.2 (Bug fixes, mainly for fax). + +* Sat Jun 17 2006 Till Kamppeter 1.6.6-1mdk +- Updated to version 1.6.6 (Adaption of the CUPS backends to CUPS 1.2.x, + improvements on faxing, several scanning bug fixes, several other bug + fixes, new printer models: HP Deskjet D4100, D2300, D1360 series, + Photosmart A430, A510, A710, A610, C4100, C3100, D7300 series). +- Removed patch 18 (merged upstream). + +* Thu May 25 2006 Till Kamppeter 0.9.11-4mdk +- Added menu entry for hp-sendfax (with current HPLIP hp-sendfax does + not pop up automatically any more when sending faxes). + +* Mon May 15 2006 Till Kamppeter 0.9.11-3mdk +- Fixed bug which made Duplex not working any more in HPLIP 0.9.9 + (patch 18, contains this fix and also the fix of May 11). + +* Fri May 12 2006 Till Kamppeter 0.9.11-2mdk +- Fixed problem of HP PSC 950 series printers not being correctly + recognized. + +* Thu May 11 2006 Till Kamppeter 0.9.11-1mdk +- Updated to version 0.9.11 (Changes on "hp-sendfax", revamped + mail notification, many bug fixes, new models: LaserJet 5200, + LaserJet 5200L, Color LaserJet 2605, Officejet 6300 series, + Officejet 4300 series). +- Replaced "BuildRequires: sip-devel PyQt-devel" by + "BuildRequires: sip PyQt" as the sip and PyQt packages were + restructured. + +* Wed Apr 05 2006 Till Kamppeter 0.9.10-2mdk +- Moved CUPS backend directory from /usr/lib64/cups/backend to + /usr/lib/cups/backend on 64-bit systems. + +* Wed Mar 29 2006 Till Kamppeter 0.9.10-1mdk +- Updated to version 0.9.10 (Bugfix release). +- Let CUPS be restarted when sub-packages with PPD files are added or + removed. + +* Mon Mar 13 2006 Till Kamppeter 0.9.9-1mdk +- Updated to version 0.9.9 (Device communication via libusb, USB 1284.4 + support for many laser printers, dropped use of USB device file mames + in CUPS/SANE URIs, updated PPD files for CUPS 1.2 compatibility, moved + temp fax .g3 files to ~/hpfax/hpfax-.g3, page counting for fax, + fullbleed fix, support for HP DeskJet F300 Series All-in-one, bug fixes). + +* Sat Feb 25 2006 Till Kamppeter 0.9.8-4mdk +- Applied official bugfix patch 0.9.8-4 from HP (In addition to the + fixes of the previous patch an array index underflow in the driver + for the FastRaster device class (LaserJet 1010/1012) is fixed). +- Removed patch 4 (probably fixed upstream). + +* Tue Feb 07 2006 Till Kamppeter 0.9.8-3mdk +- Applied official bugfix patch 0.9.8-3 from HP (Fixed an extraneous + "r-value (1) error" message, which can occur while launching HPLIP + utilities with inkjets, reported by Henrique de Moraes Holschuh from + Debian). + +* Thu Feb 02 2006 Till Kamppeter 0.9.8-2mdk +- Apply 0700 permissions to the CUPS backends, so that CUPS 1.2 runs them + as root. +- Make the CUPS backends being installed in %%{_libdir} so that they go + into /usr/lib64/cups/backend on 64-bit systems. +- Introduced %%mkrel. + +* Wed Feb 01 2006 Till Kamppeter 0.9.8-1mdk +- Updated to version 0.9.8 (PC send fax support, HP Setup utility, + enhanced the status history table in hp-info, added support for + HP Color LaserJet 2605, LaserJet 3050, 3060, 3062, 3390, 3392, + Deskjet 6980 series, 6940 series, lots of bug fixes). +- Removed patch 16 (merged upstream). +- Added "Requires: python-reportlab" as this package is needed to + generate fax cover pages. + +* Wed Jan 04 2006 Oden Eriksson 0.9.7-5mdk +- rebuilt against new net-snmp with new major (10) + +* Wed Dec 21 2005 Oden Eriksson 0.9.7-4mdk +- rebuilt against net-snmp that has new major (9) + +* Thu Dec 08 2005 Till Kamppeter 0.9.7-3mdk +- Rebuilt because 0.9.7-2mdk was not cleanly uploaded. + +* Wed Dec 07 2005 Till Kamppeter 0.9.7-2mdk +- Applied official bugfix patch 0.9.7-2 from HP (Fixed Photosmart 2570 + series blue screen scanning error, device status in hpiod, SuperB margin + issue with OfficeJet K550, K850, and DeskJet 9800). + +* Tue Nov 22 2005 Till Kamppeter 0.9.7-1mdk +- Updated to version 0.9.7 (Reverted buggy change on duplex printing in + 0.9.6, better parallel device support, faster startup of the toolbox, + hp-makeuri works with host names now, support for motorized photo paper + tray, new models: HP Color LaserJet 3000, 3600, 3800). + +* Mon Nov 14 2005 Oden Eriksson 0.9.6-2mdk +- rebuilt against openssl-0.9.8a + +* Sun Oct 16 2005 Till Kamppeter 0.9.6-1mdk +- Updated to version 0.9.6 (Design changes and bug fixes in the hp-toolbox; + prepared HPLIP to run as a non-root user; bug fixes in HPIJS, especially + full-bleed and duplex; new models supported: HP Color LaserJet 4730 MFP, + Deskjet 460, Officejet Pro K550, and K850). +- Removed patches 5, 8, 9, 10, 12, 13, and 14 (merged upstream). + +* Sat Sep 17 2005 Till Kamppeter 0.9.5-1mdk +- Updated to version 0.9.5 (Parallel port device support, tons of + bug fixes, fixed 4-edge full-bleed upstream, added support for + HP PhotoSmart 420, 470, 2570, 3100, 3200, 3300, 7800, 8000, DeskJet + 5440, 5940, OfficeJet 5600, PSC 1400, Color LaserJet 4700). +- Included official patch from HP (patch 8). +- Applied Debian/Ubuntu patches (patches 9-15). +- Rediffed patch 5 to not conflict with the Debian/Ubuntu patches. +- Removed patches 6 and 7 (merged upstream). + +* Sat Sep 10 2005 Till Kamppeter 0.9.4-6mdk +- Fixed full-bleed on Letter, A4 or bigger paper (patch 7). +- Let the HPLIP toolbox start the browser to access the web interface + of a LAN printer in the background, so that one can still work in + the toolbox while the browser is open (patch 6). + +* Fri Sep 09 2005 Till Kamppeter 0.9.4-5mdk +- Removed "su" from statup script, it can break things in certain cases + (patch 5). + +* Thu Sep 08 2005 Gwenole Beauchesne 0.9.4-4mdk +- 64-bit fixes + +* Wed Aug 31 2005 Till Kamppeter 0.9.4-3mdk +- Updated package summary and description. + +* Wed Aug 31 2005 Till Kamppeter 0.9.4-2mdk +- Some HP PhotoSmart 7150 identify themselves as "hp photosmart 7150~", + applied patch 3 as workaround (bug 16514). + +* Wed Jul 27 2005 Till Kamppeter 0.9.4-1mdk +- Updated to version 0.9.3 (Added support for HP Color LaserJet 2800, HP + Photosmart 8200, HP Photosmart 330, HP Photosmart 380, Deskjet 1280, + Deskjet 3040, Deskjet 3920, tons of bug fixes: 4-edge full-bleed + printing on postcard-sized PhotoSmarts, 64-bit issues, unidirectional + printing, info querying, added some older HP devices which work with + HPIJS/HPLIP to the models.xml file, and more). + +* Wed May 18 2005 Till Kamppeter 0.9.3-1mdk +- Updated to version 0.9.3 (4-edge full-bleed on all paper sizes should + now work on all appropriate models!! Fixes for HP LaserJet 1010, 1012, + 1015, 1022, 4050, DeskJet 1220C, OfficeJet K80xi, V40, 7200, 7300, 7400, + margin correction on many recent DeskJets, fixed errors on "hp-probe -s*" + and on accessing photo cards when no card is inserted, many other fixes). + +* Wed Apr 20 2005 Till Kamppeter 0.9.2-1mdk +- Updated to version 0.9.2 (Again tons of bug fixes, especially + toner level and LCD contents display for network laser, simplified + architecture of the Toolbox, new "FastDraft Grayscale" printout + quality setting). +- Removed patch 2 (merged upstream). +- Commenting out "setSizePolicy" not needed any more, fixed upstream. + +* Tue Apr 12 2005 Till Kamppeter 0.9.1-2mdk +- Let /usr/bin/hp-* links be generated so that HPLIP tools can be easily + accessed. + +* Tue Apr 05 2005 Till Kamppeter 0.9.1-1mdk +- Updated to version 0.9.1 (Again tons of bug fixes, especially a possible + fix for bugs 13675 and 14179, ink level and status display fixes for + several models, lockup fix for HP DeskJet 450, fixed missing support + for OfficeJet 5110, support for new printer models: HP LaserJet 4240, + HP LaserJet 9040, hp color LaserJet 4610, HP LaserJet 1022, HP Business + Inkjet 1000). +- Fixed battery level check for HP DeskJet 450 (patch 2, toolbox would + make hpssd crashing when HP DeskJet 450 is connected and this patch + not applied. + +* Fri Apr 01 2005 Till Kamppeter 0.9-2mdk +- Added support for HP PSC 750xi. + +* Thu Mar 31 2005 Till Kamppeter 0.9-1mdk +- Updated to version 0.9 (Tons of bug fixes, should fix bugs 14179, 13675, + and 13671; Support for HP LaserJet 1010, 1012, HP Color LaserJet 35xx; + status and toner level reporting for laser printers). +- Commented out all "setSizePolicy" calls in the .py files, this function + is incompatible with current PyQT/SIP (bug 13315). +- Removed patch 0 (merged upstream). + +* Mon Mar 07 2005 Till Kamppeter 0.8.8-5mdk +- Rebuilt for SIP 4.2.1 and PyQt 3.14. + +* Mon Feb 14 2005 Till Kamppeter 0.8.8-4mdk +- Added "Requires: net-snmp-mibs", otherwise communicating with ethernet- + connected printers does not work. + +* Thu Feb 10 2005 Till Kamppeter 0.8.8-3mdk +- Corrected shutdown priority in startup script to be after CUPS. + +* Thu Feb 10 2005 Till Kamppeter 0.8.8-2mdk +- Let SNMP stuff really getting built (patch0). +- Correct priority in startup script so that the daemons get started + before CUPS. + +* Wed Feb 09 2005 Till Kamppeter 0.8.8-1mdk +- Updated to version 0.8.8. + +* Mon Feb 07 2005 Till Kamppeter 0.8.7-4mdk +- Put XML file with list of supported models into extra package, so that + printerdrake can install only this and then determine whether to install + HPLIP. + +* Fri Feb 04 2005 Till Kamppeter 0.8.7-3mdk +- Added "Provides: hpijs" to hplip-hpijs package. +- Versioned conflict for hplip-hpijs package: + "Conflicts: printer-filters < 10.2". + +* Tue Feb 01 2005 Till Kamppeter 0.8.7-2mdk +- Rebuilt with dependency on sip 4.1.1 or newer. With older sip PyQt + GUIs segfault. + +* Fri Jan 21 2005 Till Kamppeter 0.8.7-1mdk +- Initial Mandrakelinux release. +