[splix/f16: 6/6] Merge branch 'f17' into f16

[Jiří Popelka]

commit 46be74685aae29ea358bf1bbdca09b98a7f32239
Merge: e602a52 ecdb637
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Thu Apr 19 17:31:02 2012 +0200

    Merge branch 'f17' into f16

 .gitignore                 |    1 +
 sources                    |    2 +-
 splix-custom-ppd-dir.patch |   12 ---
 splix-deviceID.patch       |   16 +++-
 splix-drv.patch            |  211 --------------------------------------------
 splix-nostrip.patch        |   15 ---
 splix.spec                 |   67 ++++----------
 7 files changed, 33 insertions(+), 291 deletions(-)
---
diff --cc splix.spec
index de669b4,59aa4ee..7062de5
--- 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.7.%{checkout}%{?dist}
 -Release: 0.9.%{checkout}%{?dist}
++Release: 0.8.%{checkout}%{?dist}
  License: GPLv2
  Group: System Environment/Base
  URL: http://splix.sourceforge.net/
@@@ -99,11 -65,19 +65,16 @@@ make instal
  %doc COPYING AUTHORS ChangeLog THANKS
  %{_cups_serverbin}/filter/pstoqpdl
  %{_cups_serverbin}/filter/rastertoqpdl
- %{_datadir}/cups/model/splix/
+ %{_datadir}/cups/drv/splix/
  
  %changelog
 -* Thu Apr 19 2012 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.9.20120419svn
++* Thu Apr 19 2012 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.8.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).
+ 
 -* Wed Jan 18 2012 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.8.20111121svn
 -- Add Device ID for Samsung ML-1660 (Ubuntu #917507).
 -
 -* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-0.7.20111121svn
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 +* Wed Jan 18 2012 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.7.20111121svn
 +- Add Device ID for Samsung ML-1660.
  
  * Wed Nov 30 2011 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.6.20111121svn
  - Install splix PPDs into separate directory.