[hplip: 3/3] Merge branch 'f17' into f18

[Jiří Popelka]

commit 88f272ae3757ec2582256b54982fbfc839e09c87
Merge: 22ea570 5e3cc2a
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Fri Sep 7 15:57:01 2012 +0200

    Merge branch 'f17' into f18

 .gitignore                 |    1 +
 hplip-3.12.6.tar.gz.asc    |    7 -------
 hplip-3.12.9.tar.gz.asc    |    7 +++++++
 hplip-addprinter.patch     |   22 +++++++++++-----------
 hplip-deviceIDs-drv.patch  |    9 ---------
 hplip-fax-ppd.patch        |   24 ------------------------
 hplip-makefile-chgrp.patch |   20 +++++++++++++++-----
 hplip-udev-rules.patch     |    2 +-
 hplip.spec                 |   21 +++++++++++++--------
 sources                    |    2 +-
 10 files changed, 49 insertions(+), 66 deletions(-)
---
diff --cc hplip.spec
index a88a4f9,d14e314..2c8707b
--- a/hplip.spec
+++ b/hplip.spec
@@@ -528,9 -529,10 +529,13 @@@ f
  %postun libs -p /sbin/ldconfig
  
  %changelog
+ * Fri Sep 07 2012 Jiri Popelka <jpopelka at redhat.com> 3.12.9-1
+ - 3.12.9
+ -- no longer needed: fax-ppd.patch
+ 
 +* Fri Jul 27 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.12.6-2
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 +
  * Tue Jun 19 2012 Jiri Popelka <jpopelka at redhat.com> 3.12.6-1
  - 3.12.6