[cups/f13/master: 2/2] Merge branch 'f12' into f13

[Tim Waugh]

commit c8ee3cffd729b0907eacf140602874f31aedc686
Merge: d52d3c8 529334a
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Sep 15 13:29:47 2010 +0100

    Merge branch 'f12' into f13

 cups-serverbin-compat.patch |   54 ++++++++++++++++++++++--------------------
 cups.spec                   |    4 +++
 2 files changed, 32 insertions(+), 26 deletions(-)
---
diff --cc cups.spec
index 42aeacc,f97f5c1..7d3cd35
--- a/cups.spec
+++ b/cups.spec
@@@ -571,25 -578,16 +571,29 @@@ rm -rf $RPM_BUILD_ROO
  %{php_extdir}/phpcups.so
  
  %changelog
+ * Wed Sep 15 2010 Tim Waugh <twaugh at redhat.com>
+ - Fixed serverbin-compat patch to avoid misleading "filter not
+   available" messages (bug #633779).
+ 
 -* Fri Aug 20 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.4-7
 +* Mon Aug 23 2010 Tim Waugh <twaugh at redhat.com>
 +- Fixed SNMP quirks parsing.
 +
 +* Fri Aug 20 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.4-9
  - Use better upstream fix for STR #3608 (bug #606909).
  
 -* Tue Aug  3 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.4-6
 +* Fri Aug 13 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.4-8
  - Specify udevadm trigger action in initscript (bug #623959).
 -- Build requires gnutls-devel not openssl-devel.
 +
 +* Tue Aug  3 2010 Tim Waugh <twaugh at redhat.com>
 +- Merged F-12 change:
 +  - Use numeric addresses for interfaces unless HostNameLookups are
 +    turned on (bug #583054).
 +
 +* Tue Jul 13 2010 Jiri Popelka <jpopelka at redhat.com> 1:1.4.4-7
 +- Added restartlog to initscript usage output (bug #612996).
 +
 +* Mon Jul 12 2010 Jiri Popelka <jpopelka at redhat.com> 1:1.4.4-6
 +- Moved LICENSE.txt to libs sub-package.
  
  * Mon Jun 28 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.4-5
  - Avoid empty notify-subscribed-event attributes (bug #606909,