[splix/f18: 2/2] Merge branch 'f17' into f18
Jiří Popelka
jpopelka at fedoraproject.org
Wed Mar 6 12:02:53 UTC 2013
commit 5bd0761a8989592f2f6bcdfb5974829cb882e328
Merge: 868abc1 f7e3012
Author: Jiri Popelka <jpopelka at redhat.com>
Date: Wed Mar 6 12:56:42 2013 +0100
Merge branch 'f17' into f18
splix-deviceID.patch | 54 +++++++++++++++++++++++++++++++++++++++++++------
splix.spec | 5 +++-
2 files changed, 51 insertions(+), 8 deletions(-)
---
diff --cc splix.spec
index 8dac704,6b53205..1facf9b
--- 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.14.%{checkout}%{?dist}
-Release: 0.13.%{checkout}%{?dist}
++Release: 0.15.%{checkout}%{?dist}
License: GPLv2
Group: System Environment/Base
URL: http://splix.sourceforge.net/
@@@ -63,22 -63,22 +63,25 @@@ make install DRV_ONLY=1 CUPSDRV=%{_data
%{_datadir}/cups/drv/splix
%changelog
-* Wed Mar 06 2013 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.13.20121128svn
++* Wed Mar 06 2013 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.15.20121128svn
+ - Add Device IDs for Samsung ML-2250/2510, Xerox Phaser 3117/3120/3130
+
-* Tue Mar 5 2013 Tim Waugh <twaugh at redhat.com> - 2.0.1-0.12.20121128svn
+* Tue Mar 5 2013 Tim Waugh <twaugh at redhat.com> - 2.0.1-0.14.20121128svn
- Build requires cups for postscriptdriver tags (bug #917333).
-* Wed Nov 28 2012 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.11.20121128svn
+* Wed Nov 28 2012 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.13.20121128svn
- latest svn snapshot
-* Wed Oct 17 2012 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.10.20120419svn
+* Wed Oct 17 2012 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.12.20120419svn
- Add Device ID for Xerox Phaser 3124 (#867392).
-* Tue Sep 25 2012 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.9.20120419svn
+* Tue Sep 25 2012 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.11.20120419svn
- Add Device ID for Samsung ML-2525 (#859669).
-* Thu Apr 19 2012 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.8.20120419svn
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-0.10.20120419svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Thu Apr 19 2012 Jiri Popelka <jpopelka at redhat.com> - 2.0.1-0.9.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).
More information about the scm-commits
mailing list