[hplip: 4/4] Merge branch 'f17'

[Jiří Popelka]

commit be34c686623b5f8b0ff1ede2cbf17ac66c73fd52
Merge: bb41d65 cc5cbe5
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Tue Jun 19 11:41:59 2012 +0200

    Merge branch 'f17'

 .gitignore                          |    1 +
 hplip-3.12.4.tar.gz.asc             |    7 ---
 hplip-3.12.6.tar.gz.asc             |    7 +++
 hplip-clear-old-state-reasons.patch |   28 ++++++------
 hplip-dbglog-newline.patch          |   82 +++++++++++++++++-----------------
 hplip-mucks-with-spooldir.patch     |   60 +++++++++++++-------------
 hplip-snmp-quirks.patch             |   26 ++++++------
 hplip-udev-rules.patch              |   20 ++++----
 hplip.spec                          |   11 +++--
 sources                             |    2 +-
 10 files changed, 124 insertions(+), 120 deletions(-)
---
diff --cc hplip.spec
index cca47ca,5be5b55..fdbc150
--- a/hplip.spec
+++ b/hplip.spec
@@@ -528,12 -528,11 +528,15 @@@ f
  %postun libs -p /sbin/ldconfig
  
  %changelog
+ * Tue Jun 19 2012 Jiri Popelka <jpopelka at redhat.com> 3.12.6-1
+ - 3.12.6
+ 
 -* Wed May  2 2012 Tim Waugh <twaugh at redhat.com> 3.12.4-2
 -- Rebuilt to fix ID tags (bug #818278).
 +* Tue Jun 05 2012 Jiri Popelka <jpopelka at redhat.com> 3.12.4-3
 +- Require systemd instead of udev.
 +
 +* Mon Apr 30 2012 Tim Waugh <twaugh at redhat.com> 3.12.4-2
 +- The hpijs sub-package no longer requires cupsddk-drivers (which no
 +  longer exists as a real package), but cups >= 1.4.
  
  * Thu Apr 12 2012 Jiri Popelka <jpopelka at redhat.com> 3.12.4-1
  - 3.12.4