[splix] Add Device ID for Samsung CLP-310 (#988926)

[Jiří Popelka]

commit 69b1c0c27601e5d8cde239341cfb486bf2810d0d
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Sat Jul 27 09:20:21 2013 +0200

    Add Device ID for Samsung CLP-310 (#988926)

 splix-deviceID.patch |   24 ++++++++++++++++--------
 splix.spec           |    5 ++++-
 2 files changed, 20 insertions(+), 9 deletions(-)
---
diff --git a/splix-deviceID.patch b/splix-deviceID.patch
index 816018e..57e86fe 100644
--- a/splix-deviceID.patch
+++ b/splix-deviceID.patch
@@ -1,6 +1,6 @@
 diff -up splix/ppd/samsung.drv.in.deviceID splix/ppd/samsung.drv.in
 --- splix/ppd/samsung.drv.in.deviceID	2012-07-07 22:50:42.000000000 +0200
-+++ splix/ppd/samsung.drv.in	2013-03-06 12:46:52.688837840 +0100
++++ splix/ppd/samsung.drv.in	2013-07-27 09:15:51.338716048 +0200
 @@ -39,6 +39,7 @@ Manufacturer "Samsung"
              Resolution k 1 0 0 0 "300dpi/300 DPI"
   
@@ -9,7 +9,7 @@ diff -up splix/ppd/samsung.drv.in.deviceID splix/ppd/samsung.drv.in
              PCFileName "scx4200.ppd"
          } {
              Resolution k 1 0 0 0 "300dpi/300 DPI"
-@@ -83,6 +83,7 @@ Manufacturer "Samsung"
+@@ -83,6 +84,7 @@ Manufacturer "Samsung"
                      PCFileName "ml1520.ppd"
                  } {
                      ModelName "ML-1610"
@@ -17,7 +17,7 @@ diff -up splix/ppd/samsung.drv.in.deviceID splix/ppd/samsung.drv.in
                      PCFileName "ml1610.ppd"
                  } {
                      ModelName "ML-1710"
-@@ -121,6 +122,7 @@ Manufacturer "Samsung"
+@@ -121,6 +123,7 @@ Manufacturer "Samsung"
                      Throughput 22
      		{
                      	ModelName "ML-2250"
@@ -25,7 +25,7 @@ diff -up splix/ppd/samsung.drv.in.deviceID splix/ppd/samsung.drv.in
      	                PCFileName "ml2250.ppd"
      		} {
                      	ModelName "ML-2251"
-@@ -166,6 +168,7 @@ Manufacturer "Samsung"
+@@ -166,6 +169,7 @@ Manufacturer "Samsung"
                      PCFileName "ml1640.ppd"
                  } {
                      ModelName "ML-2010"
@@ -33,7 +33,7 @@ diff -up splix/ppd/samsung.drv.in.deviceID splix/ppd/samsung.drv.in
                      PCFileName "ml2010.ppd"
                  } {
                      ModelName "ML-2015"
-@@ -177,6 +180,7 @@ Manufacturer "Samsung"
+@@ -177,6 +181,7 @@ Manufacturer "Samsung"
                      #import "srtmode.defs"
      
                      ModelName "ML-2510"
@@ -41,7 +41,7 @@ diff -up splix/ppd/samsung.drv.in.deviceID splix/ppd/samsung.drv.in
                      PCFileName "ml2510.ppd"
                  }
              }
-@@ -193,6 +197,7 @@ Manufacturer "Samsung"
+@@ -193,6 +198,7 @@ Manufacturer "Samsung"
      
                  {
                      ModelName "ML-1660"
@@ -49,7 +49,7 @@ diff -up splix/ppd/samsung.drv.in.deviceID splix/ppd/samsung.drv.in
                      PCFileName "ml1660.ppd"
                  } {
                      ModelName "ML-1910"
-@@ -202,9 +207,11 @@ Manufacturer "Samsung"
+@@ -202,9 +208,11 @@ Manufacturer "Samsung"
                      PCFileName "ml1915.ppd"
                  } {
                      ModelName "ML-2525"
@@ -61,9 +61,17 @@ diff -up splix/ppd/samsung.drv.in.deviceID splix/ppd/samsung.drv.in
                      PCFileName "ml2525w.ppd"
                  }
              } {
+@@ -414,6 +422,7 @@ Manufacturer "Samsung"
+         Attribute General CMSFile "CLP-310"
+ 
+         ModelName "CLP-310"
++        Attribute "1284DeviceID" "" "MFG:Samsung;MDL:CLP-310 Series;CMD:SPLC,FWV;"
+         PCFileName "clp310.ppd"
+     }{
+         Attribute General CMSFile "CLP-315"
 diff -up splix/ppd/xerox.drv.in.deviceID splix/ppd/xerox.drv.in
 --- splix/ppd/xerox.drv.in.deviceID	2011-07-21 17:22:26.000000000 +0200
-+++ splix/ppd/xerox.drv.in	2013-03-06 12:34:31.104078182 +0100
++++ splix/ppd/xerox.drv.in	2013-07-27 08:59:41.703838152 +0200
 @@ -66,6 +66,7 @@ Manufacturer "Xerox"
                  } {
                      #import "manualduplex.defs"
diff --git a/splix.spec b/splix.spec
index 640793d..7856756 100644
--- a/splix.spec
+++ b/splix.spec
@@ -3,7 +3,7 @@
 Summary: Driver for QPDL/SPL2 printers (Samsung and several Xerox printers)
 Name: splix
 Version: 2.0.1
-Release: 0.17.%{checkout}%{?dist}
+Release: 0.18.%{checkout}%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://splix.sourceforge.net/
@@ -63,6 +63,9 @@ make install DRV_ONLY=1 CUPSDRV=%{_datadir}/cups/drv/splix DESTDIR=%{buildroot}
 %{_datadir}/cups/drv/splix
 
 %changelog
+* Sat Jul 27 2013 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.18.20121128svn
+- Add Device ID for Samsung CLP-310 (#988926)
+
 * Mon Apr 08 2013 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.17.20121128svn
 - Add Device IDs for Samsung SCX-4200 Series (#949063)