Author: cquad Update of /cvs/free/rpms/foo2zjs/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv32403/devel Modified Files: .cvsignore foo2zjs-dynamic-jbig.patch foo2zjs.spec sources Log Message: Update to 20111105 version Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/foo2zjs/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 5 Oct 2011 17:29:48 -0000 1.6 +++ .cvsignore 7 Nov 2011 19:52:52 -0000 1.7 @@ -1 +1 @@ -foo2zjs-20110909.tar.gz +foo2zjs-20111105.tar.gz foo2zjs-dynamic-jbig.patch: Makefile | 93 - jbig.c | 3289 -------------------------------------------------------------- jbig.h | 233 ---- jbig_ar.c | 426 -------- jbig_ar.h | 55 - 5 files changed, 44 insertions(+), 4052 deletions(-) Index: foo2zjs-dynamic-jbig.patch =================================================================== RCS file: /cvs/free/rpms/foo2zjs/devel/foo2zjs-dynamic-jbig.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- foo2zjs-dynamic-jbig.patch 5 Oct 2011 17:29:49 -0000 1.4 +++ foo2zjs-dynamic-jbig.patch 7 Nov 2011 19:52:52 -0000 1.5 @@ -1,5 +1,5 @@ -diff -uNrP foo2zjs-20110909/jbig_ar.c foo2zjs/jbig_ar.c ---- foo2zjs-20110909/jbig_ar.c 2008-09-05 16:05:54.000000000 +0100 +diff -uNr foo2zjs-patch1/jbig_ar.c foo2zjs/jbig_ar.c +--- foo2zjs-patch1/jbig_ar.c 2008-09-05 17:05:54.000000000 +0200 +++ foo2zjs/jbig_ar.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,426 +0,0 @@ -/* @@ -428,8 +428,8 @@ - - return pix; -} -diff -uNrP foo2zjs-20110909/jbig_ar.h foo2zjs/jbig_ar.h ---- foo2zjs-20110909/jbig_ar.h 2008-09-05 16:05:54.000000000 +0100 +diff -uNr foo2zjs-patch1/jbig_ar.h foo2zjs/jbig_ar.h +--- foo2zjs-patch1/jbig_ar.h 2008-09-05 17:05:54.000000000 +0200 +++ foo2zjs/jbig_ar.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,55 +0,0 @@ -/* @@ -487,8 +487,8 @@ -int arith_decode(struct jbg_ardec_state *s, int cx); - -#endif /* JBG_AR_H */ -diff -uNrP foo2zjs-20110909/jbig.c foo2zjs/jbig.c ---- foo2zjs-20110909/jbig.c 2011-06-09 12:54:12.000000000 +0100 +diff -uNr foo2zjs-patch1/jbig.c foo2zjs/jbig.c +--- foo2zjs-patch1/jbig.c 2011-06-09 13:54:12.000000000 +0200 +++ foo2zjs/jbig.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,3289 +0,0 @@ -/* @@ -3780,8 +3780,8 @@ - } - return JBG_EINVAL | 0; -} -diff -uNrP foo2zjs-20110909/jbig.h foo2zjs/jbig.h ---- foo2zjs-20110909/jbig.h 2008-09-05 16:06:03.000000000 +0100 +diff -uNr foo2zjs-patch1/jbig.h foo2zjs/jbig.h +--- foo2zjs-patch1/jbig.h 2008-09-05 17:06:03.000000000 +0200 +++ foo2zjs/jbig.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,233 +0,0 @@ -/* @@ -4017,9 +4017,9 @@ -int jbg_newlen(unsigned char *bie, size_t len); - -#endif /* JBG_H */ -diff -uNrP foo2zjs-20110909/Makefile foo2zjs/Makefile ---- foo2zjs-20110909/Makefile 2011-07-31 14:28:43.000000000 +0100 -+++ foo2zjs/Makefile 2011-10-05 14:41:17.639211316 +0100 +diff -uNr foo2zjs-patch1/Makefile foo2zjs/Makefile +--- foo2zjs-patch1/Makefile 2011-11-05 21:45:25.000000000 +0100 ++++ foo2zjs/Makefile 2011-11-06 10:45:02.857590089 +0100 @@ -19,7 +19,6 @@ # Installation prefix... PREFIX=/usr/local @@ -4062,40 +4062,40 @@ -foo2zjs: foo2zjs.o $(LIBJBG) -+foo2zjs: foo2zjs.o ++foo2zjs: foo2zjs.o $(CC) $(CFLAGS) -o $@ foo2zjs.o $(LIBJBG) -foo2hp: foo2hp.o $(LIBJBG) -+foo2hp: foo2hp.o ++foo2hp: foo2hp.o # $(CC) $(CFLAGS) -o $@ foo2hp.o $(LIBJBG) /usr/local/lib/libdmalloc.a $(CC) $(CFLAGS) -o $@ foo2hp.o $(LIBJBG) -foo2xqx: foo2xqx.o $(LIBJBG) -+foo2xqx: foo2xqx.o ++foo2xqx: foo2xqx.o $(CC) $(CFLAGS) -o $@ foo2xqx.o $(LIBJBG) -foo2lava: foo2lava.o $(LIBJBG) -+foo2lava: foo2lava.o ++foo2lava: foo2lava.o $(CC) $(CFLAGS) -o $@ foo2lava.o $(LIBJBG) -foo2qpdl: foo2qpdl.o $(LIBJBG) -+foo2qpdl: foo2qpdl.o ++foo2qpdl: foo2qpdl.o $(CC) $(CFLAGS) -o $@ foo2qpdl.o $(LIBJBG) -foo2oak: foo2oak.o $(LIBJBG) -+foo2oak: foo2oak.o ++foo2oak: foo2oak.o $(CC) $(CFLAGS) -o $@ foo2oak.o $(LIBJBG) -foo2slx: foo2slx.o $(LIBJBG) -+foo2slx: foo2slx.o ++foo2slx: foo2slx.o $(CC) $(CFLAGS) -o $@ foo2slx.o $(LIBJBG) -foo2hiperc: foo2hiperc.o $(LIBJBG) -+foo2hiperc: foo2hiperc.o ++foo2hiperc: foo2hiperc.o $(CC) $(CFLAGS) -o $@ foo2hiperc.o $(LIBJBG) -@@ -527,40 +522,40 @@ +@@ -533,40 +528,40 @@ cd osx-hotplug; $(MAKE) all endif @@ -4104,51 +4104,51 @@ $(CC) $(CFLAGS) ok.o $(LIBJBG) -o $@ -gipddecode: gipddecode.o $(LIBJBG) -+gipddecode: gipddecode.o ++gipddecode: gipddecode.o $(CC) $(CFLAGS) gipddecode.o $(LIBJBG) -o $@ -hbpldecode: hbpldecode.o $(LIBJBG) -+hbpldecode: hbpldecode.o ++hbpldecode: hbpldecode.o $(CC) $(CFLAGS) hbpldecode.o $(LIBJBG) -o $@ -hipercdecode: hipercdecode.o $(LIBJBG) -+hipercdecode: hipercdecode.o ++hipercdecode: hipercdecode.o $(CC) $(CFLAGS) hipercdecode.o $(LIBJBG) -o $@ -lavadecode: lavadecode.o $(LIBJBG) -+lavadecode: lavadecode.o ++lavadecode: lavadecode.o $(CC) $(CFLAGS) lavadecode.o $(LIBJBG) -o $@ -oakdecode: oakdecode.o $(LIBJBG) -+oakdecode: oakdecode.o ++oakdecode: oakdecode.o $(CC) $(CFLAGS) -g oakdecode.o $(LIBJBG) -o $@ -opldecode: opldecode.o $(LIBJBG) -+opldecode: opldecode.o ++opldecode: opldecode.o $(CC) $(CFLAGS) -g opldecode.o $(LIBJBG) -o $@ -qpdldecode: qpdldecode.o $(LIBJBG) -+qpdldecode: qpdldecode.o ++qpdldecode: qpdldecode.o $(CC) $(CFLAGS) qpdldecode.o $(LIBJBG) -o $@ -splcdecode: splcdecode.o $(LIBJBG) -+splcdecode: splcdecode.o ++splcdecode: splcdecode.o $(CC) $(CFLAGS) splcdecode.o $(LIBJBG) -lz -o $@ -slxdecode: slxdecode.o $(LIBJBG) -+slxdecode: slxdecode.o ++slxdecode: slxdecode.o $(CC) $(CFLAGS) slxdecode.o $(LIBJBG) -o $@ -xqxdecode: xqxdecode.o $(LIBJBG) -+xqxdecode: xqxdecode.o ++xqxdecode: xqxdecode.o $(CC) $(CFLAGS) xqxdecode.o $(LIBJBG) -o $@ -zjsdecode: zjsdecode.o $(LIBJBG) -+zjsdecode: zjsdecode.o ++zjsdecode: zjsdecode.o $(CC) $(CFLAGS) zjsdecode.o $(LIBJBG) -o $@ command2foo2lava-pjl: command2foo2lava-pjl.o -@@ -851,9 +846,9 @@ +@@ -857,9 +852,9 @@ done; \ fi @@ -4161,7 +4161,7 @@ install-desktop: # -@@ -1068,7 +1063,7 @@ +@@ -1086,7 +1081,7 @@ -rm -f $(PROGS) $(BINPROGS) $(SHELLS) -rm -f *.zc *.zm -rm -f xxx.* xxxomatic @@ -4170,7 +4170,7 @@ -rm -f foo2oak.o oakdecode.o -rm -f foo2xqx.o xqxdecode.o -rm -f foo2lava.o lavadecode.o -@@ -1095,24 +1090,24 @@ +@@ -1113,24 +1108,24 @@ # # Header dependencies # @@ -4192,24 +4192,24 @@ -slxdecode.o: slx.h jbig.h -xqxdecode.o: xqx.h jbig.h -gipddecode.o: slx.h jbig.h -+zjsdecode.o: zjs.h -+foo2zjs.o: zjs.h -+foo2oak.o: oak.h ++zjsdecode.o: zjs.h ++foo2zjs.o: zjs.h ++foo2oak.o: oak.h +jbig.o: +foo2hp.o: zjs.h cups.h -+foo2xqx.o: xqx.h ++foo2xqx.o: xqx.h +foo2lava.o: +foo2qpdl.o: qpdl.h -+foo2slx.o: slx.h ++foo2slx.o: slx.h +foo2hiperc.o: hiperc.h -+hipercdecode.o: hiperc.h ++hipercdecode.o: hiperc.h +hbpldecode.o: +lavadecode.o: +qpdldecode.o: +opldecode.o: -+slxdecode.o: slx.h -+xqxdecode.o: xqx.h -+gipddecode.o: slx.h ++slxdecode.o: slx.h ++xqxdecode.o: xqx.h ++gipddecode.o: slx.h # # foo2* Regression tests Index: foo2zjs.spec =================================================================== RCS file: /cvs/free/rpms/foo2zjs/devel/foo2zjs.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- foo2zjs.spec 5 Oct 2011 17:29:49 -0000 1.10 +++ foo2zjs.spec 7 Nov 2011 19:52:52 -0000 1.11 @@ -1,4 +1,4 @@ -%define foo2zjs_ver 20110909 +%define foo2zjs_ver 20111105 Name: foo2zjs Version: 0.%{foo2zjs_ver} @@ -9,9 +9,10 @@ License: GPLv2 URL: http://foo2zjs.rkkda.com/ +# command : wget -O foo2zjs-20111105.tar.gz http://foo2zjs.rkkda.com/foo2zjs.tar.gz Source0: foo2zjs-%{foo2zjs_ver}.tar.gz Patch0: foo2zjs-dynamic-jbig.patch -Patch1: foo2zjs-device-ids.patch +Patch1: foo2zjs-device-ids.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: jbigkit-devel groff ghostscript @@ -306,6 +307,7 @@ %{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_1680MF.xml %{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_1690MF.xml %{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_4690MF.xml +%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_2430_DL.xml %{_datadir}/foomatic/db/source/printer/Xerox-Phaser_6121MFP.xml %{_datadir}/cups/model/KONICA_MINOLTA-magicolor_2480_MF.ppd.gz %{_datadir}/cups/model/KONICA_MINOLTA-magicolor_2490_MF.ppd.gz @@ -314,6 +316,7 @@ %{_datadir}/cups/model/KONICA_MINOLTA-magicolor_1680MF.ppd.gz %{_datadir}/cups/model/KONICA_MINOLTA-magicolor_1690MF.ppd.gz %{_datadir}/cups/model/KONICA_MINOLTA-magicolor_4690MF.ppd.gz +%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_2430_DL.ppd.gz %{_datadir}/cups/model/Xerox-Phaser_6121MFP.ppd.gz @@ -393,6 +396,15 @@ /bin/rm -f /var/cache/foomatic/* %changelog +* Sun Nov 6 2011 Cédric Olivier <cedric.olivier(a)free.fr&gt; 0.20111105-1 +- Update to latest release +- updated the C110 ieee1284 string +- foomatic-db, PPDs: New printer "KONICA_MINOLTA-magicolor_2430" + like Minolta-magicolor_2430 except for Manufacturer +- hplj1000: make it work with usblp and CUPS (libusb) +- lavadecode: print the compression (JBIG or unknown) +- lavadecode: adjust for magicolor 3730 + * Wed Oct 5 2011 David Woodhouse <dwmw2(a)infradead.org&gt; 0.20110909-1 - Update to latest release - Add Konica Minolta variant of 2430DL and 2300DL Index: sources =================================================================== RCS file: /cvs/free/rpms/foo2zjs/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 5 Oct 2011 17:29:49 -0000 1.7 +++ sources 7 Nov 2011 19:52:52 -0000 1.8 @@ -1 +1 @@ -3829aae821b231386630f6d0dec805d2 foo2zjs-20110909.tar.gz +d93b4f3c4fe56093786ccf4b2b98dac8 foo2zjs-20111105.tar.gz