LOG Update to 3.12.6

2025-02-23 16:32:58 +00:00 · 2012-08-22 15:05:53 +04:00 · 2012-08-22 15:05:53 +04:00 · 77d7c27c23
commit 77d7c27c23
parent 83a7b3ec84
26 changed files with 1396 additions and 0 deletions
--- a/.abf.yml
+++ b/.abf.yml
@ -0,0 +1,2 @@
+sources:
+  "hplip-3.12.6.tar.gz": f3d7f66fb5eff2158ac42bb5a115f8ef8bd7a383
--- a/01_rss.dpatch
+++ b/01_rss.dpatch
@ -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/14_charsign_fixes.dpatch
+++ b/14_charsign_fixes.dpatch
@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 14_charsign_fixes.dpatch by  <till.kamppeter@gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: some missing charsign
+
+@DPATCH@
+diff -urNad hplip-1.7.3~/scan/sane/scl.c hplip-1.7.3/scan/sane/scl.c
+--- hplip-1.7.3~/scan/sane/scl.c	2007-03-19 16:26:48.000000000 +0000
+++ hplip-1.7.3/scan/sane/scl.c	2007-03-26 22:48:39.000000000 +0100
+@@ -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 )
+     {
--- a/add-lidil-two-cartridge-modes.dpatch
+++ b/add-lidil-two-cartridge-modes.dpatch
@ -0,0 +1,123 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## add-lidil-two-cartridge-modes.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.10.6~/prnt/drv/hpijs.drv.in hplip-3.10.6/prnt/drv/hpijs.drv.in
+--- hplip-3.10.6~/prnt/drv/hpijs.drv.in	2010-09-14 16:08:45.936316029 +0200
+++ hplip-3.10.6/prnt/drv/hpijs.drv.in	2010-09-14 16:08:46.506315314 +0200
+@@ -4411,16 +4411,16 @@
+ r=&quot;HEWLETT-PACKARD&quot; -sDeviceModel=&quot;deskjet 3320&quot;"
+   Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B"
+   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=300DraftColorCM&&
+-Y"
+YK"
+   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft.Gray" "Quality=300DraftGr&&
+ ayscaleK"
+-  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMY"
+  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMYK"
+   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal.Gray" "Quality=300Graysc&&
+ aleK"
+-  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMY"
+  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMYK"
+   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High.Gray" "Quality=600Grayscal&&
+ eK"
+-  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMY"
+  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMYK"
+   Attribute "FoomaticRIPOption" "PageSize" "enum CmdLine A"
+   Attribute "FoomaticRIPOptionSetting" "PageSize=Letter" " -dDEVICEWIDTHPOINTS=612 -&&
+ dDEVICEHEIGHTPOINTS=792"
+@@ -4879,13 +4879,13 @@
+ r=&quot;HEWLETT-PACKARD&quot; -sDeviceModel=&quot;deskjet 3600&quot;"
+   Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B"
+   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=300DraftColorCM&&
+-Y"
+YK"
+   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft.Gray" "Quality=300DraftGr&&
+ ayscaleK"
+-  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMY"
+  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMYK"
+   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal.Gray" "Quality=300Graysc&&
+ aleK"
+-  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMY"
+  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMYK"
+   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High.Gray" "Quality=600Grayscal&&
+ eK"
+   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMYKFul&&
+@@ -5347,13 +5347,13 @@
+ "
+   Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B"
+   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=600DraftColorCM&&
+-Y"
+YK"
+   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft.Gray" "Quality=600DraftGr&&
+ ayscaleK"
+-  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=600ColorCMY"
+  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=600ColorCMYK"
+   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal.Gray" "Quality=600Graysc&&
+ aleK"
+-  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMY"
+  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMYK"
+   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High.Gray" "Quality=600Grayscal&&
+ eK"
+   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMYKFul&&
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' hplip-3.10.6~/prnt/drv/hpijs.drv.in.template hplip-3.10.6/prnt/drv/hpijs.drv.in.template
+--- hplip-3.10.6~/prnt/drv/hpijs.drv.in.template	2010-07-19 04:15:11.000000000 +0200
+++ hplip-3.10.6/prnt/drv/hpijs.drv.in.template	2010-09-14 16:08:57.346301718 +0200
+@@ -2221,16 +2221,16 @@
+ r=&quot;HEWLETT-PACKARD&quot; -sDeviceModel=&quot;deskjet 3320&quot;"
+   Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B"
+   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=300DraftColorCM&&
+-Y"
+YK"
+   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft.Gray" "Quality=300DraftGr&&
+ ayscaleK"
+-  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMY"
+  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMYK"
+   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal.Gray" "Quality=300Graysc&&
+ aleK"
+-  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMY"
+  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMYK"
+   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High.Gray" "Quality=600Grayscal&&
+ eK"
+-  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMY"
+  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMYK"
+   Attribute "FoomaticRIPOption" "PageSize" "enum CmdLine A"
+   Attribute "FoomaticRIPOptionSetting" "PageSize=Letter" " -dDEVICEWIDTHPOINTS=612 -&&
+ dDEVICEHEIGHTPOINTS=792"
+@@ -2403,13 +2403,13 @@
+ r=&quot;HEWLETT-PACKARD&quot; -sDeviceModel=&quot;deskjet 3600&quot;"
+   Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B"
+   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=300DraftColorCM&&
+-Y"
+YK"
+   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft.Gray" "Quality=300DraftGr&&
+ ayscaleK"
+-  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMY"
+  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMYK"
+   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal.Gray" "Quality=300Graysc&&
+ aleK"
+-  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMY"
+  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMYK"
+   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High.Gray" "Quality=600Grayscal&&
+ eK"
+   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMYKFul&&
+@@ -2599,13 +2599,13 @@
+ "
+   Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B"
+   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=600DraftColorCM&&
+-Y"
+YK"
+   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft.Gray" "Quality=600DraftGr&&
+ ayscaleK"
+-  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=600ColorCMY"
+  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=600ColorCMYK"
+   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal.Gray" "Quality=600Graysc&&
+ aleK"
+-  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMY"
+  Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMYK"
+   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High.Gray" "Quality=600Grayscal&&
+ eK"
+   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMYKFul&&
--- a/add_missing_newline_for_error_log.dpatch
+++ b/add_missing_newline_for_error_log.dpatch
@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## add_missing_newline_for_error_log.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.10.9~/prnt/hpcups/HPCupsFilter.cpp hplip-3.10.9/prnt/hpcups/HPCupsFilter.cpp
+--- hplip-3.10.9~/prnt/hpcups/HPCupsFilter.cpp	2010-09-26 19:01:47.000000000 +0200
+++ hplip-3.10.9/prnt/hpcups/HPCupsFilter.cpp	2010-12-07 10:57:00.075229061 +0100
+@@ -620,7 +620,7 @@
+             WriteBMPHeader (kfp, cups_header.cupsWidth, cups_header.cupsHeight, BLACK_RASTER);
+         }
+ 
+-        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/hp-check-groups.dpatch
+++ b/hp-check-groups.dpatch
@ -0,0 +1,19 @@
+--- hplip-3.12.6/check.py.hp-check-groups	2012-06-18 12:44:13.000000000 +0200
+++ hplip-3.12.6/check.py	2012-06-26 18:24:26.417226100 +0200
+@@ -918,6 +918,16 @@ try:
+                 if disable_selinux == False:
+                     log.info("%-15s %-15s %-10s %-3s %-3s %-8s %s"\
+                                               %("SELinux",  "disabled", "Optional", "-", "-", "OK", "-"))
+
+        if "lp " in output:
+            log.info(log.green("User member of group 'lp'. Enables print/ scan/ fax."))
+        else:
+            log.error("User needs to be member of group 'lp' to enable print, scan & fax.")
+
+        if "lpadmin" in output:
+            log.info(log.green("User member of group 'lpadmin'."))
+        else:
+            log.error("User needs to be member of group 'lpadmin' to manage printers.")
+                                               
+         package_mgr_cmd = core.get_distro_data('package_mgr_cmd')
+         pre_depend_cmd  = core.get_distro_data('pre_depend_cmd')
--- a/hp-mkuri-take-into-account-already-installed-plugin-also-for-exit-value.dpatch
+++ b/hp-mkuri-take-into-account-already-installed-plugin-also-for-exit-value.dpatch
@ -0,0 +1,42 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## hp-mkuri-take-into-account-already-installed-plugin-also-for-exit-value.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.10.2~/io/hpmud/hp-mkuri.c hplip-3.10.2/io/hpmud/hp-mkuri.c
+--- hplip-3.10.2~/io/hpmud/hp-mkuri.c	2010-03-17 22:42:56.682033355 +0100
+++ hplip-3.10.2/io/hpmud/hp-mkuri.c	2010-03-17 22:45:36.370765292 +0100
+@@ -385,17 +385,23 @@
+    }
+ 
+    ret = 0;
+-   if (plugin == HPMUD_PLUGIN_TYPE_REQUIRED)
+-      ret = 2;
+-   else if (plugin == HPMUD_PLUGIN_TYPE_OPTIONAL)
+-      ret = 3;
+-   if (fax > 0)
+   if (!plugin_installed)
+    {
+-      ret = 4;
+       if (plugin == HPMUD_PLUGIN_TYPE_REQUIRED)
+-         ret = 5;
+         ret = 2;
+       else if (plugin == HPMUD_PLUGIN_TYPE_OPTIONAL)
+-         ret = 6;
+         ret = 3;
+   }
+   if (fax > 0)
+   {
+      ret = 4;
+      if (!plugin_installed)
+      {
+	 if (plugin == HPMUD_PLUGIN_TYPE_REQUIRED)
+	    ret = 5;
+	 else if (plugin == HPMUD_PLUGIN_TYPE_OPTIONAL)
+	    ret = 6;
+      }
+    }
+ 
+ bugout:
--- a/hp-setup-prompt-for-custom-PPD.dpatch
+++ b/hp-setup-prompt-for-custom-PPD.dpatch
@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## hp-setup-prompt-for-custom-PPD.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.8~/setup.py hplip-3.9.8/setup.py
+--- hplip-3.9.8~/setup.py	2009-08-04 23:37:39.000000000 +0200
+++ hplip-3.9.8/setup.py	2009-10-02 18:42:39.000000000 +0200
+@@ -473,14 +473,13 @@
+                 print_ppd, desc = print_ppd
+                 log.info("\nFound PPD file: %s" % print_ppd)
+ 
+-                if desc:
+-                    log.info("Description: %s" % desc)
+                log.info("Description: %s" % desc)
+ #
+-                    if not auto:
+-                        log.info("\nNote: The model number may vary slightly from the actual model number on the device.")
+-                        ok, ans = tui.enter_yes_no("\nDoes this PPD file appear to be the correct one")
+-                        if not ok: sys.exit(0)
+-                        if not ans: enter_ppd = True
+                if not auto:
+                    log.info("\nNote: The model number may vary slightly from the actual model number on the device.")
+                    ok, ans = tui.enter_yes_no("\nDoes this PPD file appear to be the correct one")
+                    if not ok: sys.exit(0)
+                    if not ans: enter_ppd = True
+ 
+ 
+             if enter_ppd:
--- a/hp-systray-make-menu-appear-in-sni-qt-indicator-with-kde.dpatch
+++ b/hp-systray-make-menu-appear-in-sni-qt-indicator-with-kde.dpatch
@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## hp-systray-make-menu-appear-in-sni-qt-indicator-with-kde.patch.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.7~/ui4/systemtray.py hplip-3.11.7/ui4/systemtray.py
+--- hplip-3.11.7~/ui4/systemtray.py	2011-09-27 16:36:29.656301152 +0200
+++ hplip-3.11.7/ui4/systemtray.py	2011-09-27 16:38:47.716834875 +0200
+@@ -473,6 +473,9 @@
+ 
+         elif reason == QSystemTrayIcon.Trigger:
+             #print "single click"
+            self.updateMenu()
+            if not self.menu is None:
+                self.menu.popup(QCursor.pos())
+             pass
+ 
+         elif reason == QSystemTrayIcon.MiddleClick:
--- a/hp-systray-make-menu-title-visible-in-sni-qt-indicator.dpatch
+++ b/hp-systray-make-menu-title-visible-in-sni-qt-indicator.dpatch
@ -0,0 +1,44 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## hp-systray-make-menu-title-visible-in-sni-qt-indicator.patch.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.7~/ui4/systemtray.py hplip-3.11.7/ui4/systemtray.py
+--- hplip-3.11.7~/ui4/systemtray.py	2011-09-27 16:29:05.930588497 +0200
+++ hplip-3.11.7/ui4/systemtray.py	2011-09-27 16:34:42.891888674 +0200
+@@ -348,29 +348,11 @@
+     def setMenu(self):
+         self.menu = QMenu()
+ 
+-        title = QWidgetAction(self.menu)
+        title = QAction(self.menu)
+         #title.setDisabled(True)
+-
+-        hbox = QFrame(self.menu)
+-        layout = QHBoxLayout(hbox)
+-        layout.setMargin(3)
+-        layout.setSpacing(5)
+-        pix_label = QLabel(hbox)
+-
+-        layout.insertWidget(-1, pix_label, 0)
+-
+-        icon_size = self.menu.style().pixelMetric(QStyle.PM_SmallIconSize)
+-        pix_label.setPixmap(self.prop_icon.pixmap(icon_size))
+-
+-        label = QLabel(hbox)
+-        layout.insertWidget(-1, label, 20)
+-        title.setDefaultWidget(hbox)
+-
+-        label.setText(self.__tr("HPLIP Status Service"))
+-
+-        f = label.font()
+-        f.setBold(True)
+-        label.setFont(f)
+        title.setText(self.__tr("HPLIP Status Service"))
+        title.setIcon(self.prop_icon)
+        title.setIconVisibleInMenu(True)
+         self.menu.insertAction(None, title)
+ 
+         if devices:
--- a/hpfax-bug-function-used-before-importing-log.dpatch
+++ b/hpfax-bug-function-used-before-importing-log.dpatch
@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## hpfax-bug-function-used-before-importing-log.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.7~/fax/backend/hpfax.py hplip-3.11.7/fax/backend/hpfax.py
+--- hplip-3.11.7~/fax/backend/hpfax.py	2011-07-24 21:06:43.000000000 +0200
+++ hplip-3.11.7/fax/backend/hpfax.py	2011-09-23 10:53:26.338256601 +0200
+@@ -52,7 +52,10 @@
+ 
+ def bug(msg):
+     syslog.syslog("hpfax[%d]: error: %s\n" % (pid, msg))
+-    log.stderr("ERROR: %s\n" % msg)
+    try:
+        log.stderr("ERROR: %s\n" % msg)
+    except:
+        print >> sys.stderr, ("ERROR: %s\n" % msg)
+ 
+ 
+ if os.path.exists(config_file):
--- a/hplip-3.11.10-mga-remove-duplicate-entry-for-cp1700-in-drv-files.patch
+++ b/hplip-3.11.10-mga-remove-duplicate-entry-for-cp1700-in-drv-files.patch
@ -0,0 +1,71 @@
+Index: hplip-3.11.10/prnt/drv/hpcups.drv.in
+===================================================================
+--- hplip-3.11.10/prnt/drv/hpcups.drv.in
+++ hplip-3.11.10/prnt/drv/hpcups.drv.in	2011-10-14 16:26:36.556713981 +0200
+@@ -1663,14 +1663,6 @@
+       Attribute "Product" "" "(HP Photosmart 1315 Printer)"
+     }
+     {
+-      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;"
+-      PCFileName "hp-color_inkjet_cp1700.ppd"
+-      Attribute "Product" "" "(HP Color Inkjet cp1700 Printer)"
+-    }
+-    {
+       ModelName "HP PSC 2100 Series"
+       Attribute "NickName" "" "HP PSC 2100 Series, $Version"
+       Attribute "ShortNickName" "" "HP PSC 2100 Series"
+@@ -1778,11 +1770,11 @@
+ 
+     // <%DJ9xxVIP:LargeFormatSuperB%>
+     {
+-      ModelName "HP Color Inkjet Printer cp1700"
+-      Attribute "NickName" "" "HP Color Inkjet Printer cp1700, $Version"
+-      Attribute "ShortNickName" "" "HP Color Inkjet Printer cp1700"
+-      Attribute "1284DeviceID" "" "MFG:HP;MDL:color inkjet printer cp1700;DES:color inkjet printer cp1700;"
+-      PCFileName "hp-color_inkjet_printer_cp1700.ppd"
+      ModelName "HP Color Inkjet cp1700"
+      Attribute "NickName" "" "HP Color Inkjet cp1700, $Version"
+      Attribute "ShortNickName" "" "HP Color Inkjet cp1700"
+      Attribute "1284DeviceID" "" "MFG:HP;MDL:color inkjet cp1700;DES:color inkjet cp1700;"
+      PCFileName "hp-color_inkjet_cp1700.ppd"
+       Attribute "Product" "" "(HP Color Inkjet cp1700 Printer)"
+       Attribute "Product" "" "(HP Color Inkjet cp1700ps Printer)"
+       Attribute "Product" "" "(HP Color Inkjet cp1700d Printer)"
+Index: hplip-3.11.10/prnt/drv/hpijs.drv.in
+===================================================================
+--- hplip-3.11.10/prnt/drv/hpijs.drv.in
+++ hplip-3.11.10/prnt/drv/hpijs.drv.in	2011-10-14 16:28:49.714795214 +0200
+@@ -1745,14 +1745,6 @@
+     Attribute "Product" "" "(HP Photosmart 1315 Printer)"
+   }
+   {
+-    ModelName "HP Color Inkjet cp1700 hpijs"
+-    Attribute "NickName" "" "HP Color Inkjet cp1700 hpijs, $Version"
+-    Attribute "ShortNickName" "" "HP Color Inkjet cp1700 hpijs"
+-    Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color inkjet cp1700;DES:hp color inkjet cp1700;"
+-    PCFileName "hp-color_inkjet_cp1700-hpijs.ppd"
+-    Attribute "Product" "" "(HP Color Inkjet cp1700 Printer)"
+-  }
+-  {
+     ModelName "HP PSC 2100 Series hpijs"
+     Attribute "NickName" "" "HP PSC 2100 Series hpijs, $Version"
+     Attribute "ShortNickName" "" "HP PSC 2100 Series hpijs"
+@@ -1834,11 +1826,11 @@
+     CustomMedia "A3/A3" 842.00 1190.00 18.00 36.00 18.00 9.00 "%% FoomaticRIPOptionSetting: PageSize=A3" "%% FoomaticRIPOptionSetting: PageSize=A3"
+     // <%DJ9xxVIP:LargeFormatSuperB%>
+     {
+-      ModelName "HP Color Inkjet Printer cp1700 hpijs"
+-      Attribute "NickName" "" "HP Color Inkjet Printer cp1700 hpijs, $Version"
+      ModelName "HP Color Inkjet cp1700 hpijs"
+      Attribute "NickName" "" "HP Color Inkjet cp1700 hpijs, $Version"
+       Attribute "ShortNickName" "" "HP cp1700 hpijs"
+-      Attribute "1284DeviceID" "" "MFG:HP;MDL:color inkjet printer cp1700;DES:color inkjet printer cp1700;"
+-      PCFileName "hp-color_inkjet_printer_cp1700-hpijs.ppd"
+      Attribute "1284DeviceID" "" "MFG:HP;MDL:color inkjet cp1700;DES:color inkjet cp1700;"
+      PCFileName "hp-color_inkjet_cp1700-hpijs.ppd"
+       Attribute "Product" "" "(HP Color Inkjet cp1700 Printer)"
+       Attribute "Product" "" "(HP Color Inkjet cp1700ps Printer)"
+       Attribute "Product" "" "(HP Color Inkjet cp1700d Printer)"
--- a/hplip-3.11.12-mga-makefile-chgrp.patch
+++ b/hplip-3.11.12-mga-makefile-chgrp.patch
@ -0,0 +1,15 @@
+--- hplip-3.12.6/Makefile.am.chgrp	2012-06-18 12:44:13.000000000 +0200
+++ hplip-3.12.6/Makefile.am	2012-06-26 18:19:09.477241026 +0200
+@@ -543,12 +543,10 @@ endif
+ install-dist_hplip_LogDATA:
+ if FULL_BUILD
+ 	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
+-	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
+ 	chmod 774 $(DESTDIR)$(hplip_Logdir)
+ endif	#FULL_BUILD
+ if HPLIP_BUILD
+ 	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
+-	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
+ 	chmod 774 $(DESTDIR)$(hplip_Logdir)
+ endif	#FULL_BUILD
+ 
--- a/hplip-3.11.3-mdv-link.patch
+++ b/hplip-3.11.3-mdv-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-apply-udev-rules-on-action-change.patch
+++ b/hplip-apply-udev-rules-on-action-change.patch
@ -0,0 +1,42 @@
+--- hplip-3.12.6/data/rules/40-hplip.rules.udev~	2012-06-18 12:43:22.000000000 +0200
+++ hplip-3.12.6/data/rules/40-hplip.rules	2012-06-26 18:09:27.640268427 +0200
+@@ -4,7 +4,7 @@
+ # For older distros that use HAL ACL support use the 55-hpmud.rules. 
+ #
+ 
+-ACTION!="add", GOTO="hpmud_rules_end"
+ACTION=="remove", GOTO="hpmud_rules_end"
+ SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="pid_test"
+ SUBSYSTEM!="usb_device", GOTO="hpmud_rules_end"
+ 
+--- hplip-3.12.6/data/rules/55-hpmud.rules.udev~	2012-06-18 12:43:22.000000000 +0200
+++ hplip-3.12.6/data/rules/55-hpmud.rules	2012-06-26 18:09:27.640268427 +0200
+@@ -13,7 +13,7 @@
+ #      changes are not distro specific please send your patch to us. 2/11/2009, D Suffield
+ #
+ 
+-ACTION!="add", GOTO="hpmud_rules_end"
+ACTION=="remove", GOTO="hpmud_rules_end"
+ SUBSYSTEM=="ppdev", OWNER="root", GROUP="lp", MODE="0660"
+ SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="hplip_pid_test"
+ SUBSYSTEM!="usb_device", GOTO="hpmud_rules_end"
+--- hplip-3.12.6/data/rules/56-hpmud_support.rules.udev~	2012-06-18 12:43:22.000000000 +0200
+++ hplip-3.12.6/data/rules/56-hpmud_support.rules	2012-06-26 18:09:27.640268427 +0200
+@@ -1,6 +1,6 @@
+ # HPLIP udev rules file. Notify console user if plugin support is required for this device.
+ 
+-ACTION!="add", GOTO="hpmud_rules_end"
+ACTION=="remove", GOTO="hpmud_rules_end"
+ SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="pid_test"
+ SUBSYSTEM!="usb_device", GOTO="hpmud_rules_end"
+ 
+--- hplip-3.12.6/data/rules/86-hpmud_plugin.rules.udev~	2012-06-18 12:43:22.000000000 +0200
+++ hplip-3.12.6/data/rules/86-hpmud_plugin.rules	2012-06-26 18:10:47.103264684 +0200
+@@ -1,6 +1,6 @@
+ # Load hp firmware for this printer.
+ 
+-ACTION!="add", GOTO="hpmud_rules_end"
+ACTION=="change", GOTO="hpmud_rules_end"
+ 
+ #Check and add printer for Suse 10.3 distro
+ # hp_Marvel_Device (These printer requires the plugin files. installling when device is detected)
--- a/hplip-fax-ppd.patch
+++ b/hplip-fax-ppd.patch
@ -0,0 +1,24 @@
+diff -up hplip-3.11.1/ui/setupform.py.fax-ppd hplip-3.11.1/ui/setupform.py
+--- hplip-3.11.1/ui/setupform.py.fax-ppd	2011-01-19 06:18:26.000000000 +0100
+++ hplip-3.11.1/ui/setupform.py	2011-01-24 12:00:48.000000000 +0100
+@@ -886,16 +886,16 @@ class SetupForm(SetupForm_base):
+         QApplication.setOverrideCursor(QApplication.waitCursor)
+ 
+         if self.mq.get('fax-type', FAX_TYPE_NONE) == FAX_TYPE_MARVELL:
+-            fax_ppd_name = "HP-Fax3-hplip" # Fixed width (2528 pixels) and 300dpi rendering
+            fax_ppd_name = "HP-Fax3-hpcups" # Fixed width (2528 pixels) and 300dpi rendering
+             nick = "HP Fax 3"
+         if self.mq.get('fax-type', FAX_TYPE_NONE) == FAX_TYPE_SOAP or self.mq.get('fax-type', FAX_TYPE_NONE) == FAX_TYPE_LEDMSOAP:
+-            fax_ppd_name = "HP-Fax2-hplip" # Fixed width (2528 pixels) and 300dpi rendering
+            fax_ppd_name = "HP-Fax2-hpcups" # Fixed width (2528 pixels) and 300dpi rendering
+             nick = "HP Fax 2"
+         if self.mq.get('fax-type', FAX_TYPE_NONE) == FAX_TYPE_LEDM:
+-            fax_ppd_name = "HP-Fax4-hplip" # Fixed width (1728 pixels) and 200dpi rendering
+            fax_ppd_name = "HP-Fax4-hpcups" # Fixed width (1728 pixels) and 200dpi rendering
+             nick = "HP Fax 4"
+         else:
+-            fax_ppd_name = "HP-Fax-hplip" # Standard
+            fax_ppd_name = "HP-Fax-hpcups" # Standard
+             nick = "HP Fax"
+ 
+         ppds = []
--- a/hplip-hpaio-localonly.patch
+++ b/hplip-hpaio-localonly.patch
@ -0,0 +1,45 @@
+diff -up hplip-3.11.10/scan/sane/hpaio.c~ hplip-3.11.10/scan/sane/hpaio.c
+--- hplip-3.11.10/scan/sane/hpaio.c~	2011-10-02 04:04:48.000000000 +0100
+++ hplip-3.11.10/scan/sane/hpaio.c	2011-10-20 16:00:38.016534755 +0100
+@@ -272,25 +272,28 @@ static int DevDiscovery(int localOnly)
+       }
+    }
+ 
+-   /* Ignore localOnly flag (used by saned) and always look for network all-in-one scan devices (defined by cups). */
+-   cnt = GetCupsPrinters(&cups_printer);
+-   for (i=0; i<cnt; i++)
+   /* Check localOnly flag (used by saned) to decide whether to look for network all-in-one scan devices (defined by cups). */
+   if (!localOnly)
+    {
+-      hpmud_query_model(cups_printer[i], &ma);
+-      if (ma.scantype > 0)
+-      {
+     cnt = GetCupsPrinters(&cups_printer);
+     for (i=0; i<cnt; i++)
+     {
+       hpmud_query_model(cups_printer[i], &ma);
+       if (ma.scantype > 0)
+       {
+          hpmud_get_uri_model(cups_printer[i], model, sizeof(model));
+          AddDeviceList(cups_printer[i], model, &DeviceList);
+          total++;
+-      }
+-      else
+-      {
+       }
+       else
+       {
+          DBG(6,"unsupported scantype=%d %s\n", ma.scantype, cups_printer[i]);
+-      }
+-      free(cups_printer[i]);
+       }
+       free(cups_printer[i]);
+     }
+     if (cups_printer)
+       free(cups_printer);
+    }
+-   if (cups_printer)
+-      free(cups_printer);
+ 
+ bugout:
+    return total;
--- a/hplip-ppd-ImageableArea.patch
+++ b/hplip-ppd-ImageableArea.patch
@ -0,0 +1,459 @@
+diff -up hplip-3.10.5/prnt/ps/hp-laserjet_8150_mfp-ps.ppd.ImageableArea hplip-3.10.5/prnt/ps/hp-laserjet_8150_mfp-ps.ppd
+--- hplip-3.10.5/prnt/ps/hp-laserjet_8150_mfp-ps.ppd.ImageableArea	2010-05-13 01:48:11.000000000 +0200
+++ hplip-3.10.5/prnt/ps/hp-laserjet_8150_mfp-ps.ppd	2010-06-03 17:01:33.000000000 +0200
+@@ -4977,7 +4977,7 @@ restore
+ *CloseUI: *PageRegion
+ 
+ *DefaultImageableArea: Letter
+-*ImageableArea Letter/Letter:							"4.00 3.00 606.00 786.00"
+*ImageableArea Letter/Letter: "12.00 12.00 599.76 779.76"
+ *da.ImageableArea Letter/Letter: ""
+ *de.ImageableArea Letter/Letter: ""
+ *es.ImageableArea Letter/Letter: ""
+@@ -5009,7 +5009,7 @@ restore
+ *zh_CN.ImageableArea LetterSmall/信纸 (小): ""
+ *zh_TW.ImageableArea LetterSmall/Letter (小): ""
+ 
+-*ImageableArea Executive/Executive:						"3.00 3.00 516.00 750.00"
+*ImageableArea Executive/Executive: "12.00 12.00 509.76 743.76"
+ *da.ImageableArea Executive/Executive: ""
+ *de.ImageableArea Executive/Executive: ""
+ *es.ImageableArea Executive/Exec: ""
+@@ -5025,7 +5025,7 @@ restore
+ *zh_CN.ImageableArea Executive/Executive: ""
+ *zh_TW.ImageableArea Executive/Executive: ""
+ 
+-*ImageableArea Legal/Legal:								"64.00 54.00 606.00 1002.00"
+*ImageableArea Legal/Legal: "12.00 12.00 599.76 995.76"
+ *da.ImageableArea Legal/Legal: ""
+ *de.ImageableArea Legal/Legal: ""
+ *es.ImageableArea Legal/Legal: ""
+@@ -5041,7 +5041,7 @@ restore
+ *zh_CN.ImageableArea Legal/Legal: ""
+ *zh_TW.ImageableArea Legal/Legal: ""
+ 
+-*ImageableArea LegalSmall/Legal (Small):				"3.00 3.00 548.00 954.00"
+*ImageableArea LegalSmall/Legal (Small): "64.00 54.00 548.00 954.00"
+ *da.ImageableArea LegalSmall/Legal (lille): ""
+ *de.ImageableArea LegalSmall/Legal (Klein): ""
+ *es.ImageableArea LegalSmall/Legal (pequeño): ""
+@@ -5057,7 +5057,7 @@ restore
+ *zh_CN.ImageableArea LegalSmall/Legal (小): ""
+ *zh_TW.ImageableArea LegalSmall/Legal (小): ""
+ 
+-*ImageableArea Tabloid/11x17:							"3.00 3.00 786.00 1218.00"
+*ImageableArea Tabloid/11x17: "12.00 12.00 779.76 1211.76"
+ *da.ImageableArea Tabloid/11x17: ""
+ *de.ImageableArea Tabloid/11x17 Zoll: ""
+ *es.ImageableArea Tabloid/11x17: ""
+@@ -5073,7 +5073,7 @@ restore
+ *zh_CN.ImageableArea Tabloid/11x17: ""
+ *zh_TW.ImageableArea Tabloid/11x17 : ""
+ 
+-*ImageableArea w842h1274/11x17 (Oversize 11.7x17.7):	"3.00 3.00 836.00 1268.00"
+*ImageableArea w842h1274/11x17 (Oversize 11.7x17.7): "12.00 12.00 829.68 1261.68"
+ *da.ImageableArea w842h1274/11x17 (overstr.  297 x 450 mm): ""
+ *de.ImageableArea w842h1274/11x17 Zoll (Übergröße 11,7x17,7 Zoll): ""
+ *es.ImageableArea w842h1274/11x17 (Extra 11,7x17,7) : ""
+@@ -5089,7 +5089,7 @@ restore
+ *zh_CN.ImageableArea w842h1274/11x17 (超大尺寸 11.7x17.7): ""
+ *zh_TW.ImageableArea w842h1274/11x17  (Oversize 11.7x17.7): ""
+ 
+-*ImageableArea A3/A3:									"3.00 3.00 836.00 1185.00"
+*ImageableArea A3/A3: "12.00 12.00 829.44 1178.16"
+ *da.ImageableArea A3/A3: ""
+ *de.ImageableArea A3/A3: ""
+ *es.ImageableArea A3/A3: ""
+@@ -5105,7 +5105,7 @@ restore
+ *zh_CN.ImageableArea A3/A3: ""
+ *zh_TW.ImageableArea A3/A3: ""
+ 
+-*ImageableArea A4/A4:									"4.00 3.00 586.00 836.00"
+*ImageableArea A4/A4: "12.00 12.00 582.96 829.44"
+ *da.ImageableArea A4/A4: ""
+ *de.ImageableArea A4/A4: ""
+ *es.ImageableArea A4/A4: ""
+@@ -5137,7 +5137,7 @@ restore
+ *zh_CN.ImageableArea A4Small/A4 (小): ""
+ *zh_TW.ImageableArea A4Small/A4 (小): ""
+ 
+-*ImageableArea A5/A5:									"3.00 3.00 414.00 589.00"
+*ImageableArea A5/A5: "12.00 12.00 407.28 582.96"
+ *da.ImageableArea A5/A5: ""
+ *de.ImageableArea A5/A5: ""
+ *es.ImageableArea A5/A5: ""
+@@ -5153,7 +5153,7 @@ restore
+ *zh_CN.ImageableArea A5/A5: ""
+ *zh_TW.ImageableArea A5/A5: ""
+ 
+-*ImageableArea B4/JIS B4:								"3.00 3.00 723.00 1026.00"
+*ImageableArea B4/JIS B4: "12.00 12.00 716.16 1019.52"
+ *da.ImageableArea B4/JIS B4: ""
+ *de.ImageableArea B4/B4 (JIS): ""
+ *es.ImageableArea B4/JIS B4: ""
+@@ -5169,7 +5169,7 @@ restore
+ *zh_CN.ImageableArea B4/JIS B4: ""
+ *zh_TW.ImageableArea B4/JIS B4: ""
+ 
+-*ImageableArea B5/JIS B5:								"3.00 3.00 510.00 723.00"
+*ImageableArea B5/JIS B5: "12.00 12.00 503.52 716.16"
+ *da.ImageableArea B5/JIS B5: ""
+ *de.ImageableArea B5/JIS B5: ""
+ *es.ImageableArea B5/JIS B5: ""
+@@ -5185,7 +5185,7 @@ restore
+ *zh_CN.ImageableArea B5/JIS B5: ""
+ *zh_TW.ImageableArea B5/JIS B5: ""
+ 
+-*ImageableArea DoublePostcard/Double Postcard (JIS):	"3.00 3.00 413.50 561.00"
+*ImageableArea DoublePostcard/Double Postcard (JIS): "12.00 12.00 407.28 554.64"
+ *da.ImageableArea DoublePostcard/Dobbelt postkort (JIS): ""
+ *de.ImageableArea DoublePostcard/Doppelte Postkarte (JIS): ""
+ *es.ImageableArea DoublePostcard/Tarjeta postal doble (JIS): ""
+@@ -5201,7 +5201,7 @@ restore
+ *zh_CN.ImageableArea DoublePostcard/大号明信片 (JIS): ""
+ *zh_TW.ImageableArea DoublePostcard/雙聯明信片(JIS): ""
+ 
+-*ImageableArea w612h935/Executive (JIS):				"3.00 3.00 606.00 929.00"
+*ImageableArea w612h935/Executive (JIS): "12.00 12.00 599.76 922.76"
+ *da.ImageableArea w612h935/Executive (JIS): ""
+ *de.ImageableArea w612h935/Executive (JIS): ""
+ *es.ImageableArea w612h935/Exec (JIS): ""
+@@ -5217,7 +5217,7 @@ restore
+ *zh_CN.ImageableArea w612h935/Executive (JIS): ""
+ *zh_TW.ImageableArea w612h935/Executive (JIS): ""
+ 
+-*ImageableArea w558h774/16K:							"3.00 3.00 552.00 768.00"
+*ImageableArea w558h774/16K: "12.00 12.00 545.76 761.76"
+ *da.ImageableArea w558h774/16K: ""
+ *de.ImageableArea w558h774/16K: ""
+ *es.ImageableArea w558h774/16K: ""
+@@ -5233,7 +5233,7 @@ restore
+ *zh_CN.ImageableArea w558h774/16K: ""
+ *zh_TW.ImageableArea w558h774/16K: ""
+ 
+-*ImageableArea w774h1116/8K:							"3.00 3.00 768.00 1110.00"
+*ImageableArea w774h1116/8K: "12.00 12.00 761.76 1103.76"
+ *da.ImageableArea w774h1116/8K: ""
+ *de.ImageableArea w774h1116/8K: ""
+ *es.ImageableArea w774h1116/8K: ""
+@@ -5249,7 +5249,7 @@ restore
+ *zh_CN.ImageableArea w774h1116/8K: ""
+ *zh_TW.ImageableArea w774h1116/8K: ""
+ 
+-*ImageableArea Env10/Env Comm10:						"3.00 3.00 291.00 678.00"
+*ImageableArea Env10/Env Comm10: "12.00 12.00 284.64 671.76"
+ *da.ImageableArea Env10/Konvolut Comm10: ""
+ *de.ImageableArea Env10/Umschlag Comm10: ""
+ *es.ImageableArea Env10/Sobre Comm10: ""
+@@ -5265,7 +5265,7 @@ restore
+ *zh_CN.ImageableArea Env10/Comm10号信封: ""
+ *zh_TW.ImageableArea Env10/Comm10 信封: ""
+ 
+-*ImageableArea EnvMonarch/Env Monarch:					"3.00 3.00 273.00 534.00"
+*ImageableArea EnvMonarch/Env Monarch: "12.00 12.00 266.64 527.76"
+ *da.ImageableArea EnvMonarch/Konvolut Monarch: ""
+ *de.ImageableArea EnvMonarch/Umschlag Monarch: ""
+ *es.ImageableArea EnvMonarch/Sobre Monarch: ""
+@@ -5281,7 +5281,7 @@ restore
+ *zh_CN.ImageableArea EnvMonarch/Monarch号信封: ""
+ *zh_TW.ImageableArea EnvMonarch/Monarch 信封: ""
+ 
+-*ImageableArea EnvDL/Env DL:							"3.00 3.00 306.00 618.00"
+*ImageableArea EnvDL/Env DL: "12.00 12.00 299.52 611.28"
+ *da.ImageableArea EnvDL/Konvolut DL: ""
+ *de.ImageableArea EnvDL/Umschlag DL: ""
+ *es.ImageableArea EnvDL/Sobre DL: ""
+@@ -5297,7 +5297,7 @@ restore
+ *zh_CN.ImageableArea EnvDL/DL号信封: ""
+ *zh_TW.ImageableArea EnvDL/DL 信封: ""
+ 
+-*ImageableArea EnvC5/Env C5:							"3.00 3.00 453.00 643.00"
+*ImageableArea EnvC5/Env C5: "12.00 12.00 446.88 636.72"
+ *da.ImageableArea EnvC5/Konvolut C5: ""
+ *de.ImageableArea EnvC5/Umschlag C5: ""
+ *es.ImageableArea EnvC5/Sobre C5: ""
+@@ -5313,7 +5313,7 @@ restore
+ *zh_CN.ImageableArea EnvC5/C5号信封: ""
+ *zh_TW.ImageableArea EnvC5/C5 信封: ""
+ 
+-*ImageableArea EnvISOB5/Env ISO B5:						"3.00 3.00 493.00 703.00"
+*ImageableArea EnvISOB5/Env ISO B5: "12.00 12.00 486.48 696.24"
+ *da.ImageableArea EnvISOB5/Konvolut ISO B5: ""
+ *de.ImageableArea EnvISOB5/Umschlag ISO B5: ""
+ *es.ImageableArea EnvISOB5/Sobre ISO B5: ""
+diff -up hplip-3.10.5/prnt/ps/hp-laserjet_9000_mfp-ps.ppd.ImageableArea hplip-3.10.5/prnt/ps/hp-laserjet_9000_mfp-ps.ppd
+--- hplip-3.10.5/prnt/ps/hp-laserjet_9000_mfp-ps.ppd.ImageableArea	2010-05-13 01:48:11.000000000 +0200
+++ hplip-3.10.5/prnt/ps/hp-laserjet_9000_mfp-ps.ppd	2010-06-03 17:01:32.000000000 +0200
+@@ -4344,7 +4344,7 @@ currentpagedevice /MediaProcessing known
+ *CloseUI: *PageRegion
+ 
+ *DefaultImageableArea: Letter
+-*ImageableArea Letter/Letter:							"6.00 6.00 606.00 786.00"
+*ImageableArea Letter/Letter: "12.00 12.00 599.76 779.76"
+ *da.ImageableArea Letter/Letter: ""
+ *de.ImageableArea Letter/Letter: ""
+ *es.ImageableArea Letter/Letter: ""
+@@ -4376,7 +4376,7 @@ currentpagedevice /MediaProcessing known
+ *zh_CN.ImageableArea LetterSmall/信纸 (小): ""
+ *zh_TW.ImageableArea LetterSmall/Letter (小): ""
+ 
+-*ImageableArea Executive/Executive:						"6.00 6.00 516.00 750.00"
+*ImageableArea Executive/Executive: "12.00 12.00 509.76 743.76"
+ *da.ImageableArea Executive/Executive: ""
+ *de.ImageableArea Executive/Executive: ""
+ *es.ImageableArea Executive/Exec: ""
+@@ -4392,7 +4392,7 @@ currentpagedevice /MediaProcessing known
+ *zh_CN.ImageableArea Executive/Executive: ""
+ *zh_TW.ImageableArea Executive/Executive: ""
+ 
+-*ImageableArea Legal/Legal:								"6.00 6.00 606.00 1002.00"
+*ImageableArea Legal/Legal: "12.00 12.00 599.76 995.76"
+ *da.ImageableArea Legal/Legal: ""
+ *de.ImageableArea Legal/Legal: ""
+ *es.ImageableArea Legal/Legal: ""
+@@ -4424,7 +4424,7 @@ currentpagedevice /MediaProcessing known
+ *zh_CN.ImageableArea LegalSmall/Legal (小): ""
+ *zh_TW.ImageableArea LegalSmall/Legal (小): ""
+ 
+-*ImageableArea Tabloid/11x17:							"6.00 6.00 786.00 1218.00"
+*ImageableArea Tabloid/11x17: "12.00 12.00 779.76 1211.76"
+ *da.ImageableArea Tabloid/11x17: ""
+ *de.ImageableArea Tabloid/11x17 Zoll: ""
+ *es.ImageableArea Tabloid/11x17: ""
+@@ -4440,7 +4440,7 @@ currentpagedevice /MediaProcessing known
+ *zh_CN.ImageableArea Tabloid/11x17: ""
+ *zh_TW.ImageableArea Tabloid/11x17 : ""
+ 
+-*ImageableArea w842h1274/11x17 (Oversize 11.7x17.7):	"6.00 6.00 836.00 1268.00"
+*ImageableArea w842h1274/11x17 (Oversize 11.7x17.7): "12.00 12.00 829.68 1261.68"
+ *da.ImageableArea w842h1274/11x17 (overstr.  297 x 450 mm): ""
+ *de.ImageableArea w842h1274/11x17 Zoll (Übergröße 11,7x17,7 Zoll): ""
+ *es.ImageableArea w842h1274/11x17 (Extra 11,7x17,7) : ""
+@@ -4456,7 +4456,7 @@ currentpagedevice /MediaProcessing known
+ *zh_CN.ImageableArea w842h1274/11x17 (超大尺寸 11.7x17.7): ""
+ *zh_TW.ImageableArea w842h1274/11x17  (Oversize 11.7x17.7): ""
+ 
+-*ImageableArea A3/A3:									"6.00 6.00 836.00 1185.00"
+*ImageableArea A3/A3: "12.00 12.00 829.44 1178.16"
+ *da.ImageableArea A3/A3: ""
+ *de.ImageableArea A3/A3: ""
+ *es.ImageableArea A3/A3: ""
+@@ -4472,7 +4472,7 @@ currentpagedevice /MediaProcessing known
+ *zh_CN.ImageableArea A3/A3: ""
+ *zh_TW.ImageableArea A3/A3: ""
+ 
+-*ImageableArea A4/A4:									"6.00 6.00 589.00 836.00"
+*ImageableArea A4/A4: "12.00 12.00 582.96 829.44"
+ *da.ImageableArea A4/A4: ""
+ *de.ImageableArea A4/A4: ""
+ *es.ImageableArea A4/A4: ""
+@@ -4504,7 +4504,7 @@ currentpagedevice /MediaProcessing known
+ *zh_CN.ImageableArea A4Small/A4 (小): ""
+ *zh_TW.ImageableArea A4Small/A4 (小): ""
+ 
+-*ImageableArea A5/A5:									"6.00 6.00 414.00 589.00"
+*ImageableArea A5/A5: "12.00 12.00 407.28 582.96"
+ *da.ImageableArea A5/A5: ""
+ *de.ImageableArea A5/A5: ""
+ *es.ImageableArea A5/A5: ""
+@@ -4520,7 +4520,7 @@ currentpagedevice /MediaProcessing known
+ *zh_CN.ImageableArea A5/A5: ""
+ *zh_TW.ImageableArea A5/A5: ""
+ 
+-*ImageableArea B4/JIS B4:								"6.00 6.00 723.00 1026.00"
+*ImageableArea B4/JIS B4: "12.00 12.00 716.16 1019.52"
+ *da.ImageableArea B4/JIS B4: ""
+ *de.ImageableArea B4/B4 (JIS): ""
+ *es.ImageableArea B4/JIS B4: ""
+@@ -4536,7 +4536,7 @@ currentpagedevice /MediaProcessing known
+ *zh_CN.ImageableArea B4/JIS B4: ""
+ *zh_TW.ImageableArea B4/JIS B4: ""
+ 
+-*ImageableArea B5/JIS B5:								"6.00 6.00 510.00 723.00"
+*ImageableArea B5/JIS B5: "12.00 12.00 503.52 716.16"
+ *da.ImageableArea B5/JIS B5: ""
+ *de.ImageableArea B5/JIS B5: ""
+ *es.ImageableArea B5/JIS B5: ""
+@@ -4552,7 +4552,7 @@ currentpagedevice /MediaProcessing known
+ *zh_CN.ImageableArea B5/JIS B5: ""
+ *zh_TW.ImageableArea B5/JIS B5: ""
+ 
+-*ImageableArea DoublePostcard/Double Postcard (JIS):	"6.00 6.00 413.50 561.00"
+*ImageableArea DoublePostcard/Double Postcard (JIS): "12.00 12.00 407.28 554.64"
+ *da.ImageableArea DoublePostcard/Dobbelt postkort (JIS): ""
+ *de.ImageableArea DoublePostcard/Doppelte Postkarte (JIS): ""
+ *es.ImageableArea DoublePostcard/Tarjeta postal doble (JIS): ""
+@@ -4568,7 +4568,7 @@ currentpagedevice /MediaProcessing known
+ *zh_CN.ImageableArea DoublePostcard/大号明信片 (JIS): ""
+ *zh_TW.ImageableArea DoublePostcard/雙聯明信片(JIS): ""
+ 
+-*ImageableArea w612h935/Executive (JIS):				"6.00 6.00 606.00 929.00"
+*ImageableArea w612h935/Executive (JIS): "12.00 12.00 599.76 922.76"
+ *da.ImageableArea w612h935/Executive (JIS): ""
+ *de.ImageableArea w612h935/Executive (JIS): ""
+ *es.ImageableArea w612h935/Exec (JIS): ""
+@@ -4584,7 +4584,7 @@ currentpagedevice /MediaProcessing known
+ *zh_CN.ImageableArea w612h935/Executive (JIS): ""
+ *zh_TW.ImageableArea w612h935/Executive (JIS): ""
+ 
+-*ImageableArea w558h774/16K:							"6.00 6.00 552.00 768.00"
+*ImageableArea w558h774/16K: "12.00 12.00 545.76 761.76"
+ *da.ImageableArea w558h774/16K: ""
+ *de.ImageableArea w558h774/16K: ""
+ *es.ImageableArea w558h774/16K: ""
+@@ -4600,7 +4600,7 @@ currentpagedevice /MediaProcessing known
+ *zh_CN.ImageableArea w558h774/16K: ""
+ *zh_TW.ImageableArea w558h774/16K: ""
+ 
+-*ImageableArea w774h1116/8K:							"6.00 6.00 768.00 1110.00"
+*ImageableArea w774h1116/8K: "12.00 12.00 761.76 1103.76"
+ *da.ImageableArea w774h1116/8K: ""
+ *de.ImageableArea w774h1116/8K: ""
+ *es.ImageableArea w774h1116/8K: ""
+@@ -4616,7 +4616,7 @@ currentpagedevice /MediaProcessing known
+ *zh_CN.ImageableArea w774h1116/8K: ""
+ *zh_TW.ImageableArea w774h1116/8K: ""
+ 
+-*ImageableArea Env10/Env Comm10:						"11.00 11.00 286.00 673.00"
+*ImageableArea Env10/Env Comm10: "12.00 12.00 284.64 671.76"
+ *da.ImageableArea Env10/Konvolut Comm10: ""
+ *de.ImageableArea Env10/Umschlag Comm10: ""
+ *es.ImageableArea Env10/Sobre Comm10: ""
+diff -up hplip-3.10.5/prnt/ps/hp-laserjet_9000_series-ps.ppd.ImageableArea hplip-3.10.5/prnt/ps/hp-laserjet_9000_series-ps.ppd
+--- hplip-3.10.5/prnt/ps/hp-laserjet_9000_series-ps.ppd.ImageableArea	2010-05-13 01:48:11.000000000 +0200
+++ hplip-3.10.5/prnt/ps/hp-laserjet_9000_series-ps.ppd	2010-06-03 17:01:35.000000000 +0200
+@@ -5140,7 +5140,7 @@ currentpagedevice /MediaProcessing known
+ *CloseUI: *PageRegion
+ 
+ *DefaultImageableArea: Letter
+-*ImageableArea Letter/Letter:							"6.00 6.00 606.00 786.00"
+*ImageableArea Letter/Letter: "12.00 12.00 599.76 779.76"
+ *da.ImageableArea Letter/Letter: ""
+ *de.ImageableArea Letter/Letter: ""
+ *es.ImageableArea Letter/Letter: ""
+@@ -5172,7 +5172,7 @@ currentpagedevice /MediaProcessing known
+ *zh_CN.ImageableArea LetterSmall/信纸 (小): ""
+ *zh_TW.ImageableArea LetterSmall/Letter (小): ""
+ 
+-*ImageableArea Executive/Executive:						"6.00 6.00 516.00 750.00"
+*ImageableArea Executive/Executive: "12.00 12.00 509.76 743.76"
+ *da.ImageableArea Executive/Executive: ""
+ *de.ImageableArea Executive/Executive: ""
+ *es.ImageableArea Executive/Exec: ""
+@@ -5188,7 +5188,7 @@ currentpagedevice /MediaProcessing known
+ *zh_CN.ImageableArea Executive/Executive: ""
+ *zh_TW.ImageableArea Executive/Executive: ""
+ 
+-*ImageableArea Legal/Legal:								"6.00 6.00 606.00 1002.00"
+*ImageableArea Legal/Legal: "12.00 12.00 599.76 995.76"
+ *da.ImageableArea Legal/Legal: ""
+ *de.ImageableArea Legal/Legal: ""
+ *es.ImageableArea Legal/Legal: ""
+@@ -5220,7 +5220,7 @@ currentpagedevice /MediaProcessing known
+ *zh_CN.ImageableArea LegalSmall/Legal (小): ""
+ *zh_TW.ImageableArea LegalSmall/Legal (小): ""
+ 
+-*ImageableArea Tabloid/11x17:							"6.00 6.00 786.00 1218.00"
+*ImageableArea Tabloid/11x17: "12.00 12.00 779.76 1211.76"
+ *da.ImageableArea Tabloid/11x17: ""
+ *de.ImageableArea Tabloid/11x17 Zoll: ""
+ *es.ImageableArea Tabloid/11x17: ""
+@@ -5236,7 +5236,7 @@ currentpagedevice /MediaProcessing known
+ *zh_CN.ImageableArea Tabloid/11x17: ""
+ *zh_TW.ImageableArea Tabloid/11x17 : ""
+ 
+-*ImageableArea w842h1274/11x17 (Oversize 11.7x17.7):	"6.00 6.00 836.00 1268.00"
+*ImageableArea w842h1274/11x17 (Oversize 11.7x17.7): "12.00 12.00 829.68 1261.68"
+ *da.ImageableArea w842h1274/11x17 (overstr.  297 x 450 mm): ""
+ *de.ImageableArea w842h1274/11x17 Zoll (Übergröße 11,7x17,7 Zoll): ""
+ *es.ImageableArea w842h1274/11x17 (Extra 11,7x17,7) : ""
+@@ -5252,7 +5252,7 @@ currentpagedevice /MediaProcessing known
+ *zh_CN.ImageableArea w842h1274/11x17 (超大尺寸 11.7x17.7): ""
+ *zh_TW.ImageableArea w842h1274/11x17  (Oversize 11.7x17.7): ""
+ 
+-*ImageableArea A3/A3:									"6.00 6.00 836.00 1185.00"
+*ImageableArea A3/A3: "12.00 12.00 829.44 1178.16"
+ *da.ImageableArea A3/A3: ""
+ *de.ImageableArea A3/A3: ""
+ *es.ImageableArea A3/A3: ""
+@@ -5268,7 +5268,7 @@ currentpagedevice /MediaProcessing known
+ *zh_CN.ImageableArea A3/A3: ""
+ *zh_TW.ImageableArea A3/A3: ""
+ 
+-*ImageableArea A4/A4:									"6.00 6.00 589.00 836.00"
+*ImageableArea A4/A4: "12.00 12.00 582.96 829.44"
+ *da.ImageableArea A4/A4: ""
+ *de.ImageableArea A4/A4: ""
+ *es.ImageableArea A4/A4: ""
+@@ -5300,7 +5300,7 @@ currentpagedevice /MediaProcessing known
+ *zh_CN.ImageableArea A4Small/A4 (小): ""
+ *zh_TW.ImageableArea A4Small/A4 (小): ""
+ 
+-*ImageableArea A5/A5:									"6.00 6.00 414.00 589.00"
+*ImageableArea A5/A5: "12.00 12.00 407.28 582.96"
+ *da.ImageableArea A5/A5: ""
+ *de.ImageableArea A5/A5: ""
+ *es.ImageableArea A5/A5: ""
+@@ -5316,7 +5316,7 @@ currentpagedevice /MediaProcessing known
+ *zh_CN.ImageableArea A5/A5: ""
+ *zh_TW.ImageableArea A5/A5: ""
+ 
+-*ImageableArea B4/JIS B4:								"6.00 6.00 723.00 1026.00"
+*ImageableArea B4/JIS B4: "12.00 12.00 716.16 1019.52"
+ *da.ImageableArea B4/JIS B4: ""
+ *de.ImageableArea B4/B4 (JIS): ""
+ *es.ImageableArea B4/JIS B4: ""
+@@ -5332,7 +5332,7 @@ currentpagedevice /MediaProcessing known
+ *zh_CN.ImageableArea B4/JIS B4: ""
+ *zh_TW.ImageableArea B4/JIS B4: ""
+ 
+-*ImageableArea B5/JIS B5:								"6.00 6.00 510.00 723.00"
+*ImageableArea B5/JIS B5: "12.00 12.00 503.52 716.16"
+ *da.ImageableArea B5/JIS B5: ""
+ *de.ImageableArea B5/JIS B5: ""
+ *es.ImageableArea B5/JIS B5: ""
+@@ -5348,7 +5348,7 @@ currentpagedevice /MediaProcessing known
+ *zh_CN.ImageableArea B5/JIS B5: ""
+ *zh_TW.ImageableArea B5/JIS B5: ""
+ 
+-*ImageableArea DoublePostcard/Double Postcard (JIS):	"6.00 6.00 413.50 561.00"
+*ImageableArea DoublePostcard/Double Postcard (JIS): "12.00 12.00 407.28 554.64"
+ *da.ImageableArea DoublePostcard/Dobbelt postkort (JIS): ""
+ *de.ImageableArea DoublePostcard/Doppelte Postkarte (JIS): ""
+ *es.ImageableArea DoublePostcard/Tarjeta postal doble (JIS): ""
+@@ -5364,7 +5364,7 @@ currentpagedevice /MediaProcessing known
+ *zh_CN.ImageableArea DoublePostcard/大号明信片 (JIS): ""
+ *zh_TW.ImageableArea DoublePostcard/雙聯明信片(JIS): ""
+ 
+-*ImageableArea w612h935/Executive (JIS):				"6.00 6.00 606.00 929.00"
+*ImageableArea w612h935/Executive (JIS): "12.00 12.00 599.76 922.76"
+ *da.ImageableArea w612h935/Executive (JIS): ""
+ *de.ImageableArea w612h935/Executive (JIS): ""
+ *es.ImageableArea w612h935/Exec (JIS): ""
+@@ -5380,7 +5380,7 @@ currentpagedevice /MediaProcessing known
+ *zh_CN.ImageableArea w612h935/Executive (JIS): ""
+ *zh_TW.ImageableArea w612h935/Executive (JIS): ""
+ 
+-*ImageableArea w558h774/16K:							"6.00 6.00 552.00 768.00"
+*ImageableArea w558h774/16K: "12.00 12.00 545.76 761.76"
+ *da.ImageableArea w558h774/16K: ""
+ *de.ImageableArea w558h774/16K: ""
+ *es.ImageableArea w558h774/16K: ""
+@@ -5396,7 +5396,7 @@ currentpagedevice /MediaProcessing known
+ *zh_CN.ImageableArea w558h774/16K: ""
+ *zh_TW.ImageableArea w558h774/16K: ""
+ 
+-*ImageableArea w774h1116/8K:							"6.00 6.00 768.00 1110.00"
+*ImageableArea w774h1116/8K: "12.00 12.00 761.76 1103.76"
+ *da.ImageableArea w774h1116/8K: ""
+ *de.ImageableArea w774h1116/8K: ""
+ *es.ImageableArea w774h1116/8K: ""
+@@ -5412,7 +5412,7 @@ currentpagedevice /MediaProcessing known
+ *zh_CN.ImageableArea w774h1116/8K: ""
+ *zh_TW.ImageableArea w774h1116/8K: ""
+ 
+-*ImageableArea Env10/Env Comm10:						"11.00 11.00 286.00 673.00"
+*ImageableArea Env10/Env Comm10: "12.00 12.00 284.64 671.76"
+ *da.ImageableArea Env10/Konvolut Comm10: ""
+ *de.ImageableArea Env10/Umschlag Comm10: ""
+ *es.ImageableArea Env10/Sobre Comm10: ""
--- a/hplip-snmp-quirks.patch
+++ b/hplip-snmp-quirks.patch
@ -0,0 +1,20 @@
+--- hplip-3.12.6/prnt/drv/hpcups.drv.in.snmp-quirks	2012-06-18 12:44:26.000000000 +0200
+++ hplip-3.12.6/prnt/drv/hpcups.drv.in	2012-06-26 18:14:40.661253685 +0200
+@@ -6653,6 +6653,8 @@ Manufacturer "HP"
+       Attribute "NickName" "" "HP Officejet Pro 8500 a909a, $Version"
+       Attribute "ShortNickName" "" "HP Officejet Pro 8500 a909a"
+       Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 8500 a909a;DES:officejet pro 8500 a909a;"
+      // This device lies about its supplies capacity.
+      Attribute "cupsSNMPQuirks" "" "capacity"
+       PCFileName "hp-officejet_pro_8500_a909a.ppd"
+       Attribute "Product" "" "(HP Officejet Pro 8500 All-in-one Printer - a909a)"
+     }
+@@ -6669,6 +6671,8 @@ Manufacturer "HP"
+       Attribute "NickName" "" "HP Officejet Pro 8500 a909g, $Version"
+       Attribute "ShortNickName" "" "HP Officejet Pro 8500 a909g"
+       Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 8500 a909g;DES:officejet pro 8500 a909g;"
+      // This device lies about its supplies capacity.
+      Attribute "cupsSNMPQuirks" "" "capacity"
+       PCFileName "hp-officejet_pro_8500_a909g.ppd"
+       Attribute "Product" "" "(HP Officejet Pro 8500 Wireless All-in-one Printer - a909g)"
+     }
--- a/hplip-syslog-fix-debug-messages-to-error.dpatch
+++ b/hplip-syslog-fix-debug-messages-to-error.dpatch
@ -0,0 +1,13 @@
+Index: hplip-3.11.12/prnt/hpcups/CommonDefinitions.h
+===================================================================
+--- hplip-3.11.12/prnt/hpcups/CommonDefinitions.h
+++ hplip-3.11.12/prnt/hpcups/CommonDefinitions.h	2011-12-20 13:32:00.990358274 +0100
+@@ -68,7 +68,7 @@
+ #define _STRINGIZE(x) #x
+ #define STRINGIZE(x) _STRINGIZE(x)
+ 
+-#define dbglog(args...) {syslog(LOG_ERR, __FILE__ " " STRINGIZE(__LINE__) ": " args); \
+#define dbglog(args...) {syslog(LOG_DEBUG, __FILE__ " " STRINGIZE(__LINE__) ": " args); \
+ fprintf(stderr, __FILE__ " " STRINGIZE(__LINE__) ": " args);}
+ 
+ 
--- a/hplip-wifisetup.patch
+++ b/hplip-wifisetup.patch
@ -0,0 +1,12 @@
+diff -up hplip-3.11.1/ui4/wifisetupdialog.py.wifisetup hplip-3.11.1/ui4/wifisetupdialog.py
+--- hplip-3.11.1/ui4/wifisetupdialog.py.wifisetup	2011-01-19 06:18:20.000000000 +0100
+++ hplip-3.11.1/ui4/wifisetupdialog.py	2011-03-01 15:39:02.000000000 +0100
+@@ -301,7 +301,7 @@ class WifiSetupDialog(QDialog, Ui_Dialog
+             self.dev.close()
+             endWaitCursor()
+ 
+-        self.num_networks = self.networks['numberofscanentries']
+        self.num_networks = self.networks.get('numberofscanentries')
+         self.clearNetworksTable()
+ 
+         if self.num_networks:
--- a/make-commafy-correctly-work-with-python-2.dpatch
+++ b/make-commafy-correctly-work-with-python-2.dpatch
@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## make-commafy-correctly-work-with-python-2.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.10.2~/base/utils.py hplip-3.10.2/base/utils.py
+--- hplip-3.10.2~/base/utils.py	2010-04-09 21:20:22.085486637 +0200
+++ hplip-3.10.2/base/utils.py	2010-04-09 21:22:19.865465070 +0200
+@@ -362,7 +362,7 @@
+ 
+ 
+ def commafy(val):
+-    return unicode(locale.format("%d", val, grouping=True))
+    return locale.format("%d", val, grouping=True).decode(locale.getpreferredencoding())
+ 
+ 
+ def format_bytes(s, show_bytes=False):
--- a/mga-kde4-kdesudo-support.dpatch
+++ b/mga-kde4-kdesudo-support.dpatch
@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## kde4-kdesudo-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.4b~/base/utils.py hplip-3.9.4b/base/utils.py
+--- hplip-3.9.4b~/base/utils.py	2009-04-29 22:39:01.000000000 +0200
+++ hplip-3.9.4b/base/utils.py	2009-05-16 00:06:50.000000000 +0200
+@@ -1572,6 +1572,15 @@
+     if which('kdesu'):
+         su_sudo_str = 'kdesu -- %s'
+ 
+    elif utils.which('/usr/lib/kde4/libexec/kdesu'):
+        su_sudo_str = '/usr/lib/kde4/libexec/kdesu -- %s'
+
+    elif utils.which('/usr/lib64/kde4/libexec/kdesu'):
+        su_sudo_str = '/usr/lib/kde4/libexec/kdesu -- %s'
+
+    elif utils.which('kdesudo'):
+        su_sudo_str = 'kdesudo -- %s'
+
+     elif which('gnomesu'):
+         su_sudo_str = 'gnomesu -c "%s"'
+ 
--- a/simple-scan-as-default.dpatch
+++ b/simple-scan-as-default.dpatch
@ -0,0 +1,51 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## simple-scan-as-default.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.10.2~/base/utils.py hplip-3.10.2/base/utils.py
+--- hplip-3.10.2~/base/utils.py	2010-02-25 00:07:40.000000000 +0100
+++ hplip-3.10.2/base/utils.py	2010-03-24 09:05:57.660740026 +0100
+@@ -450,18 +450,21 @@
+ 
+         # Scan
+         self.cmd_scan = ''
+-        path = which('xsane')
+-
+        path = which('simple-scan')
+         if len(path) > 0:
+-            self.cmd_scan = 'xsane -V %SANE_URI%'
+            self.cmd_scan = 'simple-scan %SANE_URI%'
+         else:
+-            path = which('kooka')
+            path = which('xsane')
+             if len(path) > 0:
+-                self.cmd_scan = 'kooka'
+                self.cmd_scan = 'xsane -V %SANE_URI%'
+             else:
+-                path = which('xscanimage')
+                path = which('kooka')
+                 if len(path) > 0:
+-                    self.cmd_scan = 'xscanimage'
+                    self.cmd_scan = 'kooka'
+                else:
+                    path = which('xscanimage')
+                    if len(path) > 0:
+                        self.cmd_scan = 'xscanimage'
+ 
+         # Photo Card
+         path = which('hp-unload')
+diff -urNad hplip-3.10.2~/ui4/ui_utils.py hplip-3.10.2/ui4/ui_utils.py
+--- hplip-3.10.2~/ui4/ui_utils.py	2010-02-25 00:07:15.000000000 +0100
+++ hplip-3.10.2/ui4/ui_utils.py	2010-03-24 09:07:08.200766557 +0100
+@@ -136,7 +136,7 @@
+ 
+ 
+     def loadDefaults(self):
+-        self.cmd_scan = self.__setup(['xsane -V %SANE_URI%', 'kooka', 'xscanimage'])
+        self.cmd_scan = self.__setup(['simple-scan %SANE_URI%', 'xsane -V %SANE_URI%', 'kooka', 'xscanimage'])
+         self.cmd_fab = self.__setup(['hp-fab'])
+ 
+ 
--- a/try_libhpmud.so.0.dpatch
+++ b/try_libhpmud.so.0.dpatch
@ -0,0 +1,65 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## try_libhpmud.so.0.dpatch by  <evgeni@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Try libhpmud.so.0 after libhpmud.so
+
+@DPATCH@
+
+diff --git a/scan/sane/marvell.c b/scan/sane/marvell.c
+index c36caa7..465342e 100644
+--- a/scan/sane/marvell.c
+++ b/scan/sane/marvell.c
+@@ -63,8 +63,11 @@ static int bb_load(struct marvell_session *ps, const char *so)
+    /* 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/scan/sane/soap.c b/scan/sane/soap.c
+index 28b83cc..698f58c 100644
+--- a/scan/sane/soap.c
+++ b/scan/sane/soap.c
+@@ -71,8 +71,11 @@ static int bb_load(struct soap_session *ps, const char *so)
+    /* 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/scan/sane/soapht.c b/scan/sane/soapht.c
+index 5535245..e6039c1 100644
+--- a/scan/sane/soapht.c
+++ b/scan/sane/soapht.c
+@@ -62,10 +62,13 @@ static int bb_load(struct soap_session *ps, const char *so)
+    int stat=1;
+ 
+    /* Load hpmud manually with symbols exported. Otherwise the plugin will not find it. */ 
+-   if ((ps->hpmud_handle = dlopen("libhpmud.so.0", RTLD_LAZY|RTLD_GLOBAL)) == NULL)
+   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/ubuntu-hp-mkuri-notification-text.dpatch
+++ b/ubuntu-hp-mkuri-notification-text.dpatch
@ -0,0 +1,39 @@
+#! /bin/sh -e
+## ubuntu-hp-mkuri-notification-text.dpatch by  <till.kamppeter@gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Ubuntu-only!
+
+[ "`lsb_release -is 2>/dev/null`" = "Ubuntu" ] || { echo -n '(ignored)' >&2; exit 0; }
+. /usr/share/dpatch/dpatch-run
+
+@DPATCH@
+diff -urNad hplip-3.10.2~/io/hpmud/hp-mkuri.c hplip-3.10.2/io/hpmud/hp-mkuri.c
+--- hplip-3.10.2~/io/hpmud/hp-mkuri.c	2010-03-17 22:56:18.000737637 +0100
+++ hplip-3.10.2/io/hpmud/hp-mkuri.c	2010-03-17 23:00:11.610781053 +0100
+@@ -355,6 +355,8 @@
+    if (hpmud_get_key_value(datfile, model, "fax-type", value, sizeof(value)) != HPMUD_R_OK)
+       goto bugout;
+    fax = strtol(value, NULL, 10);
+   if (hpmud_get_key_value(datfile, model, "model1", m, sizeof(m)) != HPMUD_R_OK)
+      goto bugout;
+ 
+    /* See if device is supported by hplip. */
+    if (support == HPMUD_SUPPORT_TYPE_NONE)
+@@ -372,12 +374,12 @@
+       switch (plugin)
+       {
+          case HPMUD_PLUGIN_TYPE_REQUIRED:
+-            BUG("%s requires a proprietary plugin\n", pm);
+-            notify(pm, "requires a proprietary plugin, run hp-setup", 30000);
+            BUG("%s requires a proprietary plugin\n", m);
+            notify(m, "requires a proprietary plugin, downloading and installing the plugin ...", 30000);
+             break;
+          case HPMUD_PLUGIN_TYPE_OPTIONAL:
+-            BUG("%s has a optional proprietary plugin\n", pm);
+-            notify(pm, "has a optional proprietary plugin, run hp-setup", 30000);
+            BUG("%s has an optional proprietary plugin\n", m);
+            notify(m, "has an optional proprietary plugin, run hp-plugin-ubuntu", 30000);
+             break;
+          default:
+             break;