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

[Tim Waugh]

commit d6f50937a8ef79934f4d8667ed1c8c04b3481cad
Merge: 72d2aba 39e46cc
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Mar 10 13:43:40 2011 +0000

    Merge branch 'f14'

 cups-lspp.patch |    2 +-
 cups.spec       |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --cc cups.spec
index e026e98,6c2ee6e..d958ab1
--- a/cups.spec
+++ b/cups.spec
@@@ -610,31 -572,19 +610,32 @@@ rm -rf $RPM_BUILD_ROO
  %{php_extdir}/phpcups.so
  
  %changelog
 -* Thu Mar 10 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.6-7
 +* Thu Mar 10 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.6-14
 +- Fixed some typos in colord patch.
+ - LSPP: only warn when unable to get printer context.
  
 -* Fri Feb 25 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.6-6
 +* Mon Mar 07 2011 Richard Hughes <rhughes at redhat.com> 1:1.4.6-13
 +- Updated colord patch.
 +
 +* Fri Feb 25 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.6-12
  - Fixed build failure due to php_zend_api macro type.
  
 -* Fri Feb 25 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.6-5
 +* Fri Feb 25 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.6-11
  - Fixed dbus notifier support for job-state-changed.
  
 -* Thu Feb 10 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.4.6-4
 +* Thu Feb 10 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.4.6-10
  - Remove testing cups-usb-buffer-size.patch (bug #661814).
  
 -* Tue Jan 18 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.6-3
 +* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.4.6-9
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 +
 +* Tue Feb 01 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.4.6-8
 +- Use Till's patch to fix USB-Parallel adapter cable problem (bug #624564).
 +
 +* Tue Jan 25 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.6-7
 +- Some fixes for the AvahiClient callback (bug #672143).
 +
 +* Tue Jan 18 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.6-6
  - Don't use --enable-pie configure option as it has been removed and
    is now assumed.  See STR #3691.