[foomatic/f15: 2/2] Merge branch 'f14' into f15

[Jiří Popelka]

commit 204a26ba394dfd6bdeb5e32a40908da0b5e3a8fb
Merge: 4002fef 3938746
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Mon Jul 25 13:38:25 2011 +0200

    Merge branch 'f14' into f15

 .gitignore                           |    2 +
 foomatic-bad-utf8.patch              |   24 ----
 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                        |   36 ++----
 sources                              |    4 +-
 9 files changed, 14 insertions(+), 365 deletions(-)
---
diff --cc foomatic.spec
index 6128f6b,5c84715..fc73d3e
--- a/foomatic.spec
+++ b/foomatic.spec
@@@ -198,7 -179,10 +179,10 @@@ 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-2
 +* Wed Jul 20 2011 Tim Waugh <twaugh at redhat.com> - 4.0.7-3
  - Fix improper sanitization of command line options (bug #721001,
    CVE-2011-2697).