[foomatic: 2/2] Merge branch 'f21'

[Tim Waugh]

commit b4fd60940d157d0481c3dc7d0291176426dcc45b
Merge: 6f0e17c c805c3f
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Aug 28 15:13:05 2014 +0100

    Merge branch 'f21'

 foomatic-manpages.patch |   74 +++++++++++++++++++++++++++++++++++-----------
 foomatic.spec           |    5 ++-
 2 files changed, 60 insertions(+), 19 deletions(-)
---
diff --cc foomatic.spec
index 74a9e50,d70ad30..fed823b
--- a/foomatic.spec
+++ b/foomatic.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary: Tools for using the foomatic database of printers and printer drivers
  Name:       foomatic
  Version:    4.0.11
--Release:    5%{?dist}
++Release:    6%{?dist}
  License:    GPLv2+
  
  # printer-filters package has gone (bug #967316, bug #1035450).
@@@ -138,9 -138,9 +138,12 @@@ exit 
  %{_var}/cache/foomatic
  
  %changelog
 -* Thu Aug 28 2014 Tim Waugh <twaugh at redhat.com> - 4.0.11-5
++* Thu Aug 28 2014 Tim Waugh <twaugh at redhat.com> - 4.0.11-6
+ - Put some text into foomatic-preferred-drivers man page.
+ 
 +* Wed Aug 27 2014 Jitka Plesnikova <jplesnik at redhat.com> - 4.0.11-5
 +- Perl 5.20 rebuild
 +
  * Thu Aug 21 2014 Tim Waugh <twaugh at redhat.com> - 4.0.11-4
  - Ship more manpages.