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

[Jiří Popelka]

commit ef4ea0cef9e10b1c22cec1b337680201c52dd914
Merge: 99e97db 9f4e389
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Tue Oct 4 16:17:33 2011 +0200

    Merge branch 'f14' into f15

 .gitignore                |    1 +
 hplip-3.11.10.tar.gz.asc  |    7 +
 hplip-3.11.7.tar.gz.asc   |    7 -
 hplip-CVE-2011-2722.patch |   21 ---
 hplip-cups15.patch        |   11 --
 hplip-deviceIDs-drv.patch |  373 +++++++++++++++++++++++----------------------
 hplip-hpcups-crash.patch  |   12 --
 hplip-sane-crash.patch    |   25 ---
 hplip.spec                |  113 ++++++--------
 sources                   |    2 +-
 10 files changed, 249 insertions(+), 323 deletions(-)
---
diff --cc hplip.spec
index f1dccc2,8c8709b..c3e14ba
--- a/hplip.spec
+++ b/hplip.spec
@@@ -26,7 -24,7 +26,6 @@@ Patch9: hplip-snmp-quirks.patc
  Patch10: hplip-discovery-method.patch
  Patch11: hplip-hpijs-marker-supply.patch
  Patch12: hplip-clear-old-state-reasons.patch
- Patch13: hplip-hpcups-crash.patch
 -
  Patch14: hplip-hpcups-sigpipe.patch
  Patch15: hplip-fax-ppd.patch
  Patch16: hplip-bad-low-ink-warning.patch
@@@ -34,9 -32,8 +33,7 @@@ Patch17: hplip-deviceIDs-ppd.patc
  Patch18: hplip-skip-blank-lines.patch
  Patch19: hplip-dbglog-newline.patch
  Patch20: hplip-no-system-tray.patch
- Patch21: hplip-cups15.patch
  Patch22: hplip-ppd-ImageableArea.patch
- Patch23: hplip-sane-crash.patch
 -
  Patch25: hplip-raw_deviceID-traceback.patch
  Patch26: hplip-UnicodeDecodeError.patch
  Patch27: hplip-emit-SIGNAL.patch