Author: dwmw2 Update of /cvs/free/rpms/foo2zjs/F-15 In directory se02.es.rpmfusion.net:/tmp/cvs-serv7520 Modified Files: .cvsignore foo2zjs-dynamic-jbig.patch foo2zjs.spec sources Added Files: foo2zjs-device-ids.patch Log Message: Update to current release foo2zjs-device-ids.patch: PPD/Minolta-magicolor_2300_DL.ppd | 1 + PPD/Minolta-magicolor_2430_DL.ppd | 1 + foomatic-db/printer/Minolta-magicolor_2300_DL.xml | 9 +++++++++ foomatic-db/printer/Minolta-magicolor_2430_DL.xml | 9 +++++++++ 4 files changed, 20 insertions(+) --- NEW FILE foo2zjs-device-ids.patch --- diff -urp foo2zjs-20110909/PPD/Minolta-magicolor_2300_DL.ppd foo2zjs/PPD/Minolta-magicolor_2300_DL.ppd --- foo2zjs-20110909/PPD/Minolta-magicolor_2300_DL.ppd 2011-08-11 19:02:05.000000000 +0100 +++ foo2zjs/PPD/Minolta-magicolor_2300_DL.ppd 2011-10-05 17:17:13.099143311 +0100 @@ -52,6 +52,7 @@ *Throughput: "1" *LandscapeOrientation: Plus90 *TTRasterizer: Type42 +*1284DeviceID: "MANUFACTURER:KONICA MINOLTA;MODEL:magicolor 2300 DL;COMMAND SET:ZJS,PJL;DRV:Dfoo2zjs,R1,M0,TF;" *1284DeviceID: "MANUFACTURER:MINOLTA-QMS;MODEL:magicolor 2300 DL;COMMAND SET:ZJS,PJL;DRV:Dfoo2zjs,R1,M0,TF;" *driverName foo2zjs/foo2zjs: "" diff -urp foo2zjs-20110909/PPD/Minolta-magicolor_2430_DL.ppd foo2zjs/PPD/Minolta-magicolor_2430_DL.ppd --- foo2zjs-20110909/PPD/Minolta-magicolor_2430_DL.ppd 2011-08-11 19:02:05.000000000 +0100 +++ foo2zjs/PPD/Minolta-magicolor_2430_DL.ppd 2011-10-05 17:16:55.944434987 +0100 @@ -52,6 +52,7 @@ *Throughput: "1" *LandscapeOrientation: Plus90 *TTRasterizer: Type42 +*1284DeviceID: "MANUFACTURER:KONICA MINOLTA;MODEL:magicolor 2430 DL;COMMAND SET:ZJS,PJL;DRV:Dfoo2zjs,R1,M0,TF;" *1284DeviceID: "MANUFACTURER:MINOLTA-QMS;MODEL:magicolor 2430 DL;COMMAND SET:ZJS,PJL;DRV:Dfoo2zjs,R1,M0,TF;" *driverName foo2zjs/foo2zjs: "" diff -ur foo2zjs-20110909/foomatic-db/printer/Minolta-magicolor_2300_DL.xml foo2zjs/foomatic-db/printer/Minolta-magicolor_2300_DL.xml --- foo2zjs-20110909/foomatic-db/printer/Minolta-magicolor_2300_DL.xml 2006-06-08 04:29:27.000000000 +0100 +++ foo2zjs/foomatic-db/printer/Minolta-magicolor_2300_DL.xml 2011-10-05 17:45:15.920530818 +0100 @@ -48,9 +48,18 @@ <model>magicolor 2300 DL</model> <commandset>ZJS,PJL</commandset> </parallel> + <parallel> + <ieee1284>CLASS:PRINTER;MODEL:magicolor 2300 DL;MANUFACTURER:KONICA MINOLTA;COMMAND SET:ZJS,PJL;</ieee1284> + <manufacturer>KONICA MINOLTA</manufacturer> + <model>magicolor 2300 DL</model> + <commandset>ZJS,PJL</commandset> + </parallel> <snmp> <description>MINOLTA-QMS magicolor 2300 DL</description> </snmp> + <snmp> + <description>KONICA MINOLTA magicolor 2300 DL</description> + </snmp> </autodetect> <functionality>B</functionality> <driver>foo2zjs</driver> diff -ur foo2zjs-20110909/foomatic-db/printer/Minolta-magicolor_2430_DL.xml foo2zjs/foomatic-db/printer/Minolta-magicolor_2430_DL.xml --- foo2zjs-20110909/foomatic-db/printer/Minolta-magicolor_2430_DL.xml 2006-06-08 04:29:42.000000000 +0100 +++ foo2zjs/foomatic-db/printer/Minolta-magicolor_2430_DL.xml 2011-10-05 17:44:37.527183609 +0100 @@ -46,9 +46,18 @@ <model>magicolor 2430 DL</model> <commandset>ZJS,PJL</commandset> </parallel> + <parallel> + <ieee1284>CLASS:PRINTER;MODEL:magicolor 2430 DL;MANUFACTURER:KONICA MINOLTA;COMMAND SET:ZJS,PJL;</ieee1284> + <manufacturer>KONICA MINOLTA</manufacturer> + <model>magicolor 2430 DL</model> + <commandset>ZJS,PJL</commandset> + </parallel> <snmp> <description>MINOLTA-QMS magicolor 2430 DL</description> </snmp> + <snmp> + <description>KONICA MINOLTA magicolor 2430 DL</description> + </snmp> </autodetect> <functionality>B</functionality> <driver>foo2zjs</driver> Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/foo2zjs/F-15/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 8 Jun 2011 05:48:25 -0000 1.6 +++ .cvsignore 5 Oct 2011 17:30:27 -0000 1.7 @@ -1 +1 @@ -foo2zjs-20110602.tar.gz +foo2zjs-20110909.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/F-15/foo2zjs-dynamic-jbig.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- foo2zjs-dynamic-jbig.patch 8 Jun 2011 05:48:25 -0000 1.4 +++ foo2zjs-dynamic-jbig.patch 5 Oct 2011 17:30:27 -0000 1.5 @@ -1,5 +1,5 @@ -diff -uNr foo2zjs-patch1/jbig_ar.c foo2zjs/jbig_ar.c ---- foo2zjs-patch1/jbig_ar.c 2008-09-05 17:05:54.000000000 +0200 +diff -uNrP foo2zjs-20110909/jbig_ar.c foo2zjs/jbig_ar.c +--- foo2zjs-20110909/jbig_ar.c 2008-09-05 16:05:54.000000000 +0100 +++ foo2zjs/jbig_ar.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,426 +0,0 @@ -/* @@ -428,8 +428,8 @@ - - return pix; -} -diff -uNr foo2zjs-patch1/jbig_ar.h foo2zjs/jbig_ar.h ---- foo2zjs-patch1/jbig_ar.h 2008-09-05 17:05:54.000000000 +0200 +diff -uNrP foo2zjs-20110909/jbig_ar.h foo2zjs/jbig_ar.h +--- foo2zjs-20110909/jbig_ar.h 2008-09-05 16:05:54.000000000 +0100 +++ 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 -uNr foo2zjs-patch1/jbig.c foo2zjs/jbig.c ---- foo2zjs-patch1/jbig.c 2008-09-05 17:06:03.000000000 +0200 +diff -uNrP foo2zjs-20110909/jbig.c foo2zjs/jbig.c +--- foo2zjs-20110909/jbig.c 2011-06-09 12:54:12.000000000 +0100 +++ foo2zjs/jbig.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,3289 +0,0 @@ -/* @@ -3613,7 +3613,7 @@ - void *file), void *file) -{ -#define BUFLEN 4096 -- int bpp; +- // int bpp; - unsigned long bpl, line, i; - unsigned k = 8; - int p; @@ -3630,7 +3630,7 @@ - y = jbg_dec_getheight(s); - if (x == 0 || y == 0) - return; -- bpp = (s->planes + 7) / 8; /* bytes per pixel in dest image */ +- // bpp = (s->planes + 7) / 8; /* bytes per pixel in dest image */ - bpl = jbg_ceil_half(x, 3); /* bytes per line in src plane */ - - if (iindex[s->order & 7][LAYER] == 0) @@ -3780,8 +3780,8 @@ - } - return JBG_EINVAL | 0; -} -diff -uNr foo2zjs-patch1/jbig.h foo2zjs/jbig.h ---- foo2zjs-patch1/jbig.h 2008-09-05 17:06:03.000000000 +0200 +diff -uNrP foo2zjs-20110909/jbig.h foo2zjs/jbig.h +--- foo2zjs-20110909/jbig.h 2008-09-05 16:06:03.000000000 +0100 +++ 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 -uNr foo2zjs-patch1/Makefile foo2zjs/Makefile ---- foo2zjs-patch1/Makefile 2011-06-03 23:05:12.000000000 +0200 -+++ foo2zjs/Makefile 2011-06-07 23:13:42.242002026 +0200 +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 @@ -19,7 +19,6 @@ # Installation prefix... PREFIX=/usr/local @@ -4057,7 +4057,7 @@ BINPROGS= ifeq ($(UNAME),Linux) -@@ -420,29 +415,29 @@ +@@ -437,29 +432,29 @@ @echo "yourself." @@ -4095,7 +4095,7 @@ $(CC) $(CFLAGS) -o $@ foo2hiperc.o $(LIBJBG) -@@ -510,40 +505,40 @@ +@@ -527,40 +522,40 @@ cd osx-hotplug; $(MAKE) all endif @@ -4148,7 +4148,7 @@ $(CC) $(CFLAGS) zjsdecode.o $(LIBJBG) -o $@ command2foo2lava-pjl: command2foo2lava-pjl.o -@@ -834,9 +829,9 @@ +@@ -851,9 +846,9 @@ done; \ fi @@ -4161,7 +4161,7 @@ install-desktop: # -@@ -1051,7 +1046,7 @@ +@@ -1068,7 +1063,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 -@@ -1078,24 +1073,24 @@ +@@ -1095,24 +1090,24 @@ # # Header dependencies # Index: foo2zjs.spec =================================================================== RCS file: /cvs/free/rpms/foo2zjs/F-15/foo2zjs.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- foo2zjs.spec 8 Jun 2011 05:48:25 -0000 1.10 +++ foo2zjs.spec 5 Oct 2011 17:30:27 -0000 1.11 @@ -1,4 +1,4 @@ -%define foo2zjs_ver 20110602 +%define foo2zjs_ver 20110909 Name: foo2zjs Version: 0.%{foo2zjs_ver} @@ -11,10 +11,13 @@ Source0: foo2zjs-%{foo2zjs_ver}.tar.gz Patch0: foo2zjs-dynamic-jbig.patch +Patch1: foo2zjs-device-ids.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: jbigkit-devel groff ghostscript BuildRequires: bc +# For the psdriver autoprovides +BuildRequires: python-cups Requires: lcms Requires: argyllcms Requires(post): /bin/rm @@ -192,6 +195,9 @@ # Patch to use jbigkit-devel package instead of static jbig source code %patch0 -p1 +# add missing 1284 Device IDs +%patch1 -p1 + # Remove jbig source code, jbigkit-devel package is used in BuildRequires #rm -f jbig* @@ -387,6 +393,11 @@ /bin/rm -f /var/cache/foomatic/* %changelog +* 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 +- BR python-cups to get foomatic autodeps working + * Thu Jun 7 2011 Cédric Olivier <cedric.olivier(a)free.fr&gt; 0.20110602-1 - New program: hbpldecode for decoding Fuji-Zerox cp105b and Dell 1250c Index: sources =================================================================== RCS file: /cvs/free/rpms/foo2zjs/F-15/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 8 Jun 2011 05:48:25 -0000 1.7 +++ sources 5 Oct 2011 17:30:27 -0000 1.8 @@ -1 +1 @@ -cc9036f77bf3eff973207d7325fee192 foo2zjs-20110602.tar.gz +3829aae821b231386630f6d0dec805d2 foo2zjs-20110909.tar.gz