Merge branch 'f17' into f18

This commit is contained in:
Jiri Popelka 2012-09-25 11:44:57 +02:00
commit 0e8483918e
2 changed files with 20 additions and 8 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-04-19 14:02:30.002620677 +0200
+++ splix/ppd/samsung.drv.in 2012-09-25 11:33:06.526681325 +0200
@@ -83,6 +83,7 @@ Manufacturer "Samsung"
PCFileName "ml1520.ppd"
} {
@ -25,3 +25,15 @@ diff -up splix/ppd/samsung.drv.in.deviceID splix/ppd/samsung.drv.in
PCFileName "ml1660.ppd"
} {
ModelName "ML-1910"
@@ -202,9 +205,11 @@ Manufacturer "Samsung"
PCFileName "ml1915.ppd"
} {
ModelName "ML-2525"
+ Attribute "1284DeviceID" "" "MFG:Samsung;MDL:ML-2525 Series;CMD:GDI,FWV,EXT;"
PCFileName "ml2525.ppd"
} {
ModelName "ML-2525W"
+ Attribute "1284DeviceID" "" "MFG:Samsung;MDL:ML-2525W Series;CMD:GDI,FWV,EXT;"
PCFileName "ml2525w.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.10.%{checkout}%{?dist}
Release: 0.11.%{checkout}%{?dist}
License: GPLv2
Group: System Environment/Base
URL: http://splix.sourceforge.net/
@ -65,9 +65,12 @@ make install
%doc COPYING AUTHORS ChangeLog THANKS
%{_cups_serverbin}/filter/pstoqpdl
%{_cups_serverbin}/filter/rastertoqpdl
%{_datadir}/cups/drv/splix/
%{_datadir}/cups/drv/splix
%changelog
* Tue Sep 25 2012 Jiri Popelka <jpopelka@redhat.com> - 2.0.1-0.11.20120419svn
- Add Device ID for Samsung ML-2525 (#859669).
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.1-0.10.20120419svn
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
@ -76,11 +79,8 @@ make install
- 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@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@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@redhat.com> - 2.0.1-0.7.20111121svn
- Add Device ID for Samsung ML-1660.
* Wed Nov 30 2011 Jiri Popelka <jpopelka@redhat.com> - 2.0.1-0.6.20111121svn
- Install splix PPDs into separate directory.