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

[Jiří Popelka]

commit 892a6e2919aa914793a61992c8b7e879dd548c60
Merge: 93141ca 204a26b
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Mon Jul 25 13:44:19 2011 +0200

    Merge branch 'f15'

 .gitignore                           |    2 +
 foomatic-bad-utf8.patch              |   24 --
 foomatic-colord.patch                |  616 ----------------------------------
 foomatic-db-engine-libdir.patch      |   33 --
 foomatic-db-engine-perl.patch        |   39 ---
 foomatic-filters-CVE-2011-2697.patch |  209 ------------
 foomatic-filters-libdir.patch        |   12 -
 foomatic-mkstemp.patch               |   20 --
 foomatic.spec                        |   37 +--
 sources                              |    4 +-
 10 files changed, 12 insertions(+), 984 deletions(-)
---
diff --cc foomatic.spec
index 750727a,fc73d3e..805056f
--- a/foomatic.spec
+++ b/foomatic.spec
@@@ -204,10 -179,10 +180,13 @@@ rm -fr %buildroot $RPM_BUILD_DIR/%{name
  %{_mandir}/man1/foomatic-rip.1*
  
  %changelog
+ * Mon Jul 25 2011 Jiri Popelka <jpopelka at redhat.com> - 4.0.8-1
+ - 4.0.8 (all patches merged upstream)
+ 
 -* Wed Jul 20 2011 Tim Waugh <twaugh at redhat.com> - 4.0.7-3
 +* Thu Jul 21 2011 Petr Sabata <contyk at redhat.com> - 4.0.7-6
 +- Perl mass rebuild
 +
 +* Wed Jul 20 2011 Tim Waugh <twaugh at redhat.com> - 4.0.7-5
  - Fix improper sanitization of command line options (bug #721001,
    CVE-2011-2697).