[hplip/f15/master: 2/2] Merge branch 'f14' into f15

[Jiří Popelka]

commit b088af832ca5890aeb57941248c4fe6f2eedeef6
Merge: 5cd9785 6fc5b7a
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Tue Mar 1 18:50:46 2011 +0100

    Merge branch 'f14' into f15

 hplip-deviceIDs-drv.patch |  277 +++++++++++++++++++++++----------------------
 hplip-deviceIDs-ppd.patch |   44 +++++++
 hplip-wifisetup.patch     |   12 ++
 hplip.spec                |   14 ++-
 4 files changed, 212 insertions(+), 135 deletions(-)
---
diff --cc hplip.spec
index b268363,8d5de86..4a172c8
--- a/hplip.spec
+++ b/hplip.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary: HP Linux Imaging and Printing Project
  Name: hplip
  Version: 3.11.1
- Release: 4%{?dist}
 -Release: 3%{?dist}
++Release: 5%{?dist}
  License: GPLv2+ and MIT
  Group: System Environment/Daemons
  Conflicts: system-config-printer < 0.6.132
@@@ -514,13 -518,13 +519,20 @@@ f
  %postun libs -p /sbin/ldconfig
  
  %changelog
 -* Tue Mar  1 2011 Jiri Popelka <jpopelka at redhat.com> 3.11.1-3
++* Tue Mar  1 2011 Jiri Popelka <jpopelka at redhat.com> 3.11.1-5
+ - Avoid KeyError in ui4/wifisetupdialog.py (bug #680939).
+ - Corrected IEEE 1284 Device IDs:
+   LaserJet 1300 (bug #670548)
+   LaserJet 3390 (bug #678565)
+   LaserJet P1505 (bug #680951)
+ 
 +* Tue Feb 22 2011 Tim Waugh <twaugh at redhat.com> - 3.11.1-4
 +- Ship hpijs.drv to give another driver option in case of problems
 +  with hpcups.
 +
 +* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.11.1-3
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 +
  * Fri Feb  4 2011 Tim Waugh <twaugh at redhat.com> - 3.11.1-2
  - Fixed typo causing ";marker-supply-low-warning" state reason to be
    reported by hpijs (bug #675151).