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

[Jiří Popelka]

commit b6aa13e821f4bedb8b6a473091ad1f655a893fbd
Merge: b0b6551 f0218f3
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Thu Jul 7 17:15:40 2011 +0200

    Merge branch 'f15'

 cups-str3875.patch |   15 +++++++++++++++
 cups.spec          |    1 -
 2 files changed, 15 insertions(+), 1 deletions(-)
---
diff --cc cups.spec
index ec9fc6a,f40594c..0bfa384
--- a/cups.spec
+++ b/cups.spec
@@@ -45,29 -47,39 +45,28 @@@ Patch8: cups-direct-usb.patc
  Patch9: cups-lpr-help.patch
  Patch10: cups-peercred.patch
  Patch11: cups-pid.patch
 -Patch12: cups-page-label.patch
 -Patch13: cups-eggcups.patch
 -Patch14: cups-getpass.patch
 -Patch15: cups-driverd-timeout.patch
 -Patch16: cups-strict-ppd-line-length.patch
 -Patch17: cups-logrotate.patch
 -Patch18: cups-usb-paperout.patch
 -Patch19: cups-build.patch
 -Patch20: cups-res_init.patch
 -Patch21: cups-filter-debug.patch
 -Patch22: cups-uri-compat.patch
 -Patch23: cups-cups-get-classes.patch
 -Patch24: cups-str3382.patch
 -Patch25: cups-force-gnutls.patch
 -Patch26: cups-serialize-gnutls.patch
 -Patch27: cups-0755.patch
 -Patch28: cups-snmp-quirks.patch
 -Patch29: cups-hp-deviceid-oid.patch
 -Patch30: cups-dnssd-deviceid.patch
 -Patch31: cups-ricoh-deviceid-oid.patch
 -Patch32: cups-texttops-rotate-page.patch
 -Patch33: cups-usb-parallel.patch
 -Patch34: cups-str3535.patch
 -Patch35: cups-str3875.patch
 -
 -Patch40: cups-avahi-1-config.patch
 -Patch41: cups-avahi-2-backend.patch
 -Patch42: cups-avahi-3-timeouts.patch
 -Patch43: cups-avahi-4-poll.patch
 -Patch44: cups-avahi-5-services.patch
 -
 -Patch45: cups-icc.patch
 +Patch12: cups-eggcups.patch
 +Patch13: cups-getpass.patch
 +Patch14: cups-driverd-timeout.patch
 +Patch15: cups-strict-ppd-line-length.patch
 +Patch16: cups-logrotate.patch
 +Patch17: cups-usb-paperout.patch
 +Patch18: cups-build.patch
 +Patch19: cups-res_init.patch
 +Patch20: cups-filter-debug.patch
 +Patch21: cups-uri-compat.patch
 +Patch22: cups-cups-get-classes.patch
 +Patch23: cups-str3382.patch
 +Patch25: cups-0755.patch
 +Patch26: cups-snmp-quirks.patch
 +Patch27: cups-hp-deviceid-oid.patch
 +Patch28: cups-dnssd-deviceid.patch
 +Patch29: cups-ricoh-deviceid-oid.patch
 +
 +Patch31: cups-avahi.patch
 +Patch32: cups-icc.patch
 +Patch33: cups-systemd-socket.patch
  
- 
  Patch100: cups-lspp.patch
  
  Epoch: 1