[hplip: 4/5] Merge branch 'f12' into f13

[Tim Waugh]

commit 62a88db90c836c41ed438f78b3c6c4714c16cdf3
Merge: eac7b83 d6ff8e4
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Aug 25 12:11:39 2010 +0100

    Merge branch 'f12' into f13

 hplip-fax-ppd.patch     |   20 ++++++++++++++++++++
 hplip-snmp-quirks.patch |   17 +++++++++++++----
 hplip.spec              |   12 +++++++++++-
 3 files changed, 44 insertions(+), 5 deletions(-)
---
diff --cc hplip.spec
index 6fac4b7,f821397..16afa6b
--- a/hplip.spec
+++ b/hplip.spec
@@@ -26,17 -26,15 +26,18 @@@ Patch9: hplip-snmp-quirks.patc
  Patch10: hplip-discovery-method.patch
  Patch11: hplip-device-reconnected.patch
  Patch12: hplip-clear-old-state-reasons.patch
 +Patch13: hplip-env-python.patch
  Patch14: hplip-hpcups-sigpipe.patch
++Patch15: hplip-fax-ppd.patch
  Patch16: hplip-bad-low-ink-warning.patch
 -Patch17: hplip-skip-blank-lines.patch
 -Patch18: hplip-dbglog-newline.patch
 -Patch19: hplip-no-system-tray.patch
 -Patch20: hplip-openPPD.patch
 -Patch21: hplip-ppd-ImageableArea.patch
 +Patch17: hplip-deviceIDs-ppd.patch
 +Patch18: hplip-skip-blank-lines.patch
 +Patch19: hplip-dbglog-newline.patch
 +Patch20: hplip-no-system-tray.patch
 +Patch21: hplip-openPPD.patch
 +Patch22: hplip-ppd-ImageableArea.patch
  
 -BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  Requires(pre): /sbin/service
  Requires(post): /sbin/chkconfig
@@@ -178,6 -166,6 +179,9 @@@ rm -rf $RPM_BUILD_DIR/%{name}-%{version
  # Avoid busy loop in hpcups when backend has exited (bug #525944).
  %patch14 -p1 -b .hpcups-sigpipe
  
++# Use correct fax PPD name for Qt3 UI.
++%patch15 -p1 -b .fax-ppd
++
  # Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926).
  %patch16 -p1 -b .bad-low-ink-warning
  
@@@ -446,15 -412,14 +450,21 @@@ f
  %{_bindir}/hpcups-update-ppds &>/dev/null ||:
  
  %changelog
+ * Fri Aug 20 2010 Tim Waugh <twaugh at redhat.com> - 3.10.6-3
+ - Added another SNMP quirk for an OfficeJet Pro 8500 variant.
+ 
+ * Thu Aug 12 2010 Tim Waugh <twaugh at redhat.com> - 3.10.6-2
+ - Use correct fax PPD name for Qt3 UI.
+ 
  * Tue Jul 27 2010 Jiri Popelka <jpopelka at redhat.com> - 3.10.6-1
  - 3.10.6.
 +- Changed shebang /usr/bin/env python -> /usr/bin/python (bug #618351).
 +- Corrected IEEE 1284 Device IDs:
 +  - HP Color LaserJet CP1518ni (bug #613689).
 +  - HP Color LaserJet 2600n (bug #613712).
 +
 +* Mon Jun 24 2010 Jiri Popelka <jpopelka at redhat.com> - 3.10.5-7
 +- Added COPYING to common sub-package.
  
  * Mon Jun 24 2010 Jiri Popelka <jpopelka at redhat.com> - 3.10.5-6
  - Main package requires explicit version of hplip-libs.