rpms/foo2zjs/F-14 foo2zjs-device-ids.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 foo2zjs-dynamic-jbig.patch, 1.5, 1.6 foo2zjs.spec, 1.11, 1.12 sources, 1.8, 1.9

Cedric OLIVIER cquad at rpmfusion.org
Sun Nov 6 21:23:27 CET 2011 

Author: cquad

Update of /cvs/free/rpms/foo2zjs/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21442/F-14

Modified Files:
	.cvsignore foo2zjs-dynamic-jbig.patch foo2zjs.spec sources 
Added Files:
	foo2zjs-device-ids.patch 
Log Message:
Update to 20111105 version


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-14/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Jun 2011 17:20:12 -0000	1.7
+++ .cvsignore	6 Nov 2011 20:23:25 -0000	1.8
@@ -1 +1 @@
-foo2zjs-20110602.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/F-14/foo2zjs-dynamic-jbig.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- foo2zjs-dynamic-jbig.patch	8 Jun 2011 17:20:12 -0000	1.5
+++ foo2zjs-dynamic-jbig.patch	6 Nov 2011 20:23:26 -0000	1.6
@@ -488,7 +488,7 @@
 -
 -#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
+--- 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 @@
 -/*
@@ -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)
@@ -4018,8 +4018,8 @@
 -
 -#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
+--- 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
@@ -4057,45 +4057,45 @@
  BINPROGS=
  
  ifeq ($(UNAME),Linux)
-@@ -420,29 +415,29 @@
+@@ -437,29 +432,29 @@
  	@echo "yourself."
  
  
 -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)
  
  
-@@ -510,40 +505,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
-@@ -834,9 +829,9 @@
+@@ -857,9 +852,9 @@
  	    done; \
  	fi
  
@@ -4161,7 +4161,7 @@
  
  install-desktop:
  	#
-@@ -1051,7 +1046,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
-@@ -1078,24 +1073,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/F-14/foo2zjs.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- foo2zjs.spec	8 Jun 2011 17:20:12 -0000	1.11
+++ foo2zjs.spec	6 Nov 2011 20:23:26 -0000	1.12
@@ -1,4 +1,4 @@
-%define foo2zjs_ver 20110602
+%define foo2zjs_ver 20111105
 
 Name:           foo2zjs
 Version:        0.%{foo2zjs_ver}
@@ -9,12 +9,16 @@
 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
 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 +196,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*
 
@@ -300,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
@@ -308,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
 
 
@@ -387,6 +396,20 @@
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
+* Sun Nov 6 2011 Cédric Olivier <cedric.olivier at free.fr> 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 at infradead.org> 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 at free.fr> 0.20110602-1
 - New program: hbpldecode for decoding Fuji-Zerox cp105b and Dell 1250c
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/F-14/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	8 Jun 2011 17:20:13 -0000	1.8
+++ sources	6 Nov 2011 20:23:26 -0000	1.9
@@ -1 +1 @@
-cc9036f77bf3eff973207d7325fee192  foo2zjs-20110602.tar.gz
+d93b4f3c4fe56093786ccf4b2b98dac8  foo2zjs-20111105.tar.gz

More information about the rpmfusion-commits mailing list