Update to HPLIP 3.15.6 (from 3.14.6)

Note: python3 support (listed below) has not been tested.


HPLIP 3.15.6 - This release has the following changes:
Added Support for the Following New Printers:

- HP DeskJet 2130 All-in-One Printer series
- HP DeskJet 2132 All-in-One Printer
- HP Deskjet 2546B All-in-One Printer
- HP Deskjet 2546P All-in-One Printer
- HP Deskjet 2546R All-in-One Printer
- HP DeskJet 3630 All-in-One Printer series
- HP DeskJet 3632 All-in-One
- HP Officejet 5744 e-All-in-One

Added support for the following new Distro's:

- Fedora 22

Issues fixed:

- Unable to capture 'error_log' while running 'hp-logcapture' on
  Fedora21.
- Error message is displayed while running 'hp-diagnose_queues' in
  terminal

Launchpad fixes:

1433557 - udev rules wrongly match on monitor hub, wrong invocation of
	  systemd unit, changes config files in udev rules
1438456 - hp-setup creates spurious cupsd process

HPLIP 3.15.4 - This release has the following changes:
Significant Changes:

- HPLIP Plugin support for ARMv6,ARMv7 and aarch64 architectures

Added Support for the Following New Printers:

-HP Color LaserJet Pro M252dw
-HP Color LaserJet Pro M252n
-HP Color LaserJet Pro MFP M277n
-HP Color LaserJet Pro MFP M277dw
-HP Color LaserJet Enterprise M553n
-HP Color LaserJet Enterprise M553dn
-HP Color LaserJet Enterprise M553x
-HP Color LaserJet Enterprise M553dh
-HP Color LaserJet Enterprise M552dn
-HP LaserJet Enterprise M604n
-HP LaserJet Enterprise M604dn
-HP LaserJet Enterprise M605dn
-HP LaserJet Enterprise M605n
-HP LaserJet Enterprise M605x
-HP LaserJet Enterprise M606x
-HP LaserJet Enterprise M606dn

Added support for the following new Distro's:

- Debian 8.0 (RC)
- LinuxMint 17.1
- Ubuntu 15.04 (Beta)

Issues fixed:

- "Auto agree with license" option is set by default while resolving the
  dependencies with auto installation of HPLIP

Launchpad fixes:

1328074 - Installation fails when Downloads directory does not exist
1424539 - Updated driver plugin information in website
1152219 - hplip driver plugin support for ARM architecture
1328601 - FC20 latest version of HPLIP the "ready light" keeps flashing
	  after print job is done
1388180 - hp-sendfax complains about Pre-2.0 version of Reportlab
1422004 - pkservice.py crashed with AttributeError in __init__():
          'module' object has no attribute 'MainLoop'

HPLIP 3.15.2 - This release has the following changes:
Significant Changes:

- Python3 support for HPLIP

Added support for the following new Distro's:

- Debian 7.7, 7.8
- OpenSuse 13.2
- Fedora 21

Launchpad fixes:

1388126 - Doesn't build against libjpeg-turbo 1.3.90
1395676 - hpcups crashes if DEVICE_URI not set in environment
1388007 - Incorrect call to hpmudext.device_open
1187055 - plugin download fails if python links to python3
802999  - Incorrect IEEE 1284 Device IDs for many models

HPLIP 3.14.10 - This release has the following changes:

Added Support for the Following New Printers:

- HP Deskjet 2541 All-in-One Printer
- HP Envy 4501 e-All-in-One
- HP Envy 4503 e-All-in-One
- HP Envy 4505 e-All-in-One
- HP Envy 4507 e-All-in-One
- HP Envy 4508 e-All-in-One
- HP ENVY 5534 e-All-in-One Printer
- HP Envy 5640 e-All-in-One
- HP Envy 5642 e-All-in-One
- HP Envy 5643 e-All-in-One
- HP Envy 5644 e-All-in-One
- HP Envy 5660 e-All-in-One
- HP Envy 5665 e-All-in-One
- HP Envy 7640 e-All-in-One
- HP Envy 7645 e-All-in-One
- HP LaserJet Pro MFP M125r
- HP LaserJet Pro MFP M125ra
- HP LaserJet Pro M201n Printer
- HP LaserJet Pro M201dw Printer
- HP LaserJet Pro M202n Printer
- HP LaserJet Pro M202dw Printer
- HP LaserJet Pro MFP M225rdn
- HP LaserJet Pro MFP M225dw
- HP LaserJet Pro MFP M225dn
- HP LaserJet Pro MFP M226dw
- HP LaserJet Pro MFP M226dn
- HP LaserJet Enterprise MFP M630dn
- HP LaserJet Enterprise MFP M630f
- HP LaserJet Enterprise MFP M630h
- HP LaserJet Enterprise Flow MFP M630z
- HP Officejet 5740 e-All-in-One
- HP Officejet 5742 e-All-in-One
- HP Officejet 5745 e-All-in-One
- HP OfficeJet 8040 e-All-in-One
- HP OfficeJet 6810 e-All-in-One  Printer Series
- HP OfficeJet 6812 e-All-in-One  Printer
- HP OfficeJet 6815 e-All-in-One  Printer
- HP Officejet 7612 Wide Format e-All-in-One Printer
- HP OfficeJet Pro 6230 ePrinter
- HP OfficeJet Pro 6830 e-All-in-one
- HP OfficeJet Pro 6835 e-All-in-one
- HP OfficeJet Pro 8616 e-All-in-One Printer


Added support for the following new Distro's:

- Debian 6.0.10
- Debian 7.6
- Ubuntu 14.10 Beta
- RHEL 7.0

Issues fixed:

- Traceback error occurs while configuring the device using
  'hp-setup <wrong input>'.
- Traceback error occurs while sending fax when SELinux is enabled.

Launchpad fixes:

250073  - Installation of 3.14.6 complains about failed install of
	  non-existing package cupsys-bsd on Debian 7.
1255033 - Updated comment in 56-hpmud.rules file

4 files changed, 50 insertions, 21 deletions

diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index 21c35568e4c..e9a85d9bcb6 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2015/06/12 10:50:58 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2015/06/14 21:50:53 schnoebe Exp $
 
-DISTNAME=		hplip-3.14.6
-PKGREVISION=		3
+DISTNAME=		hplip-3.15.6
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=hplip/}
 
diff --git a/print/hplip/PLIST.base b/print/hplip/PLIST.base
index bfffff3af1d..025069d2816 100644
--- a/print/hplip/PLIST.base
+++ b/print/hplip/PLIST.base
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.base,v 1.15 2014/06/09 01:11:32 schnoebe Exp $
+@comment $NetBSD: PLIST.base,v 1.16 2015/06/14 21:50:53 schnoebe Exp $
 bin/hp-align
 bin/hp-check
 bin/hp-clean
@@ -36,6 +36,7 @@ bin/hp-upgrade
 bin/hp-wificonfig
 bin/hpijs
 lib/libhpip.la
+lib/libhpipp.la
 lib/libhpmud.la
 ${PYSITELIB}/cupsext.la
 ${PYSITELIB}/hpmudext.la
@@ -128,8 +129,8 @@ share/hplip/base/os_utils.py
 share/hplip/base/os_utils.pyc
 share/hplip/base/password.py
 share/hplip/base/password.pyc
-share/hplip/base/pexpect.py
-share/hplip/base/pexpect.pyc
+share/hplip/base/pexpect/__init__.py
+share/hplip/base/pexpect/__init__.pyc
 share/hplip/base/pkit.py
 share/hplip/base/pkit.pyc
 share/hplip/base/pml.py
@@ -138,6 +139,10 @@ share/hplip/base/queues.py
 share/hplip/base/queues.pyc
 share/hplip/base/services.py
 share/hplip/base/services.pyc
+share/hplip/base/six.py
+share/hplip/base/six.pyc
+share/hplip/base/sixext.py
+share/hplip/base/sixext.pyc
 share/hplip/base/slp.py
 share/hplip/base/slp.pyc
 share/hplip/base/smart_install.py
@@ -488,14 +493,18 @@ share/hplip/ppd/HP/hp-color_laserjet_cp6015-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_cp6015-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz
+share/hplip/ppd/HP/hp-color_laserjet_m552-ps.ppd.gz
+share/hplip/ppd/HP/hp-color_laserjet_m553-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_m651-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_m750-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_m855-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_mfp_m680-ps.ppd.gz
+share/hplip/ppd/HP/hp-color_laserjet_pro_m252-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_pro_mfp_m176n-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_pro_mfp_m176n.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_pro_mfp_m177fw-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_pro_mfp_m177fw.ppd.gz
+share/hplip/ppd/HP/hp-color_laserjet_pro_mfp_m277-ps.ppd.gz
 share/hplip/ppd/HP/hp-color_laserjet_pro_mfp_m476-ps.ppd.gz
 share/hplip/ppd/HP/hp-cp1160-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-cp1160.ppd.gz
@@ -565,6 +574,8 @@ share/hplip/ppd/HP/hp-deskjet_2020_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_2020_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_2050_j510_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_2050_j510_series.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_2130_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_2130_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_2510_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_2510_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_2520_series-hpijs.ppd.gz
@@ -603,6 +614,8 @@ share/hplip/ppd/HP/hp-deskjet_3550-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3550.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3600-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3600.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_3630_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-deskjet_3630_series.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3650-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3650.ppd.gz
 share/hplip/ppd/HP/hp-deskjet_3740-hpijs.ppd.gz
@@ -901,6 +914,12 @@ share/hplip/ppd/HP/hp-envy_4500_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-envy_4500_series.ppd.gz
 share/hplip/ppd/HP/hp-envy_5530_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-envy_5530_series.ppd.gz
+share/hplip/ppd/HP/hp-envy_5640_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-envy_5640_series.ppd.gz
+share/hplip/ppd/HP/hp-envy_5660_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-envy_5660_series.ppd.gz
+share/hplip/ppd/HP/hp-envy_7640_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-envy_7640_series.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_1000-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_1000.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_1005_series-hpijs.ppd.gz
@@ -1216,6 +1235,7 @@ share/hplip/ppd/HP/hp-laserjet_cp_1025.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_cp_1025nw-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_cp_1025nw.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_flow_mfp_m525-ps.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_flow_mfp_m630-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_flow_mfp_m830-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m1005-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m1005.ppd.gz
@@ -1261,6 +1281,7 @@ share/hplip/ppd/HP/hp-laserjet_m5035_mfp-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m5035_mfp-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m5039_mfp-hpijs-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m5039_mfp-pcl3.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_m604_m605_m606-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m806-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m9040_mfp-hpijs-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m9040_mfp-pcl3.ppd.gz
@@ -1272,6 +1293,7 @@ share/hplip/ppd/HP/hp-laserjet_m9059_mfp-hpijs-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m9059_mfp-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_m9059_mfp-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_mfp_m521-ps.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_mfp_m630-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_mfp_m725-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_p1005-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_p1005.ppd.gz
@@ -1361,12 +1383,17 @@ share/hplip/ppd/HP/hp-laserjet_p4515x-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_p4515x.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_p4515xm-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_p4515xm.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_pro_m201_m202-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_m701-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_m706-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_mfp_m125a-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_mfp_m125a.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_mfp_m125nw-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_mfp_m125nw.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_pro_mfp_m125r-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_pro_mfp_m125r.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_pro_mfp_m125ra-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_pro_mfp_m125ra.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_mfp_m125rnw-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_mfp_m125rnw.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_mfp_m126a-hpijs.ppd.gz
@@ -1385,6 +1412,7 @@ share/hplip/ppd/HP/hp-laserjet_pro_mfp_m128fp-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_mfp_m128fp.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_mfp_m128fw-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_mfp_m128fw.ppd.gz
+share/hplip/ppd/HP/hp-laserjet_pro_mfp_m225_m226-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_pro_mfp_m435-ps.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-laserjet_professional_m1132_mfp.ppd.gz
@@ -1512,6 +1540,8 @@ share/hplip/ppd/HP/hp-officejet_5500_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_5500_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_5600_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_5600_series.ppd.gz
+share/hplip/ppd/HP/hp-officejet_5740_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-officejet_5740_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_6000_e609a-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_6000_e609a.ppd.gz
 share/hplip/ppd/HP/hp-officejet_6000_e609n-hpijs.ppd.gz
@@ -1538,6 +1568,8 @@ share/hplip/ppd/HP/hp-officejet_6600-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_6600.ppd.gz
 share/hplip/ppd/HP/hp-officejet_6700-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_6700.ppd.gz
+share/hplip/ppd/HP/hp-officejet_6800-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-officejet_6800.ppd.gz
 share/hplip/ppd/HP/hp-officejet_7000_e809a-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_7000_e809a.ppd.gz
 share/hplip/ppd/HP/hp-officejet_7000_e809a_series-hpijs.ppd.gz
@@ -1556,6 +1588,8 @@ share/hplip/ppd/HP/hp-officejet_7500_e910-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_7500_e910.ppd.gz
 share/hplip/ppd/HP/hp-officejet_7610_series-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_7610_series.ppd.gz
+share/hplip/ppd/HP/hp-officejet_8040_series-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-officejet_8040_series.ppd.gz
 share/hplip/ppd/HP/hp-officejet_9100_series-hpijs-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-officejet_9100_series-pcl3.ppd.gz
 share/hplip/ppd/HP/hp-officejet_color_mfp_x585.ppd.gz
@@ -1615,6 +1649,10 @@ share/hplip/ppd/HP/hp-officejet_pro_3620.ppd.gz
 share/hplip/ppd/HP/hp-officejet_pro_451_series-ps.ppd.gz
 share/hplip/ppd/HP/hp-officejet_pro_476_576_series-ps.ppd.gz
 share/hplip/ppd/HP/hp-officejet_pro_551_series-ps.ppd.gz
+share/hplip/ppd/HP/hp-officejet_pro_6230-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-officejet_pro_6230.ppd.gz
+share/hplip/ppd/HP/hp-officejet_pro_6830-hpijs.ppd.gz
+share/hplip/ppd/HP/hp-officejet_pro_6830.ppd.gz
 share/hplip/ppd/HP/hp-officejet_pro_8000_a809-hpijs.ppd.gz
 share/hplip/ppd/HP/hp-officejet_pro_8000_a809.ppd.gz
 share/hplip/ppd/HP/hp-officejet_pro_8000_enterprise_a811a-ps.ppd.gz
diff --git a/print/hplip/distinfo b/print/hplip/distinfo
index 1a924587371..01996b50f08 100644
--- a/print/hplip/distinfo
+++ b/print/hplip/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.15 2014/06/09 01:11:32 schnoebe Exp $
+$NetBSD: distinfo,v 1.16 2015/06/14 21:50:53 schnoebe Exp $
 
-SHA1 (hplip-3.14.6.tar.gz) = 3688ce1378be1372ce00b13ef1cd74d687ecd1ac
-RMD160 (hplip-3.14.6.tar.gz) = 03d7add869cafaec151e3c2c37964e187f415689
-Size (hplip-3.14.6.tar.gz) = 21603895 bytes
+SHA1 (hplip-3.15.6.tar.gz) = dba9839d3daf1a2dc464a0d3094ba9b71fea422c
+RMD160 (hplip-3.15.6.tar.gz) = ded043f1c5c03949957057647f5e3bbeda3d6885
+Size (hplip-3.15.6.tar.gz) = 21956752 bytes
 SHA1 (patch-aa) = 68bede16003a2d43c93a0ef547857b9e4196312e
 SHA1 (patch-ab) = 82b8ab80f778a6a31c1031688d9a16dbd4c55462
 SHA1 (patch-ae) = 0dfdef7ebb56b04c7d910bf0add1a035fc32a7e7
 SHA1 (patch-io_hpmud_musb.h) = ad634f5a1f426877e1c88916b6468fcdb7598555
 SHA1 (patch-prnt_hpijs_context2.cpp) = f81148c1c334a9074453b27ac055833cd1669bd0
 SHA1 (patch-prnt_hpijs_hjzjscolor.cpp) = 5ca9c828ba4aff17a54a803d79c2dc169975d50c
-SHA1 (patch-scan.py) = 6f861843ee3b990cc1eaaa0d957cdfd5e6f5f262
+SHA1 (patch-scan.py) = 4d942ee0580d5f1818e43164c07edd018529395d
diff --git a/print/hplip/patches/patch-scan.py b/print/hplip/patches/patch-scan.py
index 8780f861b30..8d8441f5ffa 100644
--- a/print/hplip/patches/patch-scan.py
+++ b/print/hplip/patches/patch-scan.py
@@ -1,10 +1,10 @@
-$NetBSD: patch-scan.py,v 1.2 2013/04/12 03:47:30 schnoebe Exp $
+$NetBSD: patch-scan.py,v 1.3 2015/06/14 21:50:53 schnoebe Exp $
 
 Try to work better with multiple versions of Python
 
 --- scan.py.orig	2013-03-08 07:15:32.000000000 +0000
 +++ scan.py
-@@ -665,7 +665,7 @@ try:
+@@ -688,7 +688,7 @@ try:
          scan_area = (brx - tlx) * (bry - tly) # mm^2
  
          valid_res = device.getOptionObj('resolution').constraint
@@ -13,11 +13,3 @@ Try to work better with multiple versions of Python
          if 0 in valid_res: #min-max range in tuple
             if res < valid_res[0] or res > valid_res[1]:
               log.warn("Invalid resolution. Using closest valid resolution of %d dpi" % res)
-@@ -678,6 +678,7 @@ try:
-           if res not in valid_res:
-             log.warn("Invalid resolution. Using closest valid resolution of %d dpi" % res)
-             log.warn("Valid resolutions are %s dpi." % ', '.join([str(x) for x in valid_res]))
-+	    r = res
-             res = valid_res[0]
-             min_dist = sys.maxint
-             for x in valid_res: