[gutenprint/f15: 3/3] Merge branch 'f14' into f15

[Jiří Popelka]

commit 13e7b691935f14f407a1ea96fb5c4fd8b9aa6a45
Merge: eb67ac5 14f296e
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Tue Aug 9 15:32:58 2011 +0200

    Merge branch 'f14' into f15

 gutenprint-device-ids.patch   |   18 +++++++++++++-----
 gutenprint-null-pointer.patch |   36 +++++++++++++++++++-----------------
 gutenprint.spec               |    9 +++++++--
 3 files changed, 39 insertions(+), 24 deletions(-)
---
diff --cc gutenprint.spec
index 1e27fb8,082dc3b..8afbe2d
--- a/gutenprint.spec
+++ b/gutenprint.spec
@@@ -4,7 -4,7 +4,7 @@@
  Name:           gutenprint
  Summary:        Printer Drivers Package
  Version:        5.2.7
--Release:        4%{?dist}
++Release:        5%{?dist}
  Group:          System Environment/Base
  URL:            http://gimp-print.sourceforge.net/
  Source0:	http://dl.sf.net/gimp-print/gutenprint-5.2/%{version}/gutenprint-%{version}.tar.bz2
@@@ -301,13 -301,14 +301,18 @@@ f
  /bin/rm -f /var/cache/foomatic/*
  
  %changelog
 -* Tue Aug 09 2011 Jiri Popelka <jpopelka at redhat.com> 5.2.7-4
++* Tue Aug 09 2011 Jiri Popelka <jpopelka at redhat.com> 5.2.7-5
+ - Improve the null-pointer.patch (bug #725447).
+ - Added IEEE 1284 Device ID for:
+     Epson Stylus D78 (bug #245948).
+ 
 -* Tue Jun 28 2011 Tim Waugh <twaugh at redhat.com> 5.2.7-3
 +* Tue Jun 28 2011 Tim Waugh <twaugh at redhat.com> 5.2.7-4
  - Fixed use of find_lang macro (bug #716426).
  
 +* Wed Jun 15 2011 Tim Waugh <twaugh at redhat.com> 5.2.7-3
 +- Rebuilt against new python-cups package to fix postscriptdriver tags
 +  (bug #712074).
 +
  * Tue Jun  7 2011 Tim Waugh <twaugh at redhat.com> 5.2.7-2
  - Fix build against newer versions of gcc.
  - cups-genppdupdate: fixed multicat support (bug #711021).  It was