[hplip/f17: 2/2] Merge branch 'f16' into f17

[Jiří Popelka]

commit cc5cbe579436aadec8dd7dff87c8b98c7c9d65bf
Merge: 833fd40 90fce7b
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Tue Jun 19 11:40:12 2012 +0200

    Merge branch 'f16' into 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              |   22 +++++-----
 hplip.spec                          |   13 +++--
 sources                             |    2 +-
 10 files changed, 126 insertions(+), 122 deletions(-)
---
diff --cc hplip.spec
index 1024a2a,71047b0..5be5b55
--- a/hplip.spec
+++ b/hplip.spec
@@@ -528,9 -528,9 +528,12 @@@ 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).
 +
  * Thu Apr 12 2012 Jiri Popelka <jpopelka at redhat.com> 3.12.4-1
  - 3.12.4