[hplip/f16: 3/3] Merge branch 'f15' into f16

[Tim Waugh]

commit 2808bbeff6b70abdbe8eaa491d0a9516ea0a0da4
Merge: 8baddeb 3ae281b
Author: Tim Waugh <twaugh at redhat.com>
Date:   Mon Nov 21 16:08:37 2011 +0000

    Merge branch 'f15' into f16

 hplip-deviceIDs-ppd.patch |  604 +++++++++++++++++++++++----------------------
 hplip.spec                |    6 +-
 2 files changed, 318 insertions(+), 292 deletions(-)
---
diff --cc hplip.spec
index 032c9ee,197da20..e81adab
--- a/hplip.spec
+++ b/hplip.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary: HP Linux Imaging and Printing Project
  Name: hplip
  Version: 3.11.10
- Release: 10%{?dist}
 -Release: 8%{?dist}
++Release: 11%{?dist}
  License: GPLv2+ and MIT
  Group: System Environment/Daemons
  Conflicts: system-config-printer < 0.6.132
@@@ -536,24 -533,18 +537,27 @@@ f
  %postun libs -p /sbin/ldconfig
  
  %changelog
 -* Mon Nov 21 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-8
++* Mon Nov 21 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-11
+ - Added IEEE 1284 Device ID for Designjet T770 (bug #747957).
+ 
 -* Wed Nov 16 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-7
 +* Wed Nov 16 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-10
  - Corrected IEEE 1284 Device ID for LaserJet M1120 MFP (bug #754139).
  
 -* Wed Nov 16 2011 Jiri Popelka <jpopelka at redhat.com> 3.11.10-6
 +* Wed Nov 16 2011 Jiri Popelka <jpopelka at redhat.com> 3.11.10-9
  - revert prnt/hpcups/HPCupsFilter.cpp 3.11.5->3.11.7 change (bug #738089).
  
 -* Tue Oct 25 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-5
 +* Wed Oct 26 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.11.10-8
 +- Rebuilt for glibc bug#747377
 +
 +* Tue Oct 25 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-7
  - Catch DBusException in hp-systray (bug #746024).
  
 +* Mon Oct 24 2011 Jiri Popelka <jpopelka at redhat.com> 3.11.10-6
 +- Move udev rules to /lib/udev/rules.d (bug #748208).
 +
 +* Thu Oct 20 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-5
 +- Pay attention to the SANE localOnly flag in hpaio (bug #743593).
 +
  * Mon Oct 17 2011 Tim Waugh <twaugh at redhat.com> 3.11.10-4
  - Corrected IEEE 1284 Device ID for LaserJet M1319f MFP (bug #746614)