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

[Jiří Popelka]

commit a915c81689df91ddd1551e1127ce01e605538d05
Merge: 517c5c8 e1a4af0
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Mon Jul 25 14:33:12 2011 +0200

    Merge branch 'f15'

 .gitignore                      |    1 +
 hplip-3.11.3a.tar.gz.asc        |    7 -
 hplip-3.11.7.tar.gz.asc         |    7 +
 hplip-env-python.patch          |  315 ---------------------------------------
 hplip-pstotiff-is-rubbish.patch |   12 +-
 hplip-udev-rules.patch          |   13 +-
 hplip.spec                      |   15 +-
 sources                         |    1 +
 8 files changed, 29 insertions(+), 342 deletions(-)
---
diff --cc hplip.spec
index bad0c3e,15f7485..8e69b5e
--- a/hplip.spec
+++ b/hplip.spec
@@@ -532,9 -532,9 +532,12 @@@ f
  %postun libs -p /sbin/ldconfig
  
  %changelog
+ * Mon Jul 25 2011 Jiri Popelka <jpopelka at redhat.com> 3.11.7-1
+ - 3.11.7
+ 
 +* Mon Jul 11 2011 Jiri Popelka <jpopelka at redhat.com> 3.11.5-5
 +- rebuilt against new net-snmp-5.7
 +
  * Tue Jun 28 2011 Tim Waugh <twaugh at redhat.com> 3.11.5-4
  - Added Device ID for HP LaserJet Professional P1606dn (bug #708472).
  - Update IEEE 1284 Device IDs in hpijs.drv from hpcups.drv.