From d6905af6a58af43fc4a4560653f70fe57a944e20 Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Apr 08 2013 08:43:05 +0000
Subject: Merge branch 'f17' into f18


---

diff --git a/splix-deviceID.patch b/splix-deviceID.patch
index 2d154a9..816018e 100644
--- a/splix-deviceID.patch
+++ b/splix-deviceID.patch
@@ -1,6 +1,14 @@
 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
+@@ -39,6 +39,7 @@ Manufacturer "Samsung"
+             Resolution k 1 0 0 0 "300dpi/300 DPI"
+  
+             ModelName "SCX-4200"
++            Attribute "1284DeviceID" "" "MFG:Samsung;MDL:SCX-4200 Series;CMD:GDI;"
+             PCFileName "scx4200.ppd"
+         } {
+             Resolution k 1 0 0 0 "300dpi/300 DPI"
 @@ -83,6 +83,7 @@ Manufacturer "Samsung"
                      PCFileName "ml1520.ppd"
                  } {
diff --git a/splix.spec b/splix.spec
index 1facf9b..1a5bc6b 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.15.%{checkout}%{?dist}
+Release: 0.16.%{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
+* Mon Apr 08 2013 Jiri Popelka <jpopelka@redhat.com> - 2.0.1-0.16.20121128svn
+- Add Device IDs for Samsung SCX-4200 Series (#949063)
+
 * Wed Mar 06 2013 Jiri Popelka <jpopelka@redhat.com> - 2.0.1-0.15.20121128svn
 - Add Device IDs for Samsung ML-2250/2510, Xerox Phaser 3117/3120/3130