Automatic import for version 3.11.5

2025-02-23 16:32:58 +00:00 · 2012-02-01 15:16:03 +04:00 · 2012-02-01 15:16:03 +04:00 · b0d9109826
commit b0d9109826
44 changed files with 5005 additions and 0 deletions
--- a/.abf.yml
+++ b/.abf.yml
@ -0,0 +1,2 @@
+sources:
+  "hplip-3.11.5.tar.gz": e3604752b7a1ab0f492a1b4d470f8fa75e8959e5
--- a/10_shebang_fixes.dpatch
+++ 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 <hmh@debian.org>
+##
+## 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.
--- a/85_rebuild_python_ui.dpatch
+++ b/85_rebuild_python_ui.dpatch
@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 85_rebuild_python_ui.dpatch by  <till.kamppeter@gmail.com>
+##
+## 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
--- a/87_move_documentation.dpatch
+++ 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
+ 
--- a/delayed-hp-systray-start.dpatch
+++ b/delayed-hp-systray-start.dpatch
@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## delayed-hp-systray-start.dpatch by  <till.kamppeter@gmail.com>
+##
+## 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;
--- a/hp-check_debian.dpatch
+++ b/hp-check_debian.dpatch
@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## hp-check_debian.dpatch by  <msp@debian.org>
+##
+## 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:
--- a/hpcups-update-ppds.sh
+++ b/hpcups-update-ppds.sh
@ -0,0 +1,111 @@
+#!/bin/bash
+
+## Copyright (C) 2010 Red Hat, Inc.
+## Authors:
+##  Tim Waugh <twaugh@redhat.com>
+
+## 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
--- a/hplip-2.7.6-14_charsign_fixes.patch
+++ 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;
--- a/hplip-3.11.3-link.patch
+++ 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
--- a/hplip-3.9.8-dlopen-libhpmud.patch
+++ 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. */ 
--- a/hplip-CVE-2010-4267.patch
+++ 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;
--- a/hplip-UnicodeDecodeError.patch
+++ 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)
--- a/hplip-addprinter.patch
+++ 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;
--- a/hplip-bad-low-ink-warning.patch
+++ 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)
+                         {
--- a/hplip-clear-old-state-reasons.patch
+++ 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) {
--- a/hplip-dbglog-newline.patch
+++ 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;
+ }
+ 
--- a/hplip-dbus-exception.patch
+++ 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
--- a/hplip-dbus-threads.patch
+++ 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
--- a/hplip-device-reconnected.patch
+++ 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. */
--- a/hplip-deviceIDs-drv.patch
+++ b/hplip-deviceIDs-drv.patch
--- a/hplip-deviceIDs-ppd.patch
+++ 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)"
--- a/hplip-discovery-method.patch
+++ 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)
--- a/hplip-emit-SIGNAL.patch
+++ 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()
--- a/hplip-fab-root-crash.patch
+++ 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):
--- a/hplip-hpaio-segfault.patch
+++ 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;
--- a/hplip-hpcups-sigpipe.patch
+++ 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 <errno.h>
+ #include <sys/stat.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -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;
+    }
+ 
--- a/hplip-hpijs-marker-supply.patch
+++ 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()));
--- a/hplip-hpinfo-query-without-cups-queue.patch
+++ 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  <till.kamppeter@gmail.com>
+##
+## 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:
--- a/hplip-mucks-with-spooldir.patch
+++ 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"));
--- a/hplip-newline.patch
+++ 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);
--- a/hplip-no-asm.patch
+++ 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<<n_bits) - 1u);                                      \
+ }
+ 
+-#if 0
+-
+-#define BITS_LOAD(g, num_bits, par_result) {                                 \
+-    int n_bits = (int)(num_bits);                                            \
+-                                                                             \
+-    par_result = g->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
--- a/hplip-no-system-tray.patch
+++ 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)
--- a/hplip-notification-exception.patch
+++ 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)
--- a/hplip-photosmart_b9100_support.patch
+++ b/hplip-photosmart_b9100_support.patch
@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## hp_photosmart_pro_b9100_support.dpatch by  <till.kamppeter@gmail.com>
+##
+## 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
--- a/hplip-pjl-duplex-binding.patch
+++ b/hplip-pjl-duplex-binding.patch
@ -0,0 +1,74 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## pjl-duplex-binding.dpatch by  <till.kamppeter@gmail.com>
+##
+## 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;
+ 
--- a/hplip-pstotiff-is-rubbish.patch
+++ 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
--- a/hplip-raw_deviceID-traceback.patch
+++ 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)
+ 
--- a/hplip-retry-open.patch
+++ 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]);
+ 
--- a/hplip-rss.patch
+++ b/hplip-rss.patch
@ -0,0 +1,111 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## rss.dpatch by Torsten Landschoff <torsten@pulsar.galaxy>
+##
+## 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,
--- a/hplip-skip-blank-lines.patch
+++ 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();
--- a/hplip-strstr-const.patch
+++ 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;
--- a/hplip-udev-rules.patch
+++ 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"
--- a/hplip-ui-optional.patch
+++ 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
--- a/hplip.spec
+++ b/hplip.spec