[splix: 3/3] Merge branch 'f18'

[Jiří Popelka]

commit 95ad00650c98098f6a9ef5a137c1fe76ddf97ad2
Merge: d752412 5bd0761
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Wed Mar 6 12:57:54 2013 +0100

    Merge branch 'f18'

 splix-deviceID.patch |   54 +++++++++++++++++++++++++++++++++++++++++++------
 splix.spec           |    5 +++-
 2 files changed, 51 insertions(+), 8 deletions(-)
---
diff --cc splix.spec
index 21fab25,1facf9b..e5c9a0f
--- a/splix.spec
+++ b/splix.spec
@@@ -3,7 -3,7 +3,7 @@@
  Summary: Driver for QPDL/SPL2 printers (Samsung and several Xerox printers)
  Name: splix
  Version: 2.0.1
--Release: 0.15.%{checkout}%{?dist}
++Release: 0.16.%{checkout}%{?dist}
  License: GPLv2
  Group: System Environment/Base
  URL: http://splix.sourceforge.net/
@@@ -63,12 -63,12 +63,15 @@@ make install DRV_ONLY=1 CUPSDRV=%{_data
  %{_datadir}/cups/drv/splix
  
  %changelog
 -* Wed Mar 06 2013 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.15.20121128svn
++* Wed Mar 06 2013 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.16.20121128svn
+ - Add Device IDs for Samsung ML-2250/2510, Xerox Phaser 3117/3120/3130
+ 
 -* Tue Mar  5 2013 Tim Waugh <twaugh at redhat.com> - 2.0.1-0.14.20121128svn
 +* Tue Mar  5 2013 Tim Waugh <twaugh at redhat.com> - 2.0.1-0.15.20121128svn
  - Build requires cups for postscriptdriver tags (bug #917333).
  
 +* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-0.14.20121128svn
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 +
  * Wed Nov 28 2012 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.13.20121128svn
  - latest svn snapshot