Djam/hplip
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/hplip.git synced 2025-02-23 16:32:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rediff patches for the new version

Browse source
This commit is contained in:
Denis Silakov 2015-03-30 05:53:22 -04:00
parent f3aacb8437
commit d37d135d24
5 changed files with 342 additions and 1856 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
85_rebuild_python_ui.dpatch
View file

@ -1,12 +1,18 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 85_rebuild_python_ui.dpatch by <till.kamppeter@gmail.com>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
@DPATCH@
--- a/Makefile.am
+++ b/Makefile.am
diff -Naur hplip-3.15.2.orig/configure.in hplip-3.15.2/configure.in
--- hplip-3.15.2.orig/configure.in 2015-03-30 05:47:07.804427140 -0400
+++ hplip-3.15.2/configure.in 2015-03-30 05:48:11.035209618 -0400
@@ -531,6 +531,8 @@
[FOUND_HEADER=yes; break;])
AS_IF([test "x$FOUND_HEADER" != "xyes"],
[AC_MSG_ERROR([cannot find python-devel support], 6)])
+ AC_ARG_VAR([PYUIC4], [PyQT pyuic4 .ui to .py compiler command])
+ AC_CHECK_TOOLS([PYUIC4], [pyuic4])
fi
if test "$hpijs_only_build" = "no" && test "$scan_build" = "yes" && test "$hpcups_only_build" = "no"; then
diff -Naur hplip-3.15.2.orig/Makefile.am hplip-3.15.2/Makefile.am
--- hplip-3.15.2.orig/Makefile.am 2015-03-30 05:47:07.893426831 -0400
+++ hplip-3.15.2/Makefile.am 2015-03-30 05:47:08.758423824 -0400
@@ -3,6 +3,11 @@
#
# (c) 2004-2015 Copyright Hewlett-Packard Development Company, LP
@ -19,14 +25,3 @@
INCLUDES = -Iip -Iio/hpmud -Iscan/sane -Iprnt/hpijs -Icommon/
CFLAGS+= -DCONFDIR=\"$(hplip_confdir)\"
CXXFLAGS+= -DCONFDIR=\"$(hplip_confdir)\"
--- a/configure.in
+++ b/configure.in
@@ -536,6 +536,8 @@
AC_MSG_RESULT("using $PYTHONINCLUDEDIR")
AC_ARG_VAR(PYTHONINCLUDEDIR, [path to Python.h C header file])
AC_CHECK_HEADERS(python$PYTHON_VERSION/Python.h, ,[AC_MSG_ERROR([cannot find python-devel support], 6)])
+ AC_ARG_VAR([PYUIC4], [PyQT pyuic4 .ui to .py compiler command])
+ AC_CHECK_TOOLS([PYUIC4], [pyuic4])
fi
if test "$hpijs_only_build" = "no" && test "$scan_build" = "yes" && test "$hpcups_only_build" = "no"; then

1523
hplip-deviceIDs-drv.patch
View file

File diff suppressed because it is too large Load diff

605
hplip-deviceIDs-ppd.patch
View file

@ -1,594 +1,11 @@
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)"
diff -up hplip-3.14.10/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz-deviceid hplip-3.14.10/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd
--- hplip-3.14.10/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd.gz-deviceid 2014-11-04 09:41:13.200005393 +0000
+++ hplip-3.14.10/prnt/ps/hp-lj_300_400_color_m351_m451-ps.ppd 2014-11-04 09:42:13.168312042 +0000
@@ -82,6 +82,7 @@
*cupsManualCopies: False
*cupsLanguages: "en da de es fi fr it ja ko nb nl pt ru sv zh_CN zh_TW"
*cupsFilter: "application/vnd.cups-postscript 0 hpps"
+*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP LaserJet 400 color M451dn;DES:HP LaserJet 400 color M451dn;"
*UIConstraints: *HPOption_Duplexer False *Duplex
*UIConstraints: *Duplex *HPOption_Duplexer False
*UIConstraints: *HPOption_Tray3 False *InputSlot Tray3

20
hplip-logdir.patch
View file

@ -1,26 +1,24 @@
diff -Naur hplip-3.14.6.orig/prnt/hpcups/HPCupsFilter.cpp hplip-3.14.6/prnt/hpcups/HPCupsFilter.cpp
--- hplip-3.14.6.orig/prnt/hpcups/HPCupsFilter.cpp 2014-07-10 18:00:10.623877105 +0400
+++ hplip-3.14.6/prnt/hpcups/HPCupsFilter.cpp 2014-07-10 18:00:28.512876654 +0400
@@ -597,7 +597,7 @@
diff -up hplip-3.15.2/prnt/hpcups/HPCupsFilter.cpp.logdir hplip-3.15.2/prnt/hpcups/HPCupsFilter.cpp
--- hplip-3.15.2/prnt/hpcups/HPCupsFilter.cpp.logdir 2015-02-04 14:22:43.838774401 +0100
+++ hplip-3.15.2/prnt/hpcups/HPCupsFilter.cpp 2015-02-04 14:22:43.844774315 +0100
@@ -619,7 +619,7 @@ int HPCupsFilter::processRasterData(cups
char hpPreProcessedRasterFile[MAX_FILE_PATH_LEN]; //temp file needed to store raster data with swaped pages.
- sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name);
+ snprintf(hpPreProcessedRasterFile, sizeof(hpPreProcessedRasterFile), "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name);
+ snprintf(hpPreProcessedRasterFile, sizeof (hpPreProcessedRasterFile), "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name);
while (cupsRasterReadHeader2(cups_raster, &cups_header))
diff -Naur hplip-3.14.6.orig/prnt/hpcups/SystemServices.cpp hplip-3.14.6/prnt/hpcups/SystemServices.cpp
--- hplip-3.14.6.orig/prnt/hpcups/SystemServices.cpp 2014-07-10 18:00:10.645877105 +0400
+++ hplip-3.14.6/prnt/hpcups/SystemServices.cpp 2014-07-10 18:03:01.156872806 +0400
@@ -38,8 +38,8 @@
diff -up hplip-3.15.2/prnt/hpcups/SystemServices.cpp.logdir hplip-3.15.2/prnt/hpcups/SystemServices.cpp
--- hplip-3.15.2/prnt/hpcups/SystemServices.cpp.logdir 2015-02-04 14:22:43.844774315 +0100
+++ hplip-3.15.2/prnt/hpcups/SystemServices.cpp 2015-02-04 14:24:04.080626127 +0100
@@ -38,7 +38,7 @@ SystemServices::SystemServices(int iLogL
if (iLogLevel & SAVE_OUT_FILE)
{
char fname[MAX_FILE_PATH_LEN];
- sprintf(fname, "%s/hpcups_%s_out_job%d_XXXXXX",CUPS_TMP_DIR, user_name, job_id);
-
+ snprintf(fname, sizeof(fname), "%s/hpcups_%s_out_job%d_XXXXXX",CUPS_TMP_DIR, user_name, job_id);
+
createTempFile(fname, &m_fp);
if (m_fp)
{

15
hplip-pstotiff-is-rubbish.patch
View file

@ -1,7 +1,7 @@
diff -up hplip-3.11.7/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.11.7/fax/filters/pstotiff
--- hplip-3.11.7/fax/filters/pstotiff.pstotiff-is-rubbish 2011-07-24 21:06:43.000000000 +0200
+++ hplip-3.11.7/fax/filters/pstotiff 2011-07-25 13:42:27.776988201 +0200
@@ -1,40 +1,16 @@
diff -Naur hplip-3.15.2.orig/fax/filters/pstotiff hplip-3.15.2/fax/filters/pstotiff
--- hplip-3.15.2.orig/fax/filters/pstotiff 2015-03-30 05:41:08.462673535 -0400
+++ hplip-3.15.2/fax/filters/pstotiff 2015-03-30 05:41:59.756495969 -0400
@@ -1,45 +1,16 @@
-#!/usr/bin/env python
-
-import os
@ -10,6 +10,8 @@ diff -up hplip-3.11.7/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.11.7/fax/
-import sys
-import tempfile
-
-PY3 = sys.version_info[0] == 3
-
-READ_SIZE = 8192
-
-total_bytes_read = 0
@ -36,7 +38,10 @@ diff -up hplip-3.11.7/fax/filters/pstotiff.pstotiff-is-rubbish hplip-3.11.7/fax/
-out_handle = open(temp_out_fname, mode='rb')
-while (total_bytes_read < file_len):
- data = out_handle.read(READ_SIZE)
- sys.stdout.write(data)
- if PY3:
- sys.stdout.buffer.write(data)
- else:
- sys.stdout.write(data)
- total_bytes_read += READ_SIZE
-out_handle.close()
-