--- foo2zjs/foo2qpdl-wrapper.in.orig 2007-10-30 19:46:48.000000000 -0400 +++ foo2zjs/foo2qpdl-wrapper.in 2007-11-09 10:42:01.000000000 -0500 @@ -474,7 +474,7 @@ create_crd() { # # Create a Postscript CRD # - ICC2PS=$PREFIX/bin/foo2zjs-icc2ps + ICC2PS=$PREFIX/bin/icc2ps if [ -x $ICC2PS ]; then case "$GAMMAFILE" in none | none.icm | */none.icm) --- foo2zjs/foo2zjs-wrapper.1in.orig 2007-11-06 18:43:45.000000000 -0500 +++ foo2zjs/foo2zjs-wrapper.1in 2007-11-09 10:42:01.000000000 -0500 @@ -332,7 +332,7 @@ etc. This option may appear more than o .TP .BI \-G\0 profile.icm Convert \fIprofile.icm\fP to a Postscript color rendering -dictionary (CRD) using \fBfoo2zjs-icc2ps\fP and +dictionary (CRD) using \fBicc2ps\fP and adjust the printer colors by using the Postscript \fBsetcolorrendering\fP operator. (WORK IN PROGRESS). .TP --- foo2zjs/foo2xqx-wrapper.in.orig 2007-10-26 07:13:21.000000000 -0400 +++ foo2zjs/foo2xqx-wrapper.in 2007-11-09 10:42:01.000000000 -0500 @@ -438,7 +438,7 @@ create_crd() { # # Create a Postscript CRD # - ICC2PS=$PREFIX/bin/foo2zjs-icc2ps + ICC2PS=$PREFIX/bin/icc2ps if [ -x $ICC2PS ]; then $ICC2PS -o $GAMMAFILE -t$INTENT > $ICCTMP.crd.ps 2>$ICCTMP.log \ || error "Problem converting .ICM file to Postscript" --- foo2zjs/Makefile.orig 2007-11-05 19:14:17.000000000 -0500 +++ foo2zjs/Makefile 2007-11-09 10:42:58.000000000 -0500 @@ -149,12 +149,6 @@ FILES = \ foomatic-db/*/*.xml \ foomatic-test \ getweb.in \ - icc2ps/*.[ch] \ - icc2ps/Makefile \ - icc2ps/AUTHORS \ - icc2ps/COPYING \ - icc2ps/README \ - icc2ps/README.foo2zjs \ PPD/*.ppd \ crd/zjs/*.crd \ crd/zjs/*.ps \ @@ -288,7 +282,7 @@ JBGOPTS=-m 16 -d 0 -p 92 # Equivalent op # # The usual build rules # -all: all-test $(PROGS) $(BINPROGS) $(SHELLS) getweb all-icc2ps man doc \ +all: all-test $(PROGS) $(BINPROGS) $(SHELLS) getweb man doc \ all-done all-test: @@ -407,9 +401,6 @@ getweb: getweb.in Makefile -e 's@^PREFIX=.*@PREFIX=$(PREFIX)@' || (rm -f $@ && exit 1) chmod 555 $@ -all-icc2ps: - cd icc2ps; $(MAKE) all - ok: ok.o $(LIBJBG) $(CC) $(CFLAGS) ok.o $(LIBJBG) -o $@ @@ -443,7 +434,7 @@ slxdecode: slxdecode.o $(LIBJBG) # # Installation rules # -install: all install-test install-prog install-icc2ps install-extra \ +install: all install-test install-prog install-extra \ install-crd install-foo install-ppd install-man install-doc # # If you use CUPS, then restart the spooler: @@ -534,12 +525,6 @@ install-foo: foomatic-combo-xml -O >overview.xml; \ fi -install-icc2ps: - # - # Install ICM to Postscript file conversion utility - # - cd icc2ps; $(MAKE) PREFIX=$(PREFIX) install - install-crd: # # Install prebuilt CRD files (from m2300w project) @@ -742,7 +727,6 @@ uninstall: -rm -f /usr/bin/foo2qpdl-wrapper /usr/bin/foo2qpdl /usr/bin/qpdldecode -rm -f /usr/bin/foo2slx-wrapper /usr/bin/foo2slx /usr/bin/slxdecode -rm -f /usr/bin/opldecode - -rm -f /usr/bin/foo2zjs-icc2ps -rm -f /usr/bin/foo2zjs-pstops -cd foomatic-db; for i in `find driver opt printer -name "*.xml"`; do \ rm -f $(FOODB)/$$i; \ @@ -779,7 +763,6 @@ clean: -rm -f pksm2bitcmyk -rm -f *.icm.*.ps -rm -f okidecode.o - cd icc2ps; $(MAKE) $@ # # Header dependencies @@ -935,7 +918,7 @@ pprtest-3.oak: FRC # # icc2ps regression tests # -ICC2PS=./icc2ps/foo2zjs-icc2ps +ICC2PS=/usr/bin/icc2ps icctest: for g in *.icm; do \ for i in 0 1 2 3; do \ --- foo2zjs/foo2oak-wrapper.in.orig 2007-10-26 07:13:21.000000000 -0400 +++ foo2zjs/foo2oak-wrapper.in 2007-11-09 10:42:01.000000000 -0500 @@ -429,7 +429,7 @@ create_crd() { # # Create a Postscript CRD # - ICC2PS=$PREFIX/bin/foo2zjs-icc2ps + ICC2PS=$PREFIX/bin/icc2ps if [ -x $ICC2PS ]; then case "$GAMMAFILE" in none | none.icm | */none.icm) --- foo2zjs/foo2hp2600-wrapper.in.orig 2007-10-26 07:13:21.000000000 -0400 +++ foo2zjs/foo2hp2600-wrapper.in 2007-11-09 10:42:01.000000000 -0500 @@ -554,7 +554,7 @@ create_crd() { # # Create a Postscript CRD # - ICC2PS=$PREFIX/bin/foo2zjs-icc2ps + ICC2PS=$PREFIX/bin/icc2ps if [ -x $ICC2PS ]; then case "$GAMMAFILE" in none.icm | */none.icm) --- foo2zjs/foo2hp2600-wrapper.1in.orig 2007-11-06 18:42:10.000000000 -0500 +++ foo2zjs/foo2hp2600-wrapper.1in 2007-11-09 10:42:01.000000000 -0500 @@ -333,7 +333,7 @@ etc. This option may appear more than o .TP .BI \-G\0 profile.icm Convert \fIprofile.icm\fP to a Postscript color rendering -dictionary (CRD) using \fBfoo2zjs-icc2ps\fP and +dictionary (CRD) using \fBicc2ps\fP and adjust the printer colors by using the Postscript \fBsetcolorrendering\fP operator. If \fIprofile.icm\fP is none.icm, then prepare for ordering a ICM custom printer profile (i.e. from www.ICCFactory.com). --- foo2zjs/foo2qpdl-wrapper.1in.orig 2007-11-06 18:42:59.000000000 -0500 +++ foo2zjs/foo2qpdl-wrapper.1in 2007-11-09 10:42:01.000000000 -0500 @@ -312,7 +312,7 @@ etc. This option may appear more than o .TP .BI \-G\0 profile.icm Convert \fIprofile.icm\fP to a Postscript color rendering -dictionary (CRD) using \fBfoo2zjs-icc2ps\fP and +dictionary (CRD) using \fBicc2ps\fP and adjust the printer colors by using the Postscript \fBsetcolorrendering\fP operator. (WORK IN PROGRESS). .TP --- foo2zjs/foo2lava-wrapper.in.orig 2007-10-26 07:13:21.000000000 -0400 +++ foo2zjs/foo2lava-wrapper.in 2007-11-09 10:42:01.000000000 -0500 @@ -501,7 +501,7 @@ create_crd() { # # Create a Postscript CRD # - ICC2PS=$PREFIX/bin/foo2zjs-icc2ps + ICC2PS=$PREFIX/bin/icc2ps if [ -x $ICC2PS ]; then case "$GAMMAFILE" in none.icm | */none.icm) --- foo2zjs/foo2oak-wrapper.1in.orig 2007-11-06 18:42:42.000000000 -0500 +++ foo2zjs/foo2oak-wrapper.1in 2007-11-09 10:42:01.000000000 -0500 @@ -289,7 +289,7 @@ etc. This option may appear more than o .TP .BI \-G\0 profile.icm Convert \fIprofile.icm\fP to a Postscript color rendering -dictionary (CRD) using \fBfoo2zjs-icc2ps\fP and +dictionary (CRD) using \fBicc2ps\fP and adjust the printer colors by using the Postscript \fBsetcolorrendering\fP operator. (WORK IN PROGRESS). .TP --- foo2zjs/foo2lava-wrapper.1in.orig 2007-11-06 18:42:29.000000000 -0500 +++ foo2zjs/foo2lava-wrapper.1in 2007-11-09 10:42:01.000000000 -0500 @@ -312,7 +312,7 @@ etc. This option may appear more than o .TP .BI \-G\0 profile.icm Convert \fIprofile.icm\fP to a Postscript color rendering -dictionary (CRD) using \fBfoo2zjs-icc2ps\fP and +dictionary (CRD) using \fBicc2ps\fP and adjust the printer colors by using the Postscript \fBsetcolorrendering\fP operator. (WORK IN PROGRESS). .TP --- foo2zjs/foo2zjs-wrapper.in.orig 2007-10-26 07:13:21.000000000 -0400 +++ foo2zjs/foo2zjs-wrapper.in 2007-11-09 10:42:01.000000000 -0500 @@ -511,7 +511,7 @@ create_crd() { # # Create a Postscript CRD # - ICC2PS=$PREFIX/bin/foo2zjs-icc2ps + ICC2PS=$PREFIX/bin/icc2ps if [ -x $ICC2PS ]; then case "$GAMMAFILE" in none | none.icm | */none.icm)