[hplip: 5/5] Merge branch 'f21'

[Tim Waugh]

commit ec76937fead1b6abd9e939c25ec9e23cae780153
Merge: 29faf22 6bb19f5
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Nov 4 11:19:04 2014 +0000

    Merge branch 'f21'

 hplip-deviceIDs-drv.patch |   13 +++++++++++--
 hplip-deviceIDs-ppd.patch |   11 +++++++++++
 hplip.spec                |    9 ++++++++-
 3 files changed, 30 insertions(+), 3 deletions(-)
---
diff --cc hplip.spec
index fd8d41c,6a50125..718aa7d
--- a/hplip.spec
+++ b/hplip.spec
@@@ -7,7 -7,7 +7,7 @@@
  Summary: HP Linux Imaging and Printing Project
  Name: hplip
  Version: 3.14.10
--Release: 3%{?dist}
++Release: 4%{?dist}
  License: GPLv2+ and MIT
  
  Url: http://hplip.sourceforge.net/
@@@ -497,9 -495,11 +499,14 @@@ rm -f %{buildroot}%{_sysconfdir}/xdg/au
  %postun libs -p /sbin/ldconfig
  
  %changelog
 -* Tue Nov  4 2014 Tim Waugh <twaugh at redhat.com> - 3.14.10-3
++* Tue Nov  4 2014 Tim Waugh <twaugh at redhat.com> - 3.14.10-4
+ - IEEE 1284 Device ID for HP LaserJet Professional M1132 MFP
+   (bug #1158743 comment #5).
+ - IEEE 1284 Device ID for HP LaserJet Color M451dn (bug #1159380).
+ 
 +* Fri Oct 31 2014 Tim Waugh <twaugh at redhat.com> - 3.14.10-3
 +- Fixed build against libjpeg-turbo 1.3.90.
 +
  * Fri Oct 31 2014 Tim Waugh <twaugh at redhat.com> - 3.14.10-2
  - Fixed incorrect name in function call in makeURI when a parallel
    port device is used (bug #1159161).