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

[Jiří Popelka]

commit e700e5041a4ac17c576336ce760b4dcc35843ac2
Merge: 13e7b69 24a0e39
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Tue Sep 27 19:34:54 2011 +0200

    Merge branch 'f14' into f15

 gutenprint-device-ids.patch |   45 +++++++++++++++++++++++++++++++++---------
 gutenprint.spec             |   27 ++++++++++++++++++-------
 2 files changed, 54 insertions(+), 18 deletions(-)
---
diff --cc gutenprint.spec
index 8afbe2d,099da38..39b932f
--- a/gutenprint.spec
+++ b/gutenprint.spec
@@@ -4,7 -3,7 +3,7 @@@
  Name:           gutenprint
  Summary:        Printer Drivers Package
  Version:        5.2.7
--Release:        5%{?dist}
++Release:        6%{?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,7 -304,15 +304,15 @@@ f
  /bin/rm -f /var/cache/foomatic/*
  
  %changelog
 -* Tue Sep 27 2011 Jiri Popelka <jpopelka at redhat.com> 5.2.7-5
++* Tue Sep 27 2011 Jiri Popelka <jpopelka at redhat.com> 5.2.7-6
+ - Use _cups_serverbin macro from cups-devel for where to put driver executables.
+ - Added IEEE 1284 Device ID for:
+     Epson Stylus Photo R2400 (bug #720270)
+     Epson Stylus C92 (bug #735400)
+     Canon PIXMA iP1900 (bug #741329)
+     Canon PIXMA iP4000 (bug #741006)
+ 
 -* 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).