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

[Tim Waugh]

commit ad385de82c1bcaea2345d754aedf938bd87bf320
Merge: d79d7b8 ffb1be1
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Jun 28 13:02:53 2011 +0100

    Merge branch 'f14' into f15

 copy-deviceids.py         |   73 +++++++++
 hplip-deviceIDs-drv.patch |  369 +++++++++++++++++++++++----------------------
 hplip.spec                |   13 ++-
 3 files changed, 274 insertions(+), 181 deletions(-)
---
diff --cc hplip.spec
index f168b37,d538b36..aecdce8
--- a/hplip.spec
+++ b/hplip.spec
@@@ -525,8 -523,11 +532,12 @@@ f
  %postun libs -p /sbin/ldconfig
  
  %changelog
+ * 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.
+ 
  * Fri Jun 10 2011 Tim Waugh <twaugh at redhat.com> 3.11.5-3
 +- Fix building against CUPS 1.5.
  - Re-create installed hpcups PPDs unconditionally (bug #712241).
  
  * Thu May 19 2011 Jiri Popelka <jpopelka at redhat.com> 3.11.5-2