Merge branch 'f17' into f18

This commit is contained in:
Jiri Popelka 2012-10-17 16:13:16 +02:00
commit 22e3edd7cb
2 changed files with 16 additions and 2 deletions

View File

@ -1,6 +1,6 @@
diff -up splix/ppd/samsung.drv.in.deviceID splix/ppd/samsung.drv.in
--- splix/ppd/samsung.drv.in.deviceID 2011-12-06 22:55:59.000000000 +0100
+++ splix/ppd/samsung.drv.in 2012-09-25 11:33:06.526681325 +0200
+++ splix/ppd/samsung.drv.in 2012-10-17 16:04:15.091955225 +0200
@@ -83,6 +83,7 @@ Manufacturer "Samsung"
PCFileName "ml1520.ppd"
} {
@ -37,3 +37,14 @@ diff -up splix/ppd/samsung.drv.in.deviceID splix/ppd/samsung.drv.in
PCFileName "ml2525w.ppd"
}
} {
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 2012-10-17 16:06:16.180139508 +0200
@@ -131,6 +131,7 @@ Manufacturer "Xerox"
{
ModelName "Phaser 3124"
+ Attribute "1284DeviceID" "" "MFG:Xerox;MDL:Phaser 3124;CMD:GDI;"
PCFileName "ph3124.ppd"
}
}

View File

@ -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.12.%{checkout}%{?dist}
License: GPLv2
Group: System Environment/Base
URL: http://splix.sourceforge.net/
@ -68,6 +68,9 @@ make install
%{_datadir}/cups/drv/splix
%changelog
* Wed Oct 17 2012 Jiri Popelka <jpopelka@redhat.com> - 2.0.1-0.12.20120419svn
- Add Device ID for Xerox Phaser 3124 (#867392).
* Tue Sep 25 2012 Jiri Popelka <jpopelka@redhat.com> - 2.0.1-0.11.20120419svn
- Add Device ID for Samsung ML-2525 (#859669).