[gutenprint: 2/2] Merge branch 'f18'

[Jiří Popelka]

commit c30051cc42e88eeb521d82ca1f86f24a7c696126
Merge: 004968b 9c7ca7d
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Tue Feb 19 13:53:42 2013 +0100

    Merge branch 'f18'

 gutenprint-device-ids.patch |   16 ++++++++++++----
 gutenprint.spec             |    6 +++++-
 2 files changed, 17 insertions(+), 5 deletions(-)
---
diff --cc gutenprint.spec
index fb7e1e2,d72bc26..3a8f0a4
--- a/gutenprint.spec
+++ b/gutenprint.spec
@@@ -3,7 -3,7 +3,7 @@@
  Name:           gutenprint
  Summary:        Printer Drivers Package
  Version:        5.2.9
--Release:        9%{?dist}
++Release:        10%{?dist}
  Group:          System Environment/Base
  URL:            http://gimp-print.sourceforge.net/
  Source0:        http://downloads.sourceforge.net/gimp-print/%{name}-%{version}.tar.bz2
@@@ -300,9 -301,9 +301,12 @@@ f
  /bin/rm -f /var/cache/foomatic/*
  
  %changelog
 -* Tue Feb 19 2013 Jiri Popelka <jpopelka at redhat.com> - 5.2.9-9
++* Tue Feb 19 2013 Jiri Popelka <jpopelka at redhat.com> - 5.2.9-10
+ - Added IEEE 1284 Device ID for Canon PIXMA MP500 (bug #911727).
+ 
 +* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.2.9-9
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 +
  * Thu Jan 17 2013 Jiri Popelka <jpopelka at redhat.com> 5.2.9-8
  - Added IEEE 1284 Device ID for Kyocera FS-1118MFP (bug #782379).
  - Use arch-specific dependency when requiring base package.