[splix: 2/2] Merge branch 'f17' into f18

[Jiří Popelka]

commit 22e3edd7cbea5d008f605f5974e3c39115b490cb
Merge: 0e84839 c492c36
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Wed Oct 17 16:13:16 2012 +0200

    Merge branch 'f17' into f18

 splix-deviceID.patch |   13 ++++++++++++-
 splix.spec           |    5 ++++-
 2 files changed, 16 insertions(+), 2 deletions(-)
---
diff --cc splix.spec
index 808c1ec,a1a79e6..fcf5126
--- 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.11.%{checkout}%{?dist}
 -Release: 0.10.%{checkout}%{?dist}
++Release: 0.12.%{checkout}%{?dist}
  License: GPLv2
  Group: System Environment/Base
  URL: http://splix.sourceforge.net/
@@@ -68,13 -68,13 +68,16 @@@ make instal
  %{_datadir}/cups/drv/splix
  
  %changelog
 -* Wed Oct 17 2012 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.10.20120419svn
++* Wed Oct 17 2012 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.12.20120419svn
+ - Add Device ID for Xerox Phaser 3124 (#867392).
+ 
 -* Tue Sep 25 2012 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.9.20120419svn
 +* Tue Sep 25 2012 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.11.20120419svn
  - Add Device ID for Samsung ML-2525 (#859669).
  
 -* Thu Apr 19 2012 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.8.20120419svn
 +* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-0.10.20120419svn
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 +
 +* Thu Apr 19 2012 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.9.20120419svn
  - Latest upstream snapshot: all patches and changes merged upstream !
  - Build splix with JBIG1 support and install DRV files instead of PPD files.
  - Add Device ID for Samsung ML-2010 (#807308).