HPLIP 3.12.10a:

    Fixed crash in HP Device Manager and System Tray due to ValueError
    exception in HPLIP upgrade functionality

    1064889 - HP System Tray and Device Manager fails with ValueError exception

HPLIP 3.12.10:

    Added Support for the Following New Printers:
	- HP Deskjet Ink Advantage 2020HC Printer
	- HP Deskjet Ink Advantage 2520HC  All-in-One
	- HP Envy 120 e-All-in-One
	- HP Envy 121 e-All-in-One
	- HP HotSpot LaserJet Pro M1218nfs MFP
	- HP OfficeJet 150 Mobile All-in-One

    Lunchpad fixes:
	1054584 - data/rules/hplip_cron only works with English locale
	1048732 - hp binary plugin installation fails

    Issues fixed:
	- Cannot scan resolution on a Photosmart C6380
	- Device communication error after alignment operation from Toolbox

    Detailed Change Log:
	- Added permission in 'hp-logcapture' tool


HPLIP 3.12.9:

    Significant Changes:
	- Added logcapture tool. User can collect logs by running
	  'hp-logcapture' command for any issue in print/scan/fax functionality

    Added Support for the Following New Printers:
	- HP DeskJet 3510 All-in-One
	- HP DeskJet 3511 e-All-in-One
	- HP DeskJet 3512 e-All-in-One
	- HP DeskJet Ink Advantage 6525 e-All-in-One
	- HP DeskJet Ink Advantage 3515 e-All-in-One
	- HP DeskJet Ink Advantage 3516 e-All-in-One
	- HP LaserJet Pro 200 color MFP M276nw
	- HP LaserJet Pro 200 color MFP M276n
	- HP LaserJet Pro M251nw Color Printer
	- HP LaserJet Pro M251n Color Printer
	- HP Photosmart 7520 e-All-in-One
	- HP Photosmart 7525 e-All-in-One
	- HP Photosmart 6520 e All-in-One
	- HP Photosmart 6525 e All-in-One


    Launchpad fixes:
	452113  - Installing hplip-systray.desktop and hplip.desktop only if gui
		  build is enabled
	482674  - Support for xdg-open in base/utils.py
	889008  - Scanning in grayscale with HP LaserJet Pro M1212nf give wrong
		  aspect ratio image
	932918  - Configure fix for hpcups_only_build
	1012004 - HP LaserJet M1536nf MFP fails to install on Ubuntu 12.04
	1019826 - Failed plugin install for HP_CP_1025nw
	1029052 - WiFi configuration through USB connection is giving I/O error
		  with DeskJet 3050 610a
	1015319 - Scanning with version 3.12.6 results in End Of File error
		  messages
	1032919 - Use consistent EOL markers


    Issues fixed:
	- Device IO error occurs when configuring or perform Scan operation from
	  toolbox with PhotoSmart 6510 Series
	- Secure Printing(Pin to Print) support for LaserJet M9040 Multifunction
	  Printer
	- Economode is not working as expected with LaserJet 2055dn
	- Duplex printing does not happen in Ubuntu 10.04 and Document Viewer
	  not showing the duplex options in all distributions
	- Fixed incorrect PPD picking issue during auto-plugin
	- Fixed WiFi configuration issue for LaserJet 400 M401, LaserJet 400 MFP
	  M425, LaserJet Professional M1217 nfw MFP etc.
	- Plugin Installation UI is not popping up while connecting the plugin
	  supported device via USB with Fedora17 32bit OS
	- Radio button controls in HP Device Manager do not match default
	  settings in Driver's PPD
	- Align functionality is not working with PhotoSmart 6510 Series,
	  DeskJet 2050 J510, DeskJet 3050A J611, OfficeJet 6500 E710
	- Clean job does not work for the second time and throws Device
	  Communication error
	- 'hp-levels' command does not give any details when execute from
	  terminal with OfficeJet 7500 E910, DeskJet 3050A J611 and Envy 100 D410
	- Fixed scan issue with Photosmart Prem C310 series
	- Command 'hp-scan -contrast=<contrast>' does not work in terminal
	- Updated Manual Instructions for Debian OS

    Detailed Change Log:
	- Added Chinese string to accept password during Chinese OS installation
	- Changes done for PrivateTmp feature. Logs get stored in
	  /var/log/hp/tmp

1 files changed, 2 insertions, 9 deletions

diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index c0744e0c331..28853e0be5b 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2012/10/08 23:02:20 adam Exp $
+# $NetBSD: Makefile,v 1.11 2012/11/18 00:50:42 schnoebe Exp $
 #
 
-DISTNAME=		hplip-3.12.6
-PKGREVISION=		5
+DISTNAME=		hplip-3.12.10a
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=hplip/}
 
@@ -72,12 +71,6 @@ REPLACE_PERL=		prnt/filters/hpcac prnt/hpijs/foomatic-rip-hplip
 
 PY_PATCHPLIST=		yes
 
-SUBST_CLASSES+=			strip-cr
-SUBST_STAGE.strip-cr=		post-extract
-SUBST_MESSAGE.strip-cr=		Strip trailing carriage returns
-SUBST_FILES.strip-cr=		prnt/hpcups/HPCupsFilter.cpp
-SUBST_FILTER_CMD.strip-cr=	${TR} -d '\r'
-
 SUBST_CLASSES+=			fix-python
 SUBST_STAGE.fix-python=		post-configure
 SUBST_MESSAGE.fix-python=	Fixing python invocations in Python files.