Updated to 3.13.10

2025-02-23 16:32:58 +00:00 · 2013-11-13 16:39:35 +04:00 · 2013-11-13 16:39:35 +04:00 · ec79b571fa
commit ec79b571fa
parent 49ff6d96f2
14 changed files with 2427 additions and 357 deletions
--- a/.abf.yml
+++ b/.abf.yml
@ -1,4 +1,6 @@
+removed_sources:
+  hplip-3.13.8.tar.gz: c91fd5231e056f03dc7e715a84afcb13074364d1
 sources:
  SmartInstallDisable-Tool.run: c82103aa609cd7e58f43b090266bb77216933937
  hp-sendfax.png: 2201320c59c2eaba10abce5c40306c6461e79beb
-  hplip-3.13.8.tar.gz: c91fd5231e056f03dc7e715a84afcb13074364d1
+  hplip-3.13.10.tar.gz: 8c570ea4ed64a7e1a199f70de0f72178e07de026
--- a/hplip-3.13.10-fix-systray-x.patch
+++ b/hplip-3.13.10-fix-systray-x.patch
@ -0,0 +1,12 @@
+diff -Naur hplip-3.13.10.orig/hplip-systray.desktop.in hplip-3.13.10/hplip-systray.desktop.in
+--- hplip-3.13.10.orig/hplip-systray.desktop.in	2013-11-13 16:27:03.130195952 +0400
+++ hplip-3.13.10/hplip-systray.desktop.in	2013-11-13 16:28:12.465200259 +0400
+@@ -4,7 +4,7 @@
+ Name=HP System Tray Service
+ GenericName=Printer Status Applet
+ Comment=HP System Tray Service
+-Exec=hp-systray -x
+Exec=hp-systray
+ Icon=@abs_datadir@/hplip/data/images/128x128/hp_logo.png
+ Terminal=false
+ Categories=Application;Utility;
--- a/hplip-3.13.10-fix-udev-rules.patch
+++ b/hplip-3.13.10-fix-udev-rules.patch
@ -0,0 +1,12 @@
+--- hplip-3.13.10/data/rules/56-hpmud_sysfs.rules	2013-10-11 09:38:53.000000000 +0000
+++ hplip-3.13.10/data/rules/56-hpmud_sysfs.rules.tpg	2013-10-19 11:15:57.196603385 +0000
+@@ -14,9 +14,6 @@
+ # For RHEL 5, centos 5..
+ ENV{hp_test}=="yes", PROGRAM="/bin/sh -c 'X=%k; X=$${X#usbdev}; B=$${X%%%%.*}; D=$${X#*.}; logger -p user.info loading HP Device $$B $$D; printf %%03i:%%03i $$B $$D'", RUN+="/bin/sh -c '/usr/bin/python hp-config_usb_printer %c '"
+ 
+-# This rule will add the printer and install plugin
+-ENV{hp_test}=="yes", PROGRAM="/bin/sh -c 'logger -p user.info loading HP Device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c 'if [ -f /usr/bin/systemctl ]; then /usr/bin/systemctl --no-block start hplip-printer@$env{BUSNUM}:$env{DEVNUM}.service; else /usr/bin/nohup /usr/bin/python /usr/bin/hp-config_usb_printer $env{BUSNUM}:$env{DEVNUM} ; fi'"
+-
+ # If sane-bankends is installed add hpaio backend support to dll.conf if needed.
+ ENV{sane_hpaio}=="yes", RUN+="/bin/sh -c 'grep -q ^#hpaio /etc/sane.d/dll.conf;if [ $$? -eq 0 ];then sed -i -e s/^#hpaio/hpaio/ /etc/sane.d/dll.conf;else grep -q ^hpaio /etc/sane.d/dll.conf;if [ $$? -ne 0 ];then echo hpaio >>/etc/sane.d/dll.conf;fi;fi'"
+ 
--- a/hplip-IEEE-1284-4.patch
+++ b/hplip-IEEE-1284-4.patch
@ -1,7 +1,7 @@
-diff -up hplip-3.12.11/io/hpmud/musb.c.hplip-IEEE-1284-4 hplip-3.12.11/io/hpmud/musb.c
--- hplip-3.12.11/io/hpmud/musb.c.hplip-IEEE-1284-4	2012-11-20 10:55:09.000000000 +0100
-+++ hplip-3.12.11/io/hpmud/musb.c	2012-11-27 11:49:16.633107366 +0100
-@@ -712,7 +712,8 @@ static libusb_device *get_libusb_device(
+diff -up hplip-3.13.2/io/hpmud/musb.c.hplip-IEEE-1284-4 hplip-3.13.2/io/hpmud/musb.c
+--- hplip-3.13.2/io/hpmud/musb.c.hplip-IEEE-1284-4	2013-02-13 17:38:44.000000000 +0100
+++ hplip-3.13.2/io/hpmud/musb.c	2013-02-14 12:44:50.594152799 +0100
+@@ -713,7 +713,8 @@ static libusb_device *get_libusb_device(
 				{
 					if ((altptr->bInterfaceClass == LIBUSB_CLASS_PRINTER ) && /* Printer */
 							(altptr->bInterfaceSubClass == 1) &&
@ -11,13 +11,3 @@ diff -up hplip-3.12.11/io/hpmud/musb.c.hplip-IEEE-1284-4 hplip-3.12.11/io/hpmud/
 					{
 						if (is_uri(dev, uri))
 						{
-@@ -2065,7 +2066,8 @@ int __attribute__ ((visibility ("hidden"
- 				{
- 					if ((altptr->bInterfaceClass == LIBUSB_CLASS_PRINTER ) && /* Printer */
- 							(altptr->bInterfaceSubClass == 1) &&
-							(altptr->bInterfaceProtocol == 1 || altptr->bInterfaceProtocol == 2)) /* Unidirectional or Bidirectional*/
-+							(altptr->bInterfaceProtocol == 1 || altptr->bInterfaceProtocol == 2
-+							|| altptr->bInterfaceProtocol == 3)) /* Unidirectional, Bidirectional or 1284.4 */
- 					{
- 						libusb_open(dev, &hd);
- 						if (hd == NULL)
--- a/hplip-deviceIDs-drv.patch
+++ b/hplip-deviceIDs-drv.patch
--- a/hplip-deviceIDs-ppd.patch
+++ b/hplip-deviceIDs-ppd.patch
@ -0,0 +1,594 @@
+diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_2500-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_2500-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_2500-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:07.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_2500-ps.ppd	2013-07-23 12:41:46.653625035 +0200
+@@ -42,6 +42,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.13.7/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_2500_series-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:07.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_2500_series-ps.ppd	2013-07-23 12:41:46.654625021 +0200
+@@ -42,6 +42,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.13.7/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_2550_series-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:07.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_2550_series-ps.ppd	2013-07-23 12:41:46.655625007 +0200
+@@ -42,6 +42,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.13.7/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_2605dn-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:07.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_2605dn-ps.ppd	2013-07-23 12:41:46.656624993 +0200
+@@ -46,6 +46,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.13.7/prnt/ps/hp-color_laserjet_2840-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_2840-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_2840-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:08.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_2840-ps.ppd	2013-07-23 12:41:46.657624979 +0200
+@@ -43,6 +43,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.13.7/prnt/ps/hp-color_laserjet_3700n-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_3700n-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_3700n-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:08.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_3700n-ps.ppd	2013-07-23 12:41:46.658624966 +0200
+@@ -41,6 +41,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.13.7/prnt/ps/hp-color_laserjet_3700-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_3700-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_3700-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:08.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_3700-ps.ppd	2013-07-23 12:41:46.659624952 +0200
+@@ -41,6 +41,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.13.7/prnt/ps/hp-color_laserjet_3800-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_3800-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_3800-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:08.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_3800-ps.ppd	2013-07-23 12:41:46.660624938 +0200
+@@ -47,6 +47,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.13.7/prnt/ps/hp-color_laserjet_4550-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_4550-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_4550-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:08.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_4550-ps.ppd	2013-07-23 12:41:46.661624924 +0200
+@@ -40,6 +40,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.13.7/prnt/ps/hp-color_laserjet_4600-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_4600-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_4600-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:08.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_4600-ps.ppd	2013-07-23 12:41:46.662624910 +0200
+@@ -41,6 +41,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.13.7/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_4600_series-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:08.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_4600_series-ps.ppd	2013-07-23 12:41:46.663624897 +0200
+@@ -41,6 +41,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.13.7/prnt/ps/hp-color_laserjet_4650-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_4650-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_4650-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:08.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_4650-ps.ppd	2013-07-23 12:41:46.664624883 +0200
+@@ -43,6 +43,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.13.7/prnt/ps/hp-color_laserjet_4700-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_4700-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_4700-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:08.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_4700-ps.ppd	2013-07-23 12:41:46.665624869 +0200
+@@ -45,6 +45,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.13.7/prnt/ps/hp-color_laserjet_5550-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_5550-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_5550-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:08.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_5550-ps.ppd	2013-07-23 12:41:46.666624855 +0200
+@@ -43,6 +43,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.13.7/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:08.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd	2013-07-23 12:41:46.667624841 +0200
+@@ -44,6 +44,7 @@
+ 
+ 
+ *% Product Name and Version Information
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM3530 MFP;"
+ *Manufacturer:	"HP"
+ *Product: 	"(HP Color LaserJet CM3530 MFP)"
+ *Product: "(Hewlett-Packard HP Color LaserJet CM3530 MFP)"
+diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.deviceIDs-ppd	2013-07-23 12:46:53.884383444 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd	2013-07-23 12:43:46.000000000 +0200
+@@ -32,6 +32,7 @@
+ *LanguageEncoding: ISOLatin1
+ *PCFileName: "HPP00004.PPD"
+ *Product: "(HP Color LaserJet CM4540 MFP)"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM4540 MFP;"
+ *Manufacturer: "HP"
+ *ModelName: "HP Color LaserJet CM4540 MFP"
+ *ShortNickName: "HP Color LaserJet CM4540 MFP"
+diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:08.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd	2013-07-23 12:41:46.668624828 +0200
+@@ -43,6 +43,7 @@
+ 
+ 
+ *% 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.13.7/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_cp3525-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:09.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_cp3525-ps.ppd	2013-07-23 12:41:46.670624800 +0200
+@@ -44,6 +44,7 @@
+ 
+ 
+ *% 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.13.7/prnt/ps/hp-color_laserjet_cp4005-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_cp4005-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_cp4005-ps.ppd.deviceIDs-ppd	2013-07-23 12:45:48.252289396 +0200
+++ hplip-3.13.7/prnt/ps/hp-color_laserjet_cp4005-ps.ppd	2013-07-23 12:44:34.000000000 +0200
+@@ -44,6 +44,7 @@
+ 
+ 
+ *% Product Name and Version Information
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP4005;"
+ *Manufacturer:	"HP"
+ *Product: 	"(HP Color LaserJet CP4005)"
+ *Product: "(Hewlett-Packard HP Color LaserJet CP4005)"
+diff -up hplip-3.13.7/prnt/ps/hp-designjet_t770_postscript-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-designjet_t770_postscript-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-designjet_t770_postscript-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:09.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-designjet_t770_postscript-ps.ppd	2013-07-23 12:41:46.670624800 +0200
+@@ -38,6 +38,7 @@
+ *ShortNickName: "HP Designjet T770 PostScript"
+ *NickName: "HP Designjet T770ps 44in Postscript (recommended)"
+ *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Designjet T770;DES:HP Designjet T770;CMD:POSTSCRIPT;"
+ 
+ 
+ *% =============== Device Capabilities And Keywords for supporting Alert and Status Mechanism =============== 
+diff -up hplip-3.13.7/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-designjet_t770ps_24in-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:09.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-designjet_t770ps_24in-ps.ppd	2013-07-23 12:41:46.671624786 +0200
+@@ -38,6 +38,7 @@
+ *ShortNickName: "HP Designjet T770ps 24in"
+ *NickName: "HP Designjet T770ps 24in Postscript (recommended)"
+ *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Designjet T770;DES:HP Designjet T770;CMD:POSTSCRIPT;"
+ 
+ 
+ *% =============== Device Capabilities And Keywords for supporting Alert and Status Mechanism =============== 
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1200n-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:09.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_1200n-ps.ppd	2013-07-23 12:41:46.671624786 +0200
+@@ -54,6 +54,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.13.7/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1200-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:09.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_1200-ps.ppd	2013-07-23 12:41:46.672624772 +0200
+@@ -54,6 +54,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.13.7/prnt/ps/hp-laserjet_1300n-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1300n-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_1300n-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:09.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_1300n-ps.ppd	2013-07-23 12:41:46.673624759 +0200
+@@ -58,6 +58,7 @@
+ *Product: "(Hewlett-Packard hp LaserJet 1300n)"
+ *Product: "(HP LaserJet 1300n)"
+ *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1300;DES:Hewlett-Packard LaserJet 1300;"
+ *PSVersion: "(2014.116) 0"
+ 
+ *%=================================================
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1300-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1300-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_1300-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:09.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_1300-ps.ppd	2013-07-23 12:41:46.673624759 +0200
+@@ -58,6 +58,7 @@
+ *Product: "(Hewlett-Packard hp LaserJet 1300n)"
+ *Product: "(HP LaserJet 1300n)"
+ *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1300;DES:Hewlett-Packard LaserJet 1300;"
+ *PSVersion: "(2014.116) 0"
+ 
+ *%=================================================
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1300xi-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1300xi-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_1300xi-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:09.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_1300xi-ps.ppd	2013-07-23 12:41:46.674624745 +0200
+@@ -58,6 +58,7 @@
+ *Product: "(Hewlett-Packard hp LaserJet 1300n)"
+ *Product: "(HP LaserJet 1300n)"
+ *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:hp LaserJet 1300;DES:Hewlett-Packard LaserJet 1300;"
+ *PSVersion: "(2014.116) 0"
+ 
+ *%=================================================
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1320n-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:09.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_1320n-ps.ppd	2013-07-23 12:41:46.675624731 +0200
+@@ -55,6 +55,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.13.7/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1320nw-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:09.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_1320nw-ps.ppd	2013-07-23 12:41:46.676624717 +0200
+@@ -55,6 +55,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.13.7/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1320-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:09.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_1320-ps.ppd	2013-07-23 12:41:46.677624703 +0200
+@@ -55,6 +55,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.13.7/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1320_series-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:09.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_1320_series-ps.ppd	2013-07-23 12:41:46.677624703 +0200
+@@ -55,6 +55,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.13.7/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1320tn-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:09.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_1320tn-ps.ppd	2013-07-23 12:41:46.678624689 +0200
+@@ -55,6 +55,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.13.7/prnt/ps/hp-laserjet_2100-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2100-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_2100-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:09.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_2100-ps.ppd	2013-07-23 12:41:46.679624676 +0200
+@@ -54,6 +54,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.13.7/prnt/ps/hp-laserjet_2100_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2100_series-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_2100_series-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:09.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_2100_series-ps.ppd	2013-07-23 12:41:46.680624662 +0200
+@@ -54,6 +54,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.13.7/prnt/ps/hp-laserjet_2200-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2200-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_2200-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:09.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_2200-ps.ppd	2013-07-23 12:41:46.680624662 +0200
+@@ -54,6 +54,7 @@
+ *Product: "(HP LaserJet 2200)"
+ *Product: "(Hewlett-Packard HP LaserJet 2200)"
+ *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 2200;DES:Hewlett-Packard LaserJet 2200;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;"
+ *PSVersion: "(2014.116) 0"
+ 
+ *%=================================================
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_2200_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2200_series-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_2200_series-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:10.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_2200_series-ps.ppd	2013-07-23 12:41:46.681624648 +0200
+@@ -54,6 +54,7 @@
+ *Product: "(HP LaserJet 2200)"
+ *Product: "(Hewlett-Packard HP LaserJet 2200)"
+ *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 2200;DES:Hewlett-Packard LaserJet 2200;CMD:PJL,MLC,PCL,PCLXL,POSTSCRIPT;"
+ *PSVersion: "(2014.116) 0"
+ 
+ *%=================================================
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2300-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:10.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_2300-ps.ppd	2013-07-23 12:41:46.682624634 +0200
+@@ -59,6 +59,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.13.7/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2300_series-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:10.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_2300_series-ps.ppd	2013-07-23 12:41:46.683624620 +0200
+@@ -59,6 +59,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.13.7/prnt/ps/hp-laserjet_2420-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2420-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_2420-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:10.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_2420-ps.ppd	2013-07-23 12:41:46.684624607 +0200
+@@ -57,6 +57,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.13.7/prnt/ps/hp-laserjet_3390-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_3390-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_3390-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:10.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_3390-ps.ppd	2013-07-23 12:41:46.684624607 +0200
+@@ -58,6 +58,7 @@
+ *Product: "(HP LaserJet 3390)"
+ *Product: "(Hewlett-Packard HP LaserJet 3390)"
+ *Manufacturer: "HP"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 3390;DES:Hewlett-Packard LaserJet 3390;"
+ *PSVersion: "(2014.116) 0"
+ 
+ *%=================================================
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_4000_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4000_series-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_4000_series-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:10.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_4000_series-ps.ppd	2013-07-23 12:41:46.685624593 +0200
+@@ -49,6 +49,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.13.7/prnt/ps/hp-laserjet_4050_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4050_series-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_4050_series-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:10.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_4050_series-ps.ppd	2013-07-23 12:41:46.686624579 +0200
+@@ -49,6 +49,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.13.7/prnt/ps/hp-laserjet_4100_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4100_series-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_4100_series-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:10.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_4100_series-ps.ppd	2013-07-23 12:41:46.687624565 +0200
+@@ -48,6 +48,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.13.7/prnt/ps/hp-laserjet_4200-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4200-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_4200-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:10.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_4200-ps.ppd	2013-07-23 12:41:46.688624551 +0200
+@@ -49,6 +49,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.13.7/prnt/ps/hp-laserjet_4250-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4250-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_4250-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:10.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_4250-ps.ppd	2013-07-23 12:41:46.689624538 +0200
+@@ -50,6 +50,7 @@
+ 
+ 
+ *% 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.13.7/prnt/ps/hp-laserjet_4300-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4300-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_4300-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:10.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_4300-ps.ppd	2013-07-23 12:41:46.690624524 +0200
+@@ -49,6 +49,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.13.7/prnt/ps/hp-laserjet_4350-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4350-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_4350-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:10.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_4350-ps.ppd	2013-07-23 12:41:46.691624510 +0200
+@@ -50,6 +50,7 @@
+ 
+ 
+ *% 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.13.7/prnt/ps/hp-laserjet_5100_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_5100_series-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_5100_series-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:10.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_5100_series-ps.ppd	2013-07-23 12:41:46.692624496 +0200
+@@ -50,6 +50,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.13.7/prnt/ps/hp-laserjet_8000-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_8000-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_8000-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:11.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_8000-ps.ppd	2013-07-23 12:41:46.694624469 +0200
+@@ -52,6 +52,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.13.7/prnt/ps/hp-laserjet_8000_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_8000_series-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_8000_series-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:11.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_8000_series-ps.ppd	2013-07-23 12:41:46.695624455 +0200
+@@ -52,6 +52,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.13.7/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:11.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd	2013-07-23 12:41:46.696624441 +0200
+@@ -51,6 +51,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.13.7/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:11.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd	2013-07-23 12:41:46.697624427 +0200
+@@ -52,6 +52,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.13.7/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_p2015_series-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:11.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_p2015_series-ps.ppd	2013-07-23 12:41:46.698624413 +0200
+@@ -58,6 +58,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.13.7/prnt/ps/hp-laserjet_p3005-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_p3005-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_p3005-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:11.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_p3005-ps.ppd	2013-07-23 12:41:46.699624399 +0200
+@@ -50,6 +50,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.13.7/prnt/ps/hp-laserjet_p3010_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_p3010_series-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_p3010_series-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:11.000000000 +0200
+++ hplip-3.13.7/prnt/ps/hp-laserjet_p3010_series-ps.ppd	2013-07-23 12:41:46.700624386 +0200
+@@ -45,6 +45,7 @@
+ 
+ 
+ *% 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)"
--- a/hplip-hpcups-sigpipe.patch
+++ b/hplip-hpcups-sigpipe.patch
@ -1,5 +1,6 @@
--- hplip-3.13.8/prnt/hpijs/services.cpp	2013-08-07 05:59:17.000000000 +0000
-+++ hplip-3.13.8/prnt/hpijs/services.cpp.tpg	2013-08-19 11:57:23.889340643 +0000
+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.
 \*****************************************************************************/
@ -8,7 +9,7 @@
 #include <sys/stat.h>
 #include <stdio.h>
 #include <stdlib.h>
-@@ -385,8 +386,16 @@
+@@ -382,8 +383,16 @@ DRIVER_ERROR UXServices::ToDevice(const 
    if (write(OutputPath, pBuffer, *Count) != (ssize_t)*Count) 
    {
       static int cnt=0;
--- a/hplip-hpijs-marker-supply.patch
+++ b/hplip-hpijs-marker-supply.patch
@ -6,9 +6,9 @@ diff -up hplip-3.10.9/prnt/hpijs/hpijs.cpp.hpijs-marker-supply hplip-3.10.9/prnt
    int status = EXIT_FAILURE;
    int ret, n, i, kn=0, width, k_width;
 +   int low_marker = 0;
- 
+    char user_name[32]={0,};
+         
    openlog("hpijs", LOG_PID,  LOG_DAEMON);
- 
@@ -666,14 +667,17 @@ int main (int argc, char *argv[], char *
 			case WARN_LOW_INK_YELLOW:
 			case WARN_LOW_INK_MULTIPLE_PENS:
--- a/hplip-logdir.patch
+++ b/hplip-logdir.patch
@ -1,92 +1,30 @@
-diff -up hplip-3.12.11/fax/backend/hpfax.py.logdir hplip-3.12.11/fax/backend/hpfax.py
--- hplip-3.12.11/fax/backend/hpfax.py.logdir	2012-11-20 10:55:06.000000000 +0100
-+++ hplip-3.12.11/fax/backend/hpfax.py	2012-11-27 10:09:25.298698254 +0100
-@@ -244,7 +244,7 @@ else:
-         input_fd = 0
- 
-     # REVISIT:
-    tmp_dir = '/var/log/hp/tmp'
-+    tmp_dir = os.environ.get ('TMPDIR', '/var/log/hp/tmp')
- 
- 
-     pipe_name = os.path.join(tmp_dir, "hpfax-pipe-%d" % job_id)
-diff -up hplip-3.12.11/logcapture.py.logdir hplip-3.12.11/logcapture.py
--- hplip-3.12.11/logcapture.py.logdir	2012-11-20 10:55:15.000000000 +0100
-+++ hplip-3.12.11/logcapture.py	2012-11-27 10:09:25.298698254 +0100
-@@ -39,7 +39,7 @@ CUPS_BACKUP_FILE='/etc/cups/cupsd.conf_o
- LOG_FOLDER_PATH='./'
- LOG_FOLDER_NAME='hplip_troubleshoot_logs'
- LOG_FILES=LOG_FOLDER_PATH + LOG_FOLDER_NAME
-TMP_DIR='/var/log/hp/tmp'
-+TMP_DIR='/var/spool/cups/tmp'
- ############ enable_log() function ############
- #This function changes CUPS conf log level to debug and restarts CUPS service.
- 
-@@ -268,7 +268,7 @@ if os.path.exists('/var/log/cups/error_l
-       log.error("Failed to capture %s log file."%("/var/log/cups/error_log"))
- 
- 
-File_list, File_list_str = utils.expand_list('/var/log/hp/*.log')
-+File_list, File_list_str = utils.expand_list('%s/*.log'%TMP_DIR)
- if File_list:
-     sts,out = utils.run('cp -f %s %s'%(File_list_str, LOG_FILES))
-     if sts != 0:
-diff -up hplip-3.12.11/prnt/filters/hplipjs.c.logdir hplip-3.12.11/prnt/filters/hplipjs.c
--- hplip-3.12.11/prnt/filters/hplipjs.c.logdir	2012-11-20 10:50:44.000000000 +0100
-+++ hplip-3.12.11/prnt/filters/hplipjs.c	2012-11-27 10:09:25.299698225 +0100
-@@ -275,7 +275,8 @@ int main (int argc, char **argv)
-     {
-         fprintf (stderr, "DEBUG: HPLIPJS: argv[%d] = %s\n", i, argv[i]);
-     }
-    snprintf(szPSFile, sizeof(szPSFile), "%s/output.ps","/var/log/hp/tmp");
-+    snprintf(szPSFile, sizeof(szPSFile), "%s/output.ps",
-+	     getenv ("TMPDIR") ? : "/var/log/hp/tmp");
- 
-     HPFp = fopen (szPSFile, "w");
- #endif
-diff -up hplip-3.12.11/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.12.11/prnt/hpcups/HPCupsFilter.cpp
--- hplip-3.12.11/prnt/hpcups/HPCupsFilter.cpp.logdir	2012-11-27 10:09:25.291698453 +0100
-+++ hplip-3.12.11/prnt/hpcups/HPCupsFilter.cpp	2012-11-27 10:13:34.958640524 +0100
-@@ -31,16 +31,24 @@
+diff -up hplip-3.13.5/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.13.5/prnt/hpcups/HPCupsFilter.cpp
+--- hplip-3.13.5/prnt/hpcups/HPCupsFilter.cpp.logdir	2013-05-14 14:57:19.450942281 +0200
+++ hplip-3.13.5/prnt/hpcups/HPCupsFilter.cpp	2013-05-14 14:59:45.745927028 +0200
+@@ -31,6 +31,7 @@
 \*****************************************************************************/
 
 #include "HPCupsFilter.h"
 +#include <limits.h>
 #include <signal.h>
-+#include <stdlib.h>
 #include <sys/wait.h>
 #include <sys/utsname.h>
- #include <time.h>
- 
- #define HP_FILE_VERSION_STR    "03.09.08.0"
- 
-+char *env_tmpdir = NULL;
-+
- static HPCupsFilter    filter;
- int main (int  argc, char *argv[])
- {
-+    env_tmpdir = getenv ("TMPDIR");
-+    if (!env_tmpdir)
-+	env_tmpdir = "/var/log/hp/tmp";
-+
-     openlog("hpcups", LOG_PID,  LOG_DAEMON);
- 
-     if (argc < 6 || argc > 7) {
-@@ -583,9 +591,10 @@ int HPCupsFilter::processRasterData(cups
+@@ -610,10 +617,11 @@ int HPCupsFilter::processRasterData(cups
     DRIVER_ERROR           err;
     int                    ret_status = 0;
 
 -    char hpPreProcessedRasterFile[64]; //temp file needed to store raster data with swaped pages.
 +    char hpPreProcessedRasterFile[PATH_MAX]; //temp file needed to store raster data with swaped pages.
 
-    strcpy(hpPreProcessedRasterFile, "/var/log/hp/tmp/hplipSwapedPagesXXXXXX");
+ 
+-    sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name);
 +    snprintf(hpPreProcessedRasterFile, sizeof (hpPreProcessedRasterFile),
-+	     "%s/hplipSwapedPagesXXXXXX", env_tmpdir);
-        
+	     "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name);
+ 
 
     while (cupsRasterReadHeader2(cups_raster, &cups_header))
-@@ -647,13 +656,13 @@ int HPCupsFilter::processRasterData(cups
-         
+@@ -675,7 +683,7 @@ int HPCupsFilter::processRasterData(cups
+         // Save Raster file for Debugging
         if (m_iLogLevel & SAVE_INPUT_RASTERS)
         {
 -            char    szFileName[64];
@ -94,79 +32,52 @@ diff -up hplip-3.12.11/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.12.11/prnt/hp
             memset(szFileName, 0, sizeof(szFileName));
 
             if (cups_header.cupsColorSpace == CUPS_CSPACE_RGBW ||
-                 cups_header.cupsColorSpace == CUPS_CSPACE_RGB)
-             {
-                snprintf (szFileName, sizeof(szFileName), "/var/log/hp/tmp/hpcupsfilterc_%d.bmp", current_page_number);
-+                snprintf (szFileName, sizeof(szFileName), "%s/hpcupsfilterc_%d.bmp", env_tmpdir, current_page_number);
-                 cfp = fopen (szFileName, "w");
-                 chmod (szFileName, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
-             }
-@@ -661,7 +670,7 @@ int HPCupsFilter::processRasterData(cups
-             if (cups_header.cupsColorSpace == CUPS_CSPACE_RGBW ||
-                 cups_header.cupsColorSpace == CUPS_CSPACE_K)
-             {
-                snprintf (szFileName, sizeof(szFileName), "/var/log/hp/tmp/hpcupsfilterk_%d.bmp", current_page_number);
-+                snprintf (szFileName, sizeof(szFileName), "%s/hpcupsfilterk_%d.bmp", env_tmpdir, current_page_number);
-                 kfp = fopen (szFileName, "w");
-                 chmod (szFileName, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
-             }
-diff -up hplip-3.12.11/prnt/hpcups/LJZjStream.cpp.logdir hplip-3.12.11/prnt/hpcups/LJZjStream.cpp
--- hplip-3.12.11/prnt/hpcups/LJZjStream.cpp.logdir	2012-11-20 10:49:20.000000000 +0100
-+++ hplip-3.12.11/prnt/hpcups/LJZjStream.cpp	2012-11-27 10:16:24.878547224 +0100
-@@ -42,9 +42,12 @@
- #include "LJZjStream.h"
+diff -up hplip-3.13.5/prnt/hpcups/LJZjStream.cpp.logdir hplip-3.13.5/prnt/hpcups/LJZjStream.cpp
+--- hplip-3.13.5/prnt/hpcups/LJZjStream.cpp.logdir	2013-05-10 12:03:36.000000000 +0200
+++ hplip-3.13.5/prnt/hpcups/LJZjStream.cpp	2013-05-14 14:57:19.460942143 +0200
+@@ -42,6 +42,7 @@
 #include "Utils.h"
 #include "hpjbig_wrapper.h"
+ #include "utils.h"
 +#include <limits.h>
 
 #define ZJC_BAND_HEIGHT    100
 
-+extern char *env_tmpdir;
-+
- LJZjStream::LJZjStream () : Encapsulator ()
- {
-     memset(&m_PM, 0, sizeof(m_PM));
-@@ -675,10 +678,10 @@ DRIVER_ERROR LJZjStream::preProcessRaste
+@@ -675,8 +678,8 @@ DRIVER_ERROR LJZjStream::preProcessRaste
 	cups_raster_t *even_pages_raster=NULL;
 	cups_raster_t *odd_pages_raster = NULL;
 	BYTE* pPageDataBuffer = NULL;
 -	char hpEvenPagesFile[64]={0,};
 -	char hpOddPagesFile[64]={0,};
-	snprintf(hpEvenPagesFile, sizeof(hpEvenPagesFile), "%s/hplipEvenPagesXXXXXX","/var/log/hp/tmp");
-	snprintf(hpOddPagesFile, sizeof(hpOddPagesFile), "%s/hplipOddPagesXXXXXX", "/var/log/hp/tmp");
 +	char hpEvenPagesFile[PATH_MAX]={0,};
 +	char hpOddPagesFile[PATH_MAX]={0,};
-+	snprintf(hpEvenPagesFile, sizeof(hpEvenPagesFile), "%s/hplipEvenPagesXXXXXX", env_tmpdir);
-+	snprintf(hpOddPagesFile, sizeof(hpOddPagesFile), "%s/hplipOddPagesXXXXXX", env_tmpdir);
+ 	snprintf(hpEvenPagesFile, sizeof(hpEvenPagesFile), "%s/hp_%s_cups_EvenPagesXXXXXX",CUPS_TMP_DIR, m_pJA->user_name);
+ 	snprintf(hpOddPagesFile, sizeof(hpOddPagesFile), "%s/hp_%s_cups_OddPagesXXXXXX", CUPS_TMP_DIR, m_pJA->user_name);
 	
- 	if (1 != m_pJA->pre_process_raster || !firstpage_cups_header->Duplex){		                                  
- 		return  NO_ERROR;                                  
-diff -up hplip-3.12.11/prnt/hpcups/SystemServices.cpp.logdir hplip-3.12.11/prnt/hpcups/SystemServices.cpp
--- hplip-3.12.11/prnt/hpcups/SystemServices.cpp.logdir	2012-11-20 10:49:20.000000000 +0100
-+++ hplip-3.12.11/prnt/hpcups/SystemServices.cpp	2012-11-27 10:09:25.300698197 +0100
-@@ -30,14 +30,17 @@
- 
+diff -up hplip-3.13.5/prnt/hpcups/SystemServices.cpp.logdir hplip-3.13.5/prnt/hpcups/SystemServices.cpp
+--- hplip-3.13.5/prnt/hpcups/SystemServices.cpp.logdir	2013-05-10 12:03:36.000000000 +0200
+++ hplip-3.13.5/prnt/hpcups/SystemServices.cpp	2013-05-14 14:57:19.460942143 +0200
+@@ -31,14 +31,15 @@
 #include "CommonDefinitions.h"
 #include "SystemServices.h"
+ #include "utils.h"
 +#include <limits.h>
-+
-+extern char *env_tmpdir;
 
- SystemServices::SystemServices(int iLogLevel, int job_id) : m_iLogLevel(iLogLevel)
+ SystemServices::SystemServices(int iLogLevel, int job_id, char* user_name) : m_iLogLevel(iLogLevel)
 {
     m_fp = NULL;
     if (iLogLevel & SAVE_PCL_FILE)
     {
 -        char    fname[64];
-	sprintf(fname, "%s/hpcups_job%d.out", "/var/log/hp/tmp",job_id);
+-        sprintf(fname, "%s/hp_%s_cups_out_job%d_XXXXXX",CUPS_TMP_DIR, user_name, job_id);
 +        char    fname[PATH_MAX];
-+	sprintf(fname, "%s/hpcups_job%d.out", env_tmpdir, job_id);
-         m_fp = fopen(fname, "w");
-         chmod(fname, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
-     }
-diff -up hplip-3.12.11/prnt/hpijs/hpcupsfax.cpp.logdir hplip-3.12.11/prnt/hpijs/hpcupsfax.cpp
--- hplip-3.12.11/prnt/hpijs/hpcupsfax.cpp.logdir	2012-11-20 10:50:48.000000000 +0100
-+++ hplip-3.12.11/prnt/hpijs/hpcupsfax.cpp	2012-11-27 10:09:25.300698197 +0100
+        snprintf(fname, sizeof(fname), "%s/hp_%s_cups_out_job%d_XXXXXX",CUPS_TMP_DIR, user_name, job_id);
+         
+         createTempFile(fname, &m_fp);
+         if (m_fp)
+diff -up hplip-3.13.5/prnt/hpijs/hpcupsfax.cpp.logdir hplip-3.13.5/prnt/hpijs/hpcupsfax.cpp
+--- hplip-3.13.5/prnt/hpijs/hpcupsfax.cpp.logdir	2013-05-10 12:04:54.000000000 +0200
+++ hplip-3.13.5/prnt/hpijs/hpcupsfax.cpp	2013-05-14 14:57:19.461942130 +0200
@@ -29,6 +29,7 @@
     POSSIBILITY OF SUCH DAMAGE.
 \*****************************************************************************/
@ -175,49 +86,18 @@ diff -up hplip-3.12.11/prnt/hpijs/hpcupsfax.cpp.logdir hplip-3.12.11/prnt/hpijs/
 #include <sys/stat.h>
 #include <stdio.h>
 #include <stdlib.h>
-@@ -66,6 +67,7 @@ uint16_t (*convert_endian_s)(uint16_t);
- 
- static int iLogLevel = 1;
- char hpFileName[64] ;
-+static char *env_tmpdir;
- 
- #define TIFF_HDR_SIZE 8
- #define LITTLE_ENDIAN_MODE I
-@@ -439,9 +441,9 @@ int ProcessTiffData(int fromFD, int toFD
+@@ -440,7 +442,7 @@ int ProcessTiffData(int fromFD, int toFD
     int bytes_written = 0;
     int ret_status = 0;
     int bytes_read = 0;
 -    char hpTiffFileName[64];
 +    char hpTiffFileName[PATH_MAX];
     long input_file_size = 0;
-    snprintf(hpTiffFileName,sizeof(hpTiffFileName), "%s/hpliptiffXXXXXX","/var/log/hp/tmp");
-+    snprintf(hpTiffFileName,sizeof(hpTiffFileName), "%s/hpliptiffXXXXXX",env_tmpdir);
- 
- 
-     fdTiff = mkstemp (hpTiffFileName);
-@@ -656,6 +658,10 @@ int main (int argc, char **argv)
- 
-     /*********** PROLOGUE ***********/
- 
-+    env_tmpdir = getenv ("TMPDIR");
-+    if (!env_tmpdir)
-+	env_tmpdir = "/var/log/hp/tmp";
-+
-     GetLogLevel();
-     openlog("hpcupsfax", LOG_PID,  LOG_DAEMON);
- 
-@@ -679,7 +685,7 @@ int main (int argc, char **argv)
-          i++;
-     }
- 
-    snprintf(hpFileName,sizeof(hpFileName),"%s/hplipfaxLog_XXXXXX","/var/log/hp/tmp");
-+    snprintf(hpFileName,sizeof(hpFileName),"%s/hplipfaxLog_XXXXXX",env_tmpdir);
- 
-     fdFax = mkstemp (hpFileName);
-     if (fdFax < 0)
-diff -up hplip-3.12.11/prnt/hpijs/hpijs.cpp.logdir hplip-3.12.11/prnt/hpijs/hpijs.cpp
--- hplip-3.12.11/prnt/hpijs/hpijs.cpp.logdir	2012-11-27 10:09:25.288698537 +0100
-+++ hplip-3.12.11/prnt/hpijs/hpijs.cpp	2012-11-27 10:09:25.301698169 +0100
+     FILE* pFilePtrFax;
+     snprintf(hpTiffFileName,sizeof(hpTiffFileName), "%s/hp_%s_fax_tiffXXXXXX",CUPS_TMP_DIR,user_name);
+diff -up hplip-3.13.5/prnt/hpijs/hpijs.cpp.logdir hplip-3.13.5/prnt/hpijs/hpijs.cpp
+--- hplip-3.13.5/prnt/hpijs/hpijs.cpp.logdir	2013-05-14 14:57:19.448942309 +0200
+++ hplip-3.13.5/prnt/hpijs/hpijs.cpp	2013-05-14 14:57:19.461942130 +0200
@@ -29,6 +29,7 @@
     POSSIBILITY OF SUCH DAMAGE.
 \*****************************************************************************/
@ -226,51 +106,27 @@ diff -up hplip-3.12.11/prnt/hpijs/hpijs.cpp.logdir hplip-3.12.11/prnt/hpijs/hpij
 #include <sys/stat.h>
 #include <stdio.h>
 #include <stdlib.h>
-@@ -43,6 +44,8 @@
- #include "hpijs.h"
- #include "services.h"
- 
-+static char *env_tmpdir;
-+
- extern void SendDbusMessage (const char *dev, const char *printer, int code, 
-                              const char *username, const int jobid, const char *title);
- 
-@@ -96,8 +99,8 @@ void setLogLevel(UXServices *pSS)
+@@ -97,7 +100,7 @@ void setLogLevel(UXServices *pSS)
 
     if (pSS->m_iLogLevel & SAVE_PCL_FILE)
     {
 -        char    szFileName[64];
-	snprintf (szFileName,sizeof(szFileName), "/var/log/hp/tmp/hpijs_%d.out", getpid());
 +        char    szFileName[PATH_MAX];
-+	snprintf (szFileName,sizeof(szFileName), "%s/hpijs_%d.out", env_tmpdir, getpid());
+         snprintf (szFileName,sizeof(szFileName), "%s/hp_%s_ijs_%d_XXXXXX", CUPS_TMP_DIR, user_name,  getpid());
+         createTempFile(szFileName, &pSS->outfp);
 
- 	pSS->outfp = fopen (szFileName, "w");
- 	if (pSS->outfp)
-@@ -588,6 +591,10 @@ int main (int argc, char *argv[], char *
-    int ret, n, i, kn=0, width, k_width;
-    int low_marker = 0;
- 
-+   env_tmpdir = getenv ("TMPDIR");
-+   if (!env_tmpdir)
-+       env_tmpdir = "/var/log/hp/tmp";
-+
-    openlog("hpijs", LOG_PID,  LOG_DAEMON);
- 
-    if (argc > 1)
-@@ -627,8 +634,8 @@ int main (int argc, char *argv[], char *
-    setLogLevel(pSS);
+@@ -629,7 +637,7 @@ int main (int argc, char *argv[], char *
+    setLogLevel(pSS, user_name);
 
 #ifdef CAPTURE
 -   char szCapOutFile[64];
-   snprintf(szCapOutFile, sizeof(szCapOutFile),"%s/capout_XXXXXX","/var/log/hp/tmp");
 +   char szCapOutFile[PATH_MAX];
-+   snprintf(szCapOutFile, sizeof(szCapOutFile),"%s/capout_XXXXXX",env_tmpdir);
+    snprintf(szCapOutFile, sizeof(szCapOutFile),"%s/hp_%s_ijs_capout_XXXXXX",CUPS_TMP_DIR, user_name);
    if ((pSS->InitScript(szCapOutFile, TRUE)) != NO_ERROR)
       BUG("unable to init capture");
- #endif
-diff -up hplip-3.12.11/prnt/hpijs/hpijsfax.cpp.logdir hplip-3.12.11/prnt/hpijs/hpijsfax.cpp
--- hplip-3.12.11/prnt/hpijs/hpijsfax.cpp.logdir	2012-11-20 10:50:48.000000000 +0100
-+++ hplip-3.12.11/prnt/hpijs/hpijsfax.cpp	2012-11-27 10:09:25.301698169 +0100
+diff -up hplip-3.13.5/prnt/hpijs/hpijsfax.cpp.logdir hplip-3.13.5/prnt/hpijs/hpijsfax.cpp
+--- hplip-3.13.5/prnt/hpijs/hpijsfax.cpp.logdir	2013-05-10 12:04:54.000000000 +0200
+++ hplip-3.13.5/prnt/hpijs/hpijsfax.cpp	2013-05-14 14:57:19.462942116 +0200
@@ -31,6 +31,7 @@
 
 #ifdef HAVE_LIBHPIP
@ -279,21 +135,12 @@ diff -up hplip-3.12.11/prnt/hpijs/hpijsfax.cpp.logdir hplip-3.12.11/prnt/hpijs/h
 #include <sys/stat.h>
 #include <stdio.h>
 #include <stdlib.h>
-@@ -270,14 +271,15 @@ int hpijsFaxServer (int argc, char **arg
- 	IP_IMAGE_TRAITS	traits;
+@@ -272,7 +273,7 @@ int hpijsFaxServer (int argc, char **arg
 	IP_HANDLE		hJob;
+ 	 FILE *pFilePtrFax;
 
 -	char					hpFileName[64]; 
 +	char					hpFileName[PATH_MAX]; 
 	int					fdFax = -1;
 	BYTE					szFileHeader[68];
 	BYTE					szPageHeader[64];
- 	BYTE					*p;
- 	unsigned	int			uiPageNum = 0;
- 
-	snprintf(hpFileName,sizeof(hpFileName),"%s/hplipfaxXXXXXX","/var/log/hp/tmp");
-+	snprintf(hpFileName,sizeof(hpFileName),"%s/hplipfaxXXXXXX",
-+		 getenv ("TMPDIR") ? : "/var/log/hp/tmp");
- 
- 
- 	pFaxStruct = new HPIJSFax ();
--- a/hplip-no-asm.patch
+++ b/hplip-no-asm.patch
@ -1,16 +1,3 @@
-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
--- a/hplip-snmp-quirks.patch
+++ b/hplip-snmp-quirks.patch
@ -1,6 +1,7 @@
--- hplip-3.13.8/prnt/drv/hpcups.drv.in	2013-08-07 06:04:59.000000000 +0000
-+++ hplip-3.13.8/prnt/drv/hpcups.drv.in.tpg	2013-08-19 11:40:08.402350402 +0000
-@@ -6913,6 +6913,8 @@
+diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.snmp-quirks hplip-3.13.4/prnt/drv/hpcups.drv.in
+--- hplip-3.13.4/prnt/drv/hpcups.drv.in.snmp-quirks	2013-04-09 12:11:58.447587815 +0200
+++ hplip-3.13.4/prnt/drv/hpcups.drv.in	2013-04-09 12:11:58.594585761 +0200
+@@ -6757,6 +6757,8 @@ Manufacturer "HP"
       Attribute "NickName" "" "HP Officejet Pro 8500 a909a, hpcups $Version"
       Attribute "ShortNickName" "" "HP Officejet Pro 8500 a909a"
       Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 8500 a909a;DES:officejet pro 8500 a909a;"
@ -9,7 +10,7 @@
       PCFileName "hp-officejet_pro_8500_a909a.ppd"
       Attribute "Product" "" "(HP Officejet Pro 8500 All-in-one Printer - a909a)"
     }
-@@ -6929,6 +6931,8 @@
+@@ -6773,6 +6775,8 @@ Manufacturer "HP"
       Attribute "NickName" "" "HP Officejet Pro 8500 a909g, hpcups $Version"
       Attribute "ShortNickName" "" "HP Officejet Pro 8500 a909g"
       Attribute "1284DeviceID" "" "MFG:HP;MDL:officejet pro 8500 a909g;DES:officejet pro 8500 a909g;"
--- a/hplip-ui-optional.patch
+++ b/hplip-ui-optional.patch
@ -1,7 +1,7 @@
-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
+diff -up hplip-3.12.11/base/utils.py.ui-optional hplip-3.12.11/base/utils.py
+--- hplip-3.12.11/base/utils.py.ui-optional	2012-11-20 10:55:15.000000000 +0100
+++ hplip-3.12.11/base/utils.py	2012-11-27 10:03:21.909512264 +0100
+@@ -667,6 +667,13 @@ def checkPyQtImport(): # qt3
         if os.getenv('DISPLAY') and os.getenv('STARTED_FROM_MENU'):
             no_qt_message_gtk()
 
@ -15,12 +15,11 @@ diff -up hplip-3.9.6b/base/utils.py.ui-optional hplip-3.9.6b/base/utils.py
         log.error("PyQt not installed. GUI not available. Exiting.")
         return False
 
-@@ -642,7 +649,10 @@ def checkPyQtImport(): # qt3
- def checkPyQtImport4():
-     try:
+@@ -712,7 +719,8 @@ def checkPyQtImport4():
         import PyQt4
-+        import ui4
+         import ui4
     except ImportError:
+-        log.error("HPLIP is not installed properly or is installed without graphical support. Please reinstall HPLIP")
 +        # hplip-gui sub-package (Fedora) requires PyQt4
 +        log.error("Install the hplip-gui package for graphical support.")
         return False
--- a/hplip.spec
+++ b/hplip.spec
@ -17,8 +17,8 @@

 Summary:	HP printer/all-in-one driver infrastructure
 Name:		hplip
-Version:	3.13.8
-Release:	9
+Version:	3.13.10
+Release:	2
 License:	GPLv2+ and MIT
 Group:		System/Printing
 Url:		http://hplip.sourceforge.net/
@ -36,61 +36,44 @@ Source6:	README.urpmi
 Patch1:		hplip-3.11.3-mdv-link.patch
 # (Anssi) Apply udev rules even on ACTION=="change", otherwise the permissions
 # do not get applied in %%post on a new installation:
-Patch2:		hplip-apply-udev-rules-on-action-change.patch
+# Patch2:		hplip-apply-udev-rules-on-action-change.patch
+Patch3:		hplip-3.13.10-fix-systray-x.patch

 # Fedora patches
 Patch101:	hplip-pstotiff-is-rubbish.patch
 Patch102:	hplip-strstr-const.patch
 Patch103:	hplip-ui-optional.patch
 Patch104:	hplip-no-asm.patch
-Patch106:	hplip-mucks-with-spooldir.patch
+Patch105:       hplip-deviceIDs-drv.patch
+Patch107:       hplip-deviceIDs-ppd.patch
 Patch108:	hplip-retry-open.patch
 Patch109:	hplip-snmp-quirks.patch
-Patch110:	hplip-discovery-method.patch
 Patch111:	hplip-hpijs-marker-supply.patch
 Patch112:	hplip-clear-old-state-reasons.patch
-Patch113:	hplip-systray-dbus-exception.patch
 Patch114:	hplip-hpcups-sigpipe.patch
 Patch115:	hplip-logdir.patch
 Patch116:	hplip-bad-low-ink-warning.patch
-Patch118:	hplip-skip-blank-lines.patch
-Patch119:	hplip-dbglog-newline.patch
 Patch121:	hplip-ppd-ImageableArea.patch
-Patch122:	hplip-raw_deviceID-traceback.patch
-Patch123:	hplip-UnicodeDecodeError.patch
-Patch124:	hplip-3.12.9-addprinter.patch
-Patch125:	hplip-dbus-exception.patch
-Patch126:	hplip-notification-exception.patch
-Patch127:	hplip-CVE-2010-4267.patch
-Patch128:	hplip-wifisetup.patch
 # fedora patch not necessary. done via sed call
 #Patch129: hplip-makefile-chgrp.patch
-Patch130:	hplip-hpaio-localonly.patch
 Patch131:	hplip-ipp-accessors.patch
 Patch132: hplip-IEEE-1284-4.patch
 Patch133: hplip-check.patch
+Patch134:       hplip-3.13.10-fix-udev-rules.patch

 # Debian/Ubuntu patches
 # taken from http://patch-tracker.debian.org/package/hplip/3.11.7-1
 Patch201:	01_rss.dpatch
-Patch202:	10_shebang_fixes.dpatch
 Patch203:	14_charsign_fixes.dpatch
 Patch204:	85_rebuild_python_ui.dpatch
-Patch205:	87_move_documentation.dpatch
 Patch206:	hplip-photosmart_b9100_support.patch
 Patch207:	pjl-duplex-binding.dpatch
 #hplip-pjl-duplex-binding.patch
-Patch208:	mga-kde4-kdesudo-support.dpatch
+Patch208:	mga-kde4-kdesudo-support.patch
 Patch209:	hp-check-groups.dpatch
-#Patch210:	hp-check_debian.dpatch
-Patch211:	hp-setup-prompt-for-custom-PPD.dpatch
-Patch213:	hp-mkuri-take-into-account-already-installed-plugin-also-for-exit-value.dpatch
-#Patch214:	ubuntu-hp-mkuri-notification-text.dpatch
 Patch215:	simple-scan-as-default.dpatch
-Patch216:	make-commafy-correctly-work-with-python-2.dpatch
 # (doktor5000) rediff original debian patch for hplip 3.11.10
 Patch217:	hplip-3.11.10-mga-remove-duplicate-entry-for-cp1700-in-drv-files.patch
-Patch219:	try_libhpmud.so.0.dpatch
 Patch220:	add-lidil-two-cartridge-modes.dpatch
 Patch221:	add_missing_newline_for_error_log.dpatch
 Patch224:	hplip-syslog-fix-debug-messages-to-error.dpatch
@ -99,7 +82,6 @@ Patch226:	hp-systray-make-menu-title-visible-in-sni-qt-indicator.dpatch
 Patch227:	hp-systray-make-menu-appear-in-sni-qt-indicator-with-kde.dpatch
 Patch228:	hpaio-option-duplex.diff

-Patch301: fix-uninitialized-variables.patch
 Patch302: hplip-CVE-2013-4325.patch

 BuildRequires:	desktop-file-utils
@ -146,9 +128,11 @@ Requires:	wget
 Requires:	acl
 # hplip tools use internal symbols from libhplip that can change among versions
 Requires:	%{libhpip} = %{version}
-%py_requires -d
 # Some HP ppds are in foomatic-db and foomatic-db-hpijs (mdv bug #47415)
 Suggests:	foomatic-db-hpijs
+# hp-doctor requires gui modules
+Requires:	hplip-gui
+

 # foomatic-db-hpijs drivers are provided by hp and by this package now
 # NOTE: remove the foomatic-db-hpijs deps sometime in 2010-10-?? ?
@ -203,7 +187,7 @@ the "%{libhpip}" library.
 %package -n %{libsane}
 Summary:	SANE driver for scanners in HP's multi-function devices (from HPLIP)
 Group:		System/Printing
-Suggests:	sane-backends
+Requires(post):	sane-backends
 Provides:	sane-backends-hpaio = %{version}-%{release}
 # (cjw) for system-config-printer
 Provides:	libsane-hpaio
@ -269,7 +253,7 @@ flash memory cards.
 %prep
 %setup -qn %{name}-%{version}%{extraversion}

-%patch2 -p1 -b .udev~
+%patch3 -p1 -b .systray

 # Fedora patches

@ -285,9 +269,17 @@ flash memory cards.
 # Make sure to avoid handwritten asm.
 %patch104 -p1 -b .no-asm

-# Stopped hpcups pointlessly trying to read spool files
-# directly (RH bug #552572).
-%patch106 -p1 -b .mucks-with-spooldir
+%patch105 -p1 -b .ids
+
+for ppd_file in $(grep '^diff' %{PATCH107} | cut -d " " -f 4);
+do
+  gunzip ${ppd_file#*/}.gz
+done
+%patch107 -p1 -b .deviceIDs-ppd
+for ppd_file in $(grep '^diff' %{PATCH107} | cut -d " " -f 4);
+do
+  gzip -n ${ppd_file#*/}
+done

 # Retry when connecting to device fails (RH bug #532112).
 %patch108 -p1 -b .retry-open
@ -295,31 +287,20 @@ flash memory cards.
 # Mark SNMP quirks in PPD for HP OfficeJet Pro 8500 (RH bug #581825).
 %patch109 -p1 -b .snmp-quirks

-# Fixed hp-setup traceback when discovery page is skipped (RH bug #523685).
-%patch110 -p1 -b .discovery-method
-
 # Fixed bogus low ink warnings from hpijs driver (RH bug #643643).
 %patch111 -p1 -b .hpijs-marker-supply

 # Clear old printer-state-reasons we used to manage (RH bug #510926).
 %patch112 -p1 -b .clear-old-state-reasons

-%patch113 -p1 -b .systray-dbus-exception
-
 # Avoid busy loop in hpcups when backend has exited (RH bug #525944).
 %patch114 -p1 -b .hpcups-sigpipe

-#patch115 -p1 -b .logdir
+%patch115 -p1 -b .logdir

 # Fixed Device ID parsing code in hpijs's dj9xxvip.c (RH bug #510926).
 %patch116 -p1 -b .bad-low-ink-warning

-# Hpcups (ljcolor) was putting black lines where should be blank lines (RH bug #579461).
-%patch118 -p1 -b .skip-blank-lines
-
-# Added missing newline to string argument in dbglog() call (RH bug #585275).
-#patch119 -p1 -b .dbglog-newline
-
 # Fix ImageableArea for Laserjet 8150/9000 (RH bug #596298).
 for ppd_file in $(grep '^diff' %{PATCH121} | cut -d " " -f 4);
 do
@ -331,42 +312,15 @@ do
  gzip -n ${ppd_file#*/}
 done

-# Fixed traceback on error condition in device.py (RH bug #628125).
-%patch122 -p1 -b .raw_deviceID-traceback
-
-# Avoid UnicodeDecodeError in printsettingstoolbox.py (RH bug #645739).
-%patch123 -p1 -b .UnicodeDecodeError
-
-# Call cupsSetUser in cupsext's addPrinter method before connecting so
-# that we can get an authentication callback (RH bug #538352).
-%patch124 -p1 -b .addprinter
-
-# Catch D-Bus exceptions in fax dialog (RH bug #645316).
-%patch125 -p1 -b .dbus-exception
-
-# Catch GError exception when notification showing failed (RH bug #665577).
-#patch126 -p1 -b .notification-exception
-
-# Applied patch to fix CVE-2010-4267, remote stack overflow
-# vulnerability (RH bug #670252).
-#patch127 -p1 -b .CVE-2010-4267
-
-# Avoid KeyError in ui4/wifisetupdialog.py (RH bug #680939).
-%patch128 -p1 -b .wifisetup
-
 # Don't run 'chgrp lp /var/log/hp' in makefile (removes all lines with "chgrp")
 sed -i '/chgrp/d' Makefile.am

-# Pay attention to the SANE localOnly flag in hpaio (RH bug #743593).
-%patch130 -p1 -b .hpaio-localonly
-
 sed -i.duplex-constraints \
    -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
    prnt/drv/hpcups.drv.in

-#patch131 -p1 -b .ipp-accessors
 #patch132 -p1 -b .hplip-IEEE-1284-4
-#patch133 -p1 -b .check
+%patch134 -p1 -b .rules-fix

 # Debian/Ubuntu patches

@ -374,18 +328,12 @@ sed -i.duplex-constraints \
 # the black pen, if the printer supports it
 %patch201 -p1 -b .01_rss

-# shebang fixes
-%patch202 -p1 -b .10_shebang_fixes
-
 # code cleanup related to char signedness
 %patch203 -p1 -b .14_charsign

 # compiling ui files to py
 %patch204 -p1 -b .85_rebuild_python_ui

-# place html documentation under hplip-doc/HTML/
-%patch205 -p1 -b .87_move_documentation
-
 # Corrections on the models.dat entry for the HP PhotoSmart Pro B9100,
 # especially for the correct color calibration mode.
 %patch206 -p1 -b .hplip-photosmart_b9100_support
@ -395,28 +343,17 @@ sed -i.duplex-constraints \
 %patch207 -p1 -b .hplip-pjl-duplex-binding

 # original patch from debian, path to kdesu added for %%_libdir on x86_64
-%patch208 -p1 -b .mga-kde4-kdesudo-support
+# %patch208 -p1 -b .mga-kde4-kdesudo-support

 # https://bugs.launchpad.net/debian/+source/hplip/+bug/530746
 %patch209 -p1 -b .hp-check-groups

-%patch211 -p1 -b .hp-setup-prompt-for-custom-PPDs
-
-%patch213 -p1 -b .hp-mkuri-take-into-account-already-installed-plugin-also-for-exit-value
-
 # disable for now, as this changes default hplip behavior
 # and change in default scanning application should be decided by a poll first
 #%patch215 -p1 -b .simple-scan-as-default

-%patch216 -p1 -b .make-commafy-correctly-work-with-python-2
-
 #patch217 -p1 -b .mga-remove-duplicate-entry-for-cp1700-in-drv-files

-# dlopen libhpmud.so.0 instead of libhpmud.so, in order not to depend on
-# devel package (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=548379)
-# obsoletes hplip-3.9.8-dlopen-libhpmud.patch, newer & extended version
-%patch219 -p1 -b .try_libhpmud.so.0
-
 %patch220 -p1 -b .add-lidil-two-cartridge-modes
 # fixed by upstream
 #patch224 -p1 -b .hplip-syslog-fix-debug-messages-to-error
@ -429,7 +366,6 @@ sed -i.duplex-constraints \

 %patch228 -p1 -b .hpaio-option-duplex

-%patch301 -p0 -b .fix-uninitialized-variables
 %patch302 -p0

 # Use filter foomatic-rip instead of foomatic-rip-hplip (fix from Mandriva)
@ -460,7 +396,9 @@ WITHOUT_SANE="--without-sane"
 	--enable-gui-build \
 	--enable-fax-build \
 	--enable-pp-build \
-	--enable-qt4 --disable-qt3 \
+	--enable-qt4 \
+	--disable-qt3 \
+	--enable-foomatic-drv-install \
 	--enable-hpcups-install \
 	--enable-cups-drv-install \
 	--enable-cups-ppd-install \
@ -612,9 +550,7 @@ fi

 %post -n hplip-hpijs-ppds
 # Restart CUPS to make the printing PPDs known to it
-if [ -f /etc/init.d/cups ]; then
-	/sbin/service cups condrestart || :
-fi
+%_post_service cups

 %post -n hplip-hpijs
 %{_bindir}/hpcups-update-ppds &>/dev/null ||:
@ -647,15 +583,11 @@ fi
 %endif

 # Restart CUPS to make the removal of the Fax PPD known to it
-if [ -f /etc/init.d/cups ]; then
-	/sbin/service cups condrestart || :
-fi
+%_post_service cups

 %postun -n hplip-hpijs-ppds
 # Restart CUPS to make the removal of the printing PPDs known to it
-if [ -f /etc/init.d/cups ]; then
-	/sbin/service cups condrestart || :
-fi
+%_post_service cups

 %files
 %config(noreplace) %{_sysconfdir}/hp
@ -678,7 +610,6 @@ fi
 %{_bindir}/hp-logcapture
 %{_bindir}/hp-makecopies
 %{_bindir}/hp-makeuri
-%{_bindir}/hp-mkuri
 %{_bindir}/hp-pkservice
 %{_bindir}/hp-plugin
 %{_bindir}/hp-pqdiag
@ -709,7 +640,6 @@ fi
 # Note: this must be /usr/lib not %{_libdir}, since that's the
 # CUPS serverbin directory.
 %attr(0755,root,root) %{_prefix}/lib/cups/backend/hp*
-%{_prefix}/lib/cups/filter/hplipjs
 %{_prefix}/lib/cups/filter/hpcups
 %{_prefix}/lib/cups/filter/hpcupsfax
 %{_prefix}/lib/cups/filter/hpps
@ -773,8 +703,6 @@ fi
 %{_datadir}/dbus-1/system-services/com.hp.hplip.service
 %{_localstatedir}/lib/hp/hplip.state
 %{_docdir}/%{name}/README.urpmi
-%dir %attr(0774,root,lp) %{_localstatedir}/log/hp
-%dir %attr(1774,root,lp) %{_localstatedir}/log/hp/tmp
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/com.hp.hplip.conf
 #%{_sysconfdir}/cron.daily/hplip_cron
 %{_sysconfdir}/tmpfiles.d/hplip.conf
@ -829,6 +757,7 @@ fi
 # the link is here
 %dir %{_datadir}/ppd
 %dir %{_datadir}/ppd/HP
+%{_datadir}/cups/drv/hp/hpijs.drv
 %{_bindir}/hpcups-update-ppds

 %files hpijs-ppds
--- a/mga-kde4-kdesudo-support.dpatch
+++ b/mga-kde4-kdesudo-support.dpatch
@ -1,7 +1,7 @@
--- hplip-3.13.8/base/password.py	2013-08-07 06:04:02.000000000 +0000
-+++ hplip-3.13.8/base/password.py.tpg	2013-08-19 12:11:46.144834603 +0000
-@@ -271,6 +271,10 @@
- 
+--- hplip-3.13.10/base/password.py	2013-10-11 09:40:14.000000000 +0000
+++ hplip-3.13.10/base/password.py.tpg	2013-10-19 11:33:59.821243929 +0000
+@@ -297,6 +297,10 @@
+         '''
         if utils.which('kdesu'):
             AuthType, AuthCmd = 'kdesu', 'kdesu -- %s'
 +	elif utils.which('/usr/lib64/kde4/libexec/kdesu'):