diff -Nru foo2zjs-20160313dfsg0/ChangeLog foo2zjs-20160902dfsg0/ChangeLog --- foo2zjs-20160313dfsg0/ChangeLog 2016-04-25 19:28:24.000000000 +0000 +++ foo2zjs-20160902dfsg0/ChangeLog 2016-10-04 09:39:59.000000000 +0000 @@ -1,3 +1,9 @@ +2016-09-02 Rick Richardson + * New Printer: Xerox Phaser 3040 using the foo2hbpl2 driver. + +2016-08-30 Rick Richardson + * New Printer: Xerox Phaser 3010 using the foo2hbpl2 driver. + 2016-03-13 Rick Richardson * icc2ps/lcms.h: USE_CUSTOM_SWAB defined. diff -Nru foo2zjs-20160313dfsg0/debian/changelog foo2zjs-20160902dfsg0/debian/changelog --- foo2zjs-20160313dfsg0/debian/changelog 2016-06-18 13:07:05.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/changelog 2016-10-08 16:38:08.000000000 +0000 @@ -1,3 +1,24 @@ +foo2zjs (20160902dfsg0-2) unstable; urgency=medium + + * Update patch to getweb to fix installation of icm files + (Closes: #840129) + + -- Didier Raboud Sat, 08 Oct 2016 18:38:08 +0200 + +foo2zjs (20160902dfsg0-1) unstable; urgency=medium + + * New 20160902 upstream release + - New printers: + + Xerox Phaser 3010 using the foo2hbpl2 driver + + Xerox Phaser 3040 using the foo2hbpl2 driver + + * DFSG repack (no changes from previous releases) + - remove binary file c5200mono.prn + - remove crd/qpdl/CLP* , because copyright is unclear + * Initialize git-dpm and rephrase most patches' descriptions + + -- Didier Raboud Tue, 04 Oct 2016 11:54:01 +0200 + foo2zjs (20160313dfsg0-2) unstable; urgency=medium [ Colin Watson ] diff -Nru foo2zjs-20160313dfsg0/debian/.git-dpm foo2zjs-20160902dfsg0/debian/.git-dpm --- foo2zjs-20160313dfsg0/debian/.git-dpm 1970-01-01 00:00:00.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/.git-dpm 2016-10-08 16:37:40.000000000 +0000 @@ -0,0 +1,8 @@ +# see git-dpm(1) from git-dpm package +d1147170930a24a197a4d22198bc341ec5b5307a +d1147170930a24a197a4d22198bc341ec5b5307a +858d8a7972933513edcd1412c2306c46757a11d9 +858d8a7972933513edcd1412c2306c46757a11d9 +foo2zjs_20160902dfsg0.orig.tar.xz +3a151bab9437dcae184d8a574b901f0fe4f1d2e8 +558972 diff -Nru foo2zjs-20160313dfsg0/debian/patches/0001-Update-makefiles-to-Debian-best-practices.patch foo2zjs-20160902dfsg0/debian/patches/0001-Update-makefiles-to-Debian-best-practices.patch --- foo2zjs-20160313dfsg0/debian/patches/0001-Update-makefiles-to-Debian-best-practices.patch 1970-01-01 00:00:00.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/0001-Update-makefiles-to-Debian-best-practices.patch 2016-10-08 16:37:39.000000000 +0000 @@ -0,0 +1,231 @@ +From 0cdb5358af1e9f413a49be21adccbb7ba8af9c03 Mon Sep 17 00:00:00 2001 +From: Steffen Joeris +Date: Tue, 4 Oct 2016 11:43:43 +0200 +Subject: Update makefiles to Debian best-practices + +Author: Luca Capello +Author: Didier Raboud +--- + Makefile | 71 +++++++++++++++++++++++++++------------------------------ + icc2ps/Makefile | 4 ++-- + 2 files changed, 35 insertions(+), 40 deletions(-) + +diff --git a/Makefile b/Makefile +index 62b28ec..f607ddb 100644 +--- a/Makefile ++++ b/Makefile +@@ -17,9 +17,7 @@ SYSNAME := $(shell uname -n) + VERSION=0.0 + + # Installation prefix... +-PREFIX=/usr/local + PREFIX=/usr +-PREFIX=$(DESTDIR)/usr + + # Pathnames for this package... + BIN=$(PREFIX)/bin +@@ -38,7 +36,7 @@ INSTALL=install + ROOT=root + + # Pathnames for referenced packages... +-FOODB=$(DESTDIR)/usr/share/foomatic/db/source ++FOODB=$(PREFIX)/share/foomatic/db/source + + # User ID's + LPuid=-oroot +@@ -454,32 +452,32 @@ all-done: + + + foo2zjs: foo2zjs.o $(LIBJBG) +- $(CC) $(CFLAGS) -o $@ foo2zjs.o $(LIBJBG) ++ $(CC) $(CFLAGS) -o $@ foo2zjs.o $(LIBJBG) $(LDFLAGS) + + foo2hp: foo2hp.o $(LIBJBG) +- # $(CC) $(CFLAGS) -o $@ foo2hp.o $(LIBJBG) /usr/local/lib/libdmalloc.a +- $(CC) $(CFLAGS) -o $@ foo2hp.o $(LIBJBG) ++ # $(CC) $(CFLAGS) -o $@ foo2hp.o $(LIBJBG) $(LDFLAGS) /usr/local/lib/libdmalloc.a ++ $(CC) $(CFLAGS) -o $@ foo2hp.o $(LIBJBG) $(LDFLAGS) + + foo2xqx: foo2xqx.o $(LIBJBG) +- $(CC) $(CFLAGS) -o $@ foo2xqx.o $(LIBJBG) ++ $(CC) $(CFLAGS) -o $@ foo2xqx.o $(LIBJBG) $(LDFLAGS) + + foo2lava: foo2lava.o $(LIBJBG) +- $(CC) $(CFLAGS) -o $@ foo2lava.o $(LIBJBG) ++ $(CC) $(CFLAGS) -o $@ foo2lava.o $(LIBJBG) $(LDFLAGS) + + foo2qpdl: foo2qpdl.o $(LIBJBG) +- $(CC) $(CFLAGS) -o $@ foo2qpdl.o $(LIBJBG) ++ $(CC) $(CFLAGS) -o $@ foo2qpdl.o $(LIBJBG) $(LDFLAGS) + + foo2oak: foo2oak.o $(LIBJBG) +- $(CC) $(CFLAGS) -o $@ foo2oak.o $(LIBJBG) ++ $(CC) $(CFLAGS) -o $@ foo2oak.o $(LIBJBG) $(LDFLAGS) + + foo2slx: foo2slx.o $(LIBJBG) +- $(CC) $(CFLAGS) -o $@ foo2slx.o $(LIBJBG) ++ $(CC) $(CFLAGS) -o $@ foo2slx.o $(LIBJBG) $(LDFLAGS) + + foo2hiperc: foo2hiperc.o $(LIBJBG) +- $(CC) $(CFLAGS) -o $@ foo2hiperc.o $(LIBJBG) ++ $(CC) $(CFLAGS) -o $@ foo2hiperc.o $(LIBJBG) $(LDFLAGS) + + foo2hbpl2: foo2hbpl2.o $(LIBJBG) +- $(CC) $(CFLAGS) -o $@ foo2hbpl2.o $(LIBJBG) ++ $(CC) $(CFLAGS) -o $@ foo2hbpl2.o $(LIBJBG) $(LDFLAGS) + + + foo2zjs-wrapper: foo2zjs-wrapper.in Makefile +@@ -559,46 +557,46 @@ ifeq ($(UNAME),Darwin) + endif + + ok: ok.o $(LIBJBG) +- $(CC) $(CFLAGS) ok.o $(LIBJBG) -o $@ ++ $(CC) $(CFLAGS) ok.o $(LIBJBG) -o $@ $(LDFLAGS) + + gipddecode: gipddecode.o $(LIBJBG) +- $(CC) $(CFLAGS) gipddecode.o $(LIBJBG) -o $@ ++ $(CC) $(CFLAGS) gipddecode.o $(LIBJBG) -o $@ $(LDFLAGS) + + hbpldecode: hbpldecode.o $(LIBJBG) +- $(CC) $(CFLAGS) hbpldecode.o $(LIBJBG) -o $@ ++ $(CC) $(CFLAGS) hbpldecode.o $(LIBJBG) -o $@ $(LDFLAGS) + + hipercdecode: hipercdecode.o $(LIBJBG) +- $(CC) $(CFLAGS) hipercdecode.o $(LIBJBG) -o $@ ++ $(CC) $(CFLAGS) hipercdecode.o $(LIBJBG) -o $@ $(LDFLAGS) + + lavadecode: lavadecode.o $(LIBJBG) +- $(CC) $(CFLAGS) lavadecode.o $(LIBJBG) -o $@ ++ $(CC) $(CFLAGS) lavadecode.o $(LIBJBG) -o $@ $(LDFLAGS) + + oakdecode: oakdecode.o $(LIBJBG) +- $(CC) $(CFLAGS) -g oakdecode.o $(LIBJBG) -o $@ ++ $(CC) $(CFLAGS) -g oakdecode.o $(LIBJBG) -o $@ $(LDFLAGS) + + opldecode: opldecode.o $(LIBJBG) +- $(CC) $(CFLAGS) -g opldecode.o $(LIBJBG) -o $@ ++ $(CC) $(CFLAGS) -g opldecode.o $(LIBJBG) -o $@ $(LDFLAGS) + + qpdldecode: qpdldecode.o $(LIBJBG) +- $(CC) $(CFLAGS) qpdldecode.o $(LIBJBG) -o $@ ++ $(CC) $(CFLAGS) qpdldecode.o $(LIBJBG) -o $@ $(LDFLAGS) + + splcdecode: splcdecode.o $(LIBJBG) +- $(CC) $(CFLAGS) splcdecode.o $(LIBJBG) -lz -o $@ ++ $(CC) $(CFLAGS) splcdecode.o $(LIBJBG) -lz -o $@ $(LDFLAGS) + + slxdecode: slxdecode.o $(LIBJBG) +- $(CC) $(CFLAGS) slxdecode.o $(LIBJBG) -o $@ ++ $(CC) $(CFLAGS) slxdecode.o $(LIBJBG) -o $@ $(LDFLAGS) + + xqxdecode: xqxdecode.o $(LIBJBG) +- $(CC) $(CFLAGS) xqxdecode.o $(LIBJBG) -o $@ ++ $(CC) $(CFLAGS) xqxdecode.o $(LIBJBG) -o $@ $(LDFLAGS) + + zjsdecode: zjsdecode.o $(LIBJBG) +- $(CC) $(CFLAGS) zjsdecode.o $(LIBJBG) -o $@ ++ $(CC) $(CFLAGS) zjsdecode.o $(LIBJBG) -o $@ $(LDFLAGS) + + command2foo2lava-pjl: command2foo2lava-pjl.o +- $(CC) $(CFLAGS) -L/usr/local/lib command2foo2lava-pjl.o -lcups -o $@ ++ $(CC) $(CFLAGS) -L/usr/local/lib command2foo2lava-pjl.o -lcups -o $@ $(LDFLAGS) + + command2foo2lava-pjl.o: command2foo2lava-pjl.c +- $(CC) $(CFLAGS) -I/usr/local/include -c command2foo2lava-pjl.c ++ $(CC) $(CPPFLAGS) $(CFLAGS) -I/usr/local/include -c command2foo2lava-pjl.c + + # + # Installation rules +@@ -644,8 +642,6 @@ install-test: + # + + +-UDEVBIN=$(DESTDIR)/bin/ +- + install-prog: + # + # Install driver, wrapper, and development tools +@@ -653,8 +649,7 @@ install-prog: + $(INSTALL) -d $(BIN) + $(INSTALL) -c $(PROGS) $(SHELLS) $(BIN)/ + if [ "$(BINPROGS)" != "" ]; then \ +- $(INSTALL) -d $(UDEVBIN); \ +- $(INSTALL) -c $(BINPROGS) $(UDEVBIN); \ ++ $(INSTALL) -c $(BINPROGS) $(BIN); \ + fi + # + # Install gamma correction files. These are just templates, +@@ -841,7 +836,7 @@ install-extra: + done + + MODEL=$(PREFIX)/share/cups/model +-LOCALMODEL=$(DESTDIR)/usr/local/share/cups/model ++LOCALMODEL=$(PREFIX)/local/share/cups/model + MACMODEL=/Library/Printers/PPDs/Contents/Resources + PPD=$(PREFIX)/share/ppd + VARPPD=/var/lp/ppd +@@ -901,9 +896,9 @@ install-ppd: + done; \ + fi + +-APPL=$(DESTDIR)/usr/share/applications +-OLDAPPL=$(DESTDIR)/usr/share/gnome/apps/System +-PIXMAPS=$(DESTDIR)/usr/share/pixmaps ++APPL=$(PREFIX)/share/applications ++OLDAPPL=$(PREFIX)/share/gnome/apps/System ++PIXMAPS=$(PREFIX)/share/pixmaps + + install-desktop: + # +@@ -1037,6 +1032,7 @@ install-hotplug-osx: + + install-filter: + if [ "$(CUPS_SERVERBIN)" != "" ]; then \ ++ mkdir -p $(CUPS_SERVERBIN)/filter/; \ + ln -sf $(BIN)/command2foo2lava-pjl $(CUPS_SERVERBIN)/filter/; \ + fi + +@@ -1443,10 +1439,9 @@ ppd: + *) driver=foo2zjs;; \ + esac; \ + echo $$driver - $$printer; \ +- ENGINE=../foomatic/foomatic-db-engine; \ + PERL5LIB=$$ENGINE/lib \ + FOOMATICDB=foomatic-db \ +- $$ENGINE/foomatic-ppdfile \ ++ /usr/bin/foomatic-ppdfile \ + -d $$driver -p $$printer \ + > PPD/$$printer.ppd; \ + done +@@ -1885,7 +1880,7 @@ FRC: + misc: pksm2bitcmyk phorum-logo.gif + + pksm2bitcmyk: pksm2bitcmyk.c +- $(CC) $(CFLAGS) pksm2bitcmyk.c -lnetpbm -o $@ ++ $(CC) $(CFLAGS) pksm2bitcmyk.c -lnetpbm -o $@ $(LDFLAGS) + + phorum-logo.gif: archhp.fig + fig2dev -L gif -m.25 archhp.fig | giftrans -t "#ffffff" -o $@ +diff --git a/icc2ps/Makefile b/icc2ps/Makefile +index fab1d01..0777b40 100644 +--- a/icc2ps/Makefile ++++ b/icc2ps/Makefile +@@ -9,7 +9,7 @@ SRC= icc2ps.c xgetopt.c + LIB= cmscam97.c cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \ + cmslut.c cmsmatsh.c cmsmtrx.c cmsnamed.c cmspack.c cmspcs.c cmsps2.c \ + cmssamp.c cmswtpnt.c cmsxform.c cmsio0.c cmsvirt.c +-CFLAGS= -O3 ++CFLAGS+= -O3 + INSTALL=install + ifeq ($(UNAME),SunOS) + INSTALL=/usr/ucb/install +@@ -21,7 +21,7 @@ endif + all: foo2zjs-icc2ps man + + foo2zjs-icc2ps: $(SRC) $(LIB) +- $(CC) $(CFLAGS) $(SRC) $(LIB) -lm -o $@ ++ $(CC) $(CPPFLAGS) $(CFLAGS) $(SRC) $(LIB) -lm -o $@ $(LDFLAGS) + + install: all + $(INSTALL) -c foo2zjs-icc2ps $(BIN) diff -Nru foo2zjs-20160313dfsg0/debian/patches/0002-Fix-icc2ps-build.patch foo2zjs-20160902dfsg0/debian/patches/0002-Fix-icc2ps-build.patch --- foo2zjs-20160313dfsg0/debian/patches/0002-Fix-icc2ps-build.patch 1970-01-01 00:00:00.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/0002-Fix-icc2ps-build.patch 2016-10-08 16:37:39.000000000 +0000 @@ -0,0 +1,40 @@ +From ccbb40ce66594ba0084bd942f1b48621be7a1cb4 Mon Sep 17 00:00:00 2001 +From: Didier Raboud +Date: Tue, 4 Oct 2016 11:43:44 +0200 +Subject: Fix icc2ps build + +Include unistd.h to make sure the swab function is not implicitely declared, +also declare _XOPEN_SOURCE to have it available through unistd.h, and +therefore declare _GNU_SOURCE to have strcasecmp() and vsnprintf() +--- + icc2ps/Makefile | 4 ++++ + icc2ps/cmsio1.c | 1 + + 2 files changed, 5 insertions(+) + +diff --git a/icc2ps/Makefile b/icc2ps/Makefile +index 0777b40..846285a 100644 +--- a/icc2ps/Makefile ++++ b/icc2ps/Makefile +@@ -10,6 +10,10 @@ LIB= cmscam97.c cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \ + cmslut.c cmsmatsh.c cmsmtrx.c cmsnamed.c cmspack.c cmspcs.c cmsps2.c \ + cmssamp.c cmswtpnt.c cmsxform.c cmsio0.c cmsvirt.c + CFLAGS+= -O3 ++ ++# _XOPEN_SOURCE is required for swab() but undefines strcasecmp(), so add _GNU_SOURCE as well: ++CFLAGS+= -D_XOPEN_SOURCE -D_GNU_SOURCE ++ + INSTALL=install + ifeq ($(UNAME),SunOS) + INSTALL=/usr/ucb/install +diff --git a/icc2ps/cmsio1.c b/icc2ps/cmsio1.c +index 1f02720..9f9d6e4 100644 +--- a/icc2ps/cmsio1.c ++++ b/icc2ps/cmsio1.c +@@ -71,6 +71,7 @@ void xswab(const void *from, void *to, size_t len) + #undef STEP + } + #else ++#include + #define xswab swab + #endif + diff -Nru foo2zjs-20160313dfsg0/debian/patches/0003-Don-t-build-icc2ps-but-use-psicc-from-liblcms2-utils.patch foo2zjs-20160902dfsg0/debian/patches/0003-Don-t-build-icc2ps-but-use-psicc-from-liblcms2-utils.patch --- foo2zjs-20160313dfsg0/debian/patches/0003-Don-t-build-icc2ps-but-use-psicc-from-liblcms2-utils.patch 1970-01-01 00:00:00.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/0003-Don-t-build-icc2ps-but-use-psicc-from-liblcms2-utils.patch 2016-10-08 16:37:39.000000000 +0000 @@ -0,0 +1,107 @@ +From 142db2c7aea73d134da73f7ad98f151bf741e1fe Mon Sep 17 00:00:00 2001 +From: Michael Gilbert +Date: Tue, 4 Oct 2016 11:43:45 +0200 +Subject: Don't build icc2ps but use psicc from liblcms2-utils instead + +--- + Makefile | 22 +++++----------------- + 1 file changed, 5 insertions(+), 17 deletions(-) + +diff --git a/Makefile b/Makefile +index f607ddb..38d65e1 100644 +--- a/Makefile ++++ b/Makefile +@@ -188,13 +188,6 @@ FILES = \ + foomatic-db/*/*.xml \ + foomatic-test \ + getweb.in \ +- icc2ps/*.[ch] \ +- icc2ps/*.1in \ +- icc2ps/Makefile \ +- icc2ps/AUTHORS \ +- icc2ps/COPYING \ +- icc2ps/README \ +- icc2ps/README.foo2zjs \ + osx-hotplug/Makefile \ + osx-hotplug/*.m \ + osx-hotplug/*.1in \ +@@ -379,7 +372,7 @@ JBGOPTS=-m 16 -d 0 -p 92 # Equivalent options for pbmtojbg + # The usual build rules + # + all: all-test $(PROGS) $(BINPROGS) $(SHELLS) getweb \ +- all-icc2ps all-osx-hotplug man doc \ ++ all-osx-hotplug man doc \ + all-done + + all-test: +@@ -601,7 +594,7 @@ command2foo2lava-pjl.o: command2foo2lava-pjl.c + # + # Installation rules + # +-install: all install-test install-prog install-icc2ps install-osx-hotplug \ ++install: all install-test install-prog install-osx-hotplug \ + install-extra install-crd install-foo install-ppd \ + install-gui install-desktop install-filter \ + install-man install-doc +@@ -1136,7 +1129,6 @@ uninstall: + -rm -f $(MANDIR)/man1/foo2hbpl*.1 $(MANDIR)/man1/hbpldecode.1 + -rm -f $(MANDIR)/man1/gipddecode.1 + -rm -f $(MANDIR)/man1/arm2hpdl.1 $(MANDIR)/man1/usb_printerid.1 +- -rm -f $(MANDIR)/man1/foo2zjs-icc2ps.1 + -rm -rf /usr/share/foo2zjs/ + -rm -rf /usr/share/foo2hp/ + -rm -rf /usr/share/foo2oak/ +@@ -1161,7 +1153,6 @@ uninstall: + -rm -f /usr/bin/hbpldecode + -rm -f /usr/bin/opldecode + -rm -f /usr/bin/rodecode +- -rm -f /usr/bin/foo2zjs-icc2ps + -rm -f /usr/bin/foo2zjs-pstops + -rm -f /usr/bin/command2foo2lava-pjl + -rm -f /usr/lib/cups/filter/command2foo2lava-pjl +@@ -1204,7 +1195,6 @@ clean: + -rm -f *.zjs *.zm *.zc *.zc? *.zc?? *.oak *.pbm *.pksm *.cmyk + -rm -f pksm2bitcmyk + -rm -f *.icm.*.ps +- cd icc2ps; $(MAKE) $@ + cd osx-hotplug; $(MAKE) $@ + + # +@@ -1354,7 +1344,7 @@ pprtest-3.oak: FRC + # + # icc2ps regression tests + # +-ICC2PS=./icc2ps/foo2zjs-icc2ps ++ICC2PS=/usr/bin/psicc + icctest: + for g in *.icm; do \ + for i in 0 1 2 3; do \ +@@ -1454,7 +1444,7 @@ oldppd: + # Manpage generation. No, I am not interested in "info" files or + # HTML documentation. + # +-man: $(MANPAGES) man-icc2ps man-osx-hotplug ++man: $(MANPAGES) man-osx-hotplug + + $(MANPAGES): macros.man includer-man + +@@ -1521,7 +1511,6 @@ install-man: man + $(INSTALL) -c -m 644 arm2hpdl.1 $(MANDIR)/man1/ + $(INSTALL) -c -m 644 usb_printerid.1 $(MANDIR)/man1/ + $(INSTALL) -c -m 644 printer-profile.1 $(MANDIR)/man1/ +- cd icc2ps; $(MAKE) install-man + ifeq ($(UNAME),Darwin) + cd osx-hotplug; $(MAKE) install-man + endif +@@ -1542,10 +1531,9 @@ install-doc: doc + + GROFF=/usr/local/test/bin/groff + GROFF=groff +-manual.pdf: $(MANPAGES) icc2ps/foo2zjs-icc2ps.1 osx-hotplug/osx-hplj-hotplug.1 ++manual.pdf: $(MANPAGES) osx-hotplug/osx-hplj-hotplug.1 + -$(GROFF) -t -man \ + `ls $(MANPAGES) \ +- icc2ps/foo2zjs-icc2ps.1 \ + osx-hotplug/osx-hplj-hotplug.1 \ + | sort` \ + | ps2pdf - $@ diff -Nru foo2zjs-20160313dfsg0/debian/patches/0004-Use-the-Debian-provided-libjbig.patch foo2zjs-20160902dfsg0/debian/patches/0004-Use-the-Debian-provided-libjbig.patch --- foo2zjs-20160313dfsg0/debian/patches/0004-Use-the-Debian-provided-libjbig.patch 1970-01-01 00:00:00.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/0004-Use-the-Debian-provided-libjbig.patch 2016-10-08 16:37:39.000000000 +0000 @@ -0,0 +1,33 @@ +From 0757a5d521a172011ab30eb3f581dd18f813833b Mon Sep 17 00:00:00 2001 +From: Didier Raboud +Date: Tue, 4 Oct 2016 11:43:47 +0200 +Subject: Use the Debian-provided libjbig. + +--- + Makefile | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/Makefile b/Makefile +index 38d65e1..5b9eba5 100644 +--- a/Makefile ++++ b/Makefile +@@ -125,10 +125,6 @@ FILES = \ + Makefile \ + foo2zjs.c \ + foo2zjs.1in \ +- jbig.c \ +- jbig.h \ +- jbig_ar.c \ +- jbig_ar.h \ + zjsdecode.c \ + zjsdecode.1in \ + zjs.h \ +@@ -275,7 +271,7 @@ MANPAGES+= foo2hbpl2-wrapper.1 foo2hbpl2.1 hbpldecode.1 + MANPAGES+= gipddecode.1 + MANPAGES+= foo2zjs-pstops.1 arm2hpdl.1 usb_printerid.1 + MANPAGES+= printer-profile.1 +-LIBJBG = jbig.o jbig_ar.o ++LIBJBG = -ljbig + BINPROGS= + + ifeq ($(UNAME),Linux) diff -Nru foo2zjs-20160313dfsg0/debian/patches/0005-Link-against-system-liblcms1.patch foo2zjs-20160902dfsg0/debian/patches/0005-Link-against-system-liblcms1.patch --- foo2zjs-20160313dfsg0/debian/patches/0005-Link-against-system-liblcms1.patch 1970-01-01 00:00:00.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/0005-Link-against-system-liblcms1.patch 2016-10-08 16:37:39.000000000 +0000 @@ -0,0 +1,33 @@ +From e999ed655848954a33cf6377f6a1dcec4479e2ef Mon Sep 17 00:00:00 2001 +From: Didier Raboud +Date: Tue, 4 Oct 2016 11:43:48 +0200 +Subject: Link against system liblcms1 + +--- + icc2ps/Makefile | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/icc2ps/Makefile b/icc2ps/Makefile +index 846285a..e6e5ee2 100644 +--- a/icc2ps/Makefile ++++ b/icc2ps/Makefile +@@ -6,9 +6,7 @@ BIN= $(PREFIX)/bin + MANDIR=$(PREFIX)/share/man + + SRC= icc2ps.c xgetopt.c +-LIB= cmscam97.c cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \ +- cmslut.c cmsmatsh.c cmsmtrx.c cmsnamed.c cmspack.c cmspcs.c cmsps2.c \ +- cmssamp.c cmswtpnt.c cmsxform.c cmsio0.c cmsvirt.c ++LIB= -llcms + CFLAGS+= -O3 + + # _XOPEN_SOURCE is required for swab() but undefines strcasecmp(), so add _GNU_SOURCE as well: +@@ -55,7 +53,7 @@ install-man: man + clean: + rm -f *.o foo2zjs-icc2ps *.1 + +-foo2zjs-icc2ps: icc34.h lcms.h ++foo2zjs-icc2ps: icc34.h + + regress: all + @./foo2zjs-icc2ps a b 2>&1 | grep "little cms P" diff -Nru foo2zjs-20160313dfsg0/debian/patches/0006-Correct-the-udev-rules.patch foo2zjs-20160902dfsg0/debian/patches/0006-Correct-the-udev-rules.patch --- foo2zjs-20160313dfsg0/debian/patches/0006-Correct-the-udev-rules.patch 1970-01-01 00:00:00.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/0006-Correct-the-udev-rules.patch 2016-10-08 16:37:39.000000000 +0000 @@ -0,0 +1,89 @@ +From f26a93eb710e13894b8ff65923ed512d62e23866 Mon Sep 17 00:00:00 2001 +From: Luca Capello +Date: Tue, 4 Oct 2016 11:43:49 +0200 +Subject: Correct the udev rules: + + a) remove KERNEL=="lp*", as usblp is now blacklisted by CUPS (it will work without CUPS too). + b) Replace paths: /etc/hotplug/usb/ by no path, as the binaries are shipped in /lib/udev/ + c) Drop the MODE specification + d) Add ACTION=="ADD", otherwise the firmware script runs after unplugging as well +Author: Didier Raboud +Author: Peter De Wachter +--- + hplj10xx.rules | 58 +++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 31 insertions(+), 27 deletions(-) + +diff --git a/hplj10xx.rules b/hplj10xx.rules +index ee0295d..3d69ca3 100644 +--- a/hplj10xx.rules ++++ b/hplj10xx.rules +@@ -2,38 +2,42 @@ + # hplj10xx.rules.old: udev equal or after 1.30 + # + #Own udev rule for HP Laserjet 1000 +-KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ +- ATTRS{product}=="hp LaserJet 1000", NAME="usb/%k", \ +- SYMLINK+="hplj1000-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1000" ++ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ ++ ATTRS{product}=="hp LaserJet 1000", \ ++ SYMLINK+="hplj1000-%n", RUN+="hplj1000" + #Own udev rule for HP Laserjet 1005 +-KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ +- ATTRS{product}=="hp LaserJet 1005 series", NAME="usb/%k", \ +- SYMLINK+="hplj1005-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1005" ++ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ ++ ATTRS{product}=="hp LaserJet 1005 series", \ ++ SYMLINK+="hplj1005-%n", RUN+="hplj1005" + #Own udev rule for HP Laserjet 1018 +-KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ +- ATTRS{product}=="HP LaserJet 1018", NAME="usb/%k", \ +- SYMLINK+="hplj1018-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1018" ++ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ ++ ATTRS{product}=="HP LaserJet 1018", \ ++ SYMLINK+="hplj1018-%n", RUN+="hplj1018" + #Own udev rule for HP Laserjet 1020 +-KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ +- ATTRS{product}=="HP LaserJet 1020", NAME="usb/%k", \ +- SYMLINK+="hplj1020-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1020" ++ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ ++ ATTRS{product}=="HP LaserJet 1020", \ ++ SYMLINK+="hplj1020-%n", RUN+="hplj1020" + #Own udev rule for HP Laserjet P1005 +-KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ +- ATTRS{product}=="HP LaserJet P1005", NAME="usb/%k", \ +- SYMLINK+="hpljP1005-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1005" ++ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ ++ ATTRS{product}=="HP LaserJet P1005", \ ++ SYMLINK+="hpljP1005-%n", RUN+="hpljP1005" + #Own udev rule for HP Laserjet P1006 +-KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ +- ATTRS{product}=="HP LaserJet P1006", NAME="usb/%k", \ +- SYMLINK+="hpljP1006-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1006" ++ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ ++ ATTRS{product}=="HP LaserJet P1006", \ ++ SYMLINK+="hpljP1006-%n", RUN+="hpljP1006" + #Own udev rule for HP Laserjet P1007 +-KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ +- ATTRS{product}=="HP LaserJet P1007", NAME="usb/%k", \ +- SYMLINK+="hpljP1007-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1007" ++ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ ++ ATTRS{product}=="HP LaserJet P1007", \ ++ SYMLINK+="hpljP1007-%n", RUN+="hpljP1007" + #Own udev rule for HP Laserjet P1008 +-KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ +- ATTRS{product}=="HP LaserJet P1008", NAME="usb/%k", \ +- SYMLINK+="hpljP1008-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1008" ++ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ ++ ATTRS{product}=="HP LaserJet P1008", \ ++ SYMLINK+="hpljP1008-%n", RUN+="hpljP1008" + #Own udev rule for HP Laserjet P1505 +-KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ +- ATTRS{product}=="HP LaserJet P1505", NAME="usb/%k", \ +- SYMLINK+="hpljP1505-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1505" ++ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ ++ ATTRS{product}=="HP LaserJet P1505", \ ++ SYMLINK+="hpljP1505-%n", RUN+="hpljP1505" ++#Own udev rule for HP Laserjet P1505n ++ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ ++ ATTRS{product}=="HP LaserJet P1505n", \ ++ SYMLINK+="hpljP1505n-%n", RUN+="hpljP1505n" diff -Nru foo2zjs-20160313dfsg0/debian/patches/0007-Remove-Encoding-from-.desktop-file.patch foo2zjs-20160902dfsg0/debian/patches/0007-Remove-Encoding-from-.desktop-file.patch --- foo2zjs-20160313dfsg0/debian/patches/0007-Remove-Encoding-from-.desktop-file.patch 1970-01-01 00:00:00.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/0007-Remove-Encoding-from-.desktop-file.patch 2016-10-08 16:37:39.000000000 +0000 @@ -0,0 +1,19 @@ +From 49bfc6f07393daf40a6843acb60373783304c81f Mon Sep 17 00:00:00 2001 +From: Didier Raboud +Date: Tue, 4 Oct 2016 11:43:50 +0200 +Subject: Remove 'Encoding' from .desktop file + +--- + hplj1020.desktop | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/hplj1020.desktop b/hplj1020.desktop +index 121ab2b..49f9705 100644 +--- a/hplj1020.desktop ++++ b/hplj1020.desktop +@@ -1,5 +1,4 @@ + [Desktop Entry] +-Encoding=UTF-8 + Name=Reactivate HP LaserJet 1018/1020 after reloading paper + Comment=Click the button in this program when your printer ran out of paper and you have refilled the paper + # zExec=usb_printerid /dev/usb/lp0 diff -Nru foo2zjs-20160313dfsg0/debian/patches/0008-Do-not-display-the-icon-by-default.patch foo2zjs-20160902dfsg0/debian/patches/0008-Do-not-display-the-icon-by-default.patch --- foo2zjs-20160313dfsg0/debian/patches/0008-Do-not-display-the-icon-by-default.patch 1970-01-01 00:00:00.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/0008-Do-not-display-the-icon-by-default.patch 2016-10-08 16:37:39.000000000 +0000 @@ -0,0 +1,19 @@ +From 65b6817b01951e863e3cf671541dc080bd5b8149 Mon Sep 17 00:00:00 2001 +From: Didier Raboud +Date: Tue, 4 Oct 2016 11:43:51 +0200 +Subject: Do not display the icon by default + +See #579154 +--- + hplj1020.desktop | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/hplj1020.desktop b/hplj1020.desktop +index 49f9705..76adb31 100644 +--- a/hplj1020.desktop ++++ b/hplj1020.desktop +@@ -9,3 +9,4 @@ Icon=/usr/share/pixmaps/hplj1020_icon.png + StartupNotify=true + Categories=System; + X-Desktop-File-Install-Version=0.10 ++NoDisplay=true diff -Nru foo2zjs-20160313dfsg0/debian/patches/0009-Launch-the-_gui.tcl-directly-instead-of-launching-wi.patch foo2zjs-20160902dfsg0/debian/patches/0009-Launch-the-_gui.tcl-directly-instead-of-launching-wi.patch --- foo2zjs-20160313dfsg0/debian/patches/0009-Launch-the-_gui.tcl-directly-instead-of-launching-wi.patch 1970-01-01 00:00:00.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/0009-Launch-the-_gui.tcl-directly-instead-of-launching-wi.patch 2016-10-08 16:37:39.000000000 +0000 @@ -0,0 +1,23 @@ +From ce2f1d75f614d1620274250e695457cb18f59f91 Mon Sep 17 00:00:00 2001 +From: Didier Raboud +Date: Tue, 4 Oct 2016 11:43:52 +0200 +Subject: Launch the _gui.tcl directly (instead of launching wish outside of + it), avoids a lintian warning. + +--- + hplj1020.desktop | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hplj1020.desktop b/hplj1020.desktop +index 76adb31..6dd0b3f 100644 +--- a/hplj1020.desktop ++++ b/hplj1020.desktop +@@ -2,7 +2,7 @@ + Name=Reactivate HP LaserJet 1018/1020 after reloading paper + Comment=Click the button in this program when your printer ran out of paper and you have refilled the paper + # zExec=usb_printerid /dev/usb/lp0 +-Exec=wish /usr/share/foo2zjs/hplj10xx_gui.tcl ++Exec=/usr/share/foo2zjs/hplj10xx_gui.tcl + Terminal=false + Type=Application + Icon=/usr/share/pixmaps/hplj1020_icon.png diff -Nru foo2zjs-20160313dfsg0/debian/patches/0010-Correct-the-path-for-the-usb_printerid-program.patch foo2zjs-20160902dfsg0/debian/patches/0010-Correct-the-path-for-the-usb_printerid-program.patch --- foo2zjs-20160313dfsg0/debian/patches/0010-Correct-the-path-for-the-usb_printerid-program.patch 1970-01-01 00:00:00.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/0010-Correct-the-path-for-the-usb_printerid-program.patch 2016-10-08 16:37:39.000000000 +0000 @@ -0,0 +1,22 @@ +From 32b488c16e93c58ef1672adcac12e0eed353829b Mon Sep 17 00:00:00 2001 +From: Didier Raboud +Date: Tue, 4 Oct 2016 11:43:53 +0200 +Subject: Correct the path for the usb_printerid program + +--- + hplj1000 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hplj1000 b/hplj1000 +index 323069c..bb87a79 100755 +--- a/hplj1000 ++++ b/hplj1000 +@@ -60,7 +60,7 @@ FWDIR=/usr/share/foo2zjs/firmware + # [snip] + # # Mount all other filesystems (except for NFS and /proc, which is already + # +-PRINTERID=/bin/usb_printerid ++PRINTERID=`which usb_printerid` + + # + # Figure out how to log our messages diff -Nru foo2zjs-20160313dfsg0/debian/patches/0011-Improve-getweb-also-for-installing-the-firmware.patch foo2zjs-20160902dfsg0/debian/patches/0011-Improve-getweb-also-for-installing-the-firmware.patch --- foo2zjs-20160313dfsg0/debian/patches/0011-Improve-getweb-also-for-installing-the-firmware.patch 1970-01-01 00:00:00.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/0011-Improve-getweb-also-for-installing-the-firmware.patch 2016-10-08 16:37:40.000000000 +0000 @@ -0,0 +1,317 @@ +From 7f4bca2b285578c5ab846c8586cab1a715a3a94a Mon Sep 17 00:00:00 2001 +From: Didier Raboud +Date: Tue, 4 Oct 2016 11:43:54 +0200 +Subject: Improve getweb also for installing the firmware + +Fix the icm file installing code to create inexistant folders +--- + getweb.in | 80 +++++++++++++++++++++++++++++++++++++++++++++------------------ + 1 file changed, 58 insertions(+), 22 deletions(-) + +diff --git a/getweb.in b/getweb.in +index 5215e02..11f2aa6 100755 +--- a/getweb.in ++++ b/getweb.in +@@ -1,8 +1,10 @@ + #!/bin/sh + ++set -e ++ + # + # (c) Copyright Rick Richardson 2008 +-# ++# This version has been modified by Debian + + # + # PLEASE don't remove the copyright statements. They should +@@ -12,6 +14,13 @@ + VERSION='$Id: getweb.in,v 1.114 2015/02/12 00:22:02 rick Exp $' + + WGETOPTS="--passive-ftp -q" ++ARM2HPDL="/usr/bin/arm2hpdl" ++ ++if [ $(id -ru) -ne 0 ]; then ++ echo "You need to be root" ++ exit 1 ++fi ++ + + usage() { + cat </dev/null` ++WGET=`which wget` + if [ "$SYSTEM" = Darwin -a "$WGET" = "" ] + then + WGETOPTS= +@@ -117,6 +124,20 @@ then + } + fi + ++putfw() { ++ inputname=$1 ++ outputname=$2 ++ $ARM2HPDL $inputname > /usr/share/foo2zjs/firmware/$outputname ++ rm $inputname ++} ++ ++puticm() { ++ drivername=$1 ++ icmfolder=/usr/share/"$drivername"/icm/ ++ [ -d $icmfolder ] || mkdir -p $icmfolder ++ mv *.icm $icmfolder ++} ++ + # + # Download a .EXE file from the web, unzip it, and extract the + # files we want +@@ -163,6 +184,7 @@ getone() { + #lj1488en.exe \ + #sihp1000.img + copyright "(c) Copyright Hewlett-Packard 2001" ++ putfw sihp1000.img sihp1000.dl + ;; + lj1005|1005) + gettgz \ +@@ -178,12 +200,14 @@ getone() { + http://foo2zjs.rkkda.com/firmware sihpP1005.tar.gz \ + "" + copyright "(c) Copyright Hewlett-Packard 2009" ++ putfw sihp1005.img sihp1005.dl + ;; + lj1018|1018) + gettgz \ + http://foo2zjs.rkkda.com/firmware sihp1018.tar.gz \ + "" + copyright "(c) Copyright Hewlett-Packard 2005" ++ putfw sihp1018.img sihp1018.dl + ;; + lj1020|1020) + # http://ftp.hp.com/pub/softlib/software8/COL14041/lj-39322-2/hp_LJ_1020-1022_Full_Solution.exe +@@ -191,24 +215,28 @@ getone() { + http://foo2zjs.rkkda.com/firmware sihp1020.tar.gz \ + "" + copyright "(c) Copyright Hewlett-Packard 2005" ++ putfw sihp1020.img sihp1020.dl + ;; + [pP]100[57]) + gettgz \ + http://foo2zjs.rkkda.com/firmware sihpP1005.tar.gz \ + "" + copyright "(c) Copyright Hewlett-Packard 2009" ++ putfw sihpP1005.img sihpP1005.dl + ;; + [pP]100[68]) + gettgz \ + http://foo2zjs.rkkda.com/firmware sihpP1006.tar.gz \ + "" + copyright "(c) Copyright Hewlett-Packard 2009" ++ putfw sihpP1006.img sihpP1006.dl + ;; + [pP]1505) + gettgz \ + http://foo2zjs.rkkda.com/firmware sihpP1505.tar.gz \ + "" + copyright "(c) Copyright Hewlett-Packard 2009" ++ putfw sihpP1505.img sihpP1505.dl + ;; + 2200dl|2200) + if true; then +@@ -221,6 +249,7 @@ getone() { + "*.icm" + fi + copyright "(c) Copyright Minolta-QMS 1999" ++ puticm foo2zjs + ;; + 2300dl|2300) + if true; then +@@ -236,6 +265,7 @@ getone() { + http://foo2zjs.rkkda.com/icm km2430.tar.gz \ + "" + copyright "(c) Copyright Minolta-QMS 2001" ++ puticm foo2zjs + ;; + 2300dl_fw) + # 2300DL firmware upgrade to v2.55 +@@ -264,12 +294,14 @@ getone() { + done + fi + copyright "(c) Copyright Minolta-QMS 1998" ++ puticm foo2zjs + ;; + 2430) + gettgz \ + http://foo2zjs.rkkda.com/icm km2430.tar.gz \ + "" + copyright "(c) Copyright Konica Minolta 2003" ++ puticm foo2zjs + ;; + 2530|2490|6115|2480|1600w|1680|1690|4690|110|6121) + gettgz \ +@@ -281,6 +313,7 @@ getone() { + http://foo2lava.rkkda.com/icm km-1600.tar.gz \ + "" + copyright "(c) Copyright Rick Richardson 2009. All Rights Reserved" ++ puticm foo2lava + ;; + 1500) + gettgz \ +@@ -292,12 +325,14 @@ getone() { + "" + copyright "(c) Copyright Hewlett-Packard 2003" + copyright "(c) Copyright Rick Richardson 2006. All Rights Reserved" ++ puticm foo2oak + ;; + 1025) + gettgz \ + http://foo2zjs.rkkda.com/icm hp-cp1025.tar.gz \ + "" + copyright "(c) Copyright Rick Richardson 2010. All Rights Reserved" ++ puticm foo2zjs + ;; + 1215|1600|2600*) + gettgz \ +@@ -312,6 +347,7 @@ getone() { + http://foo2hp.rkkda.com/icm hp1215.tar.gz \ + "" + copyright "(c) Copyright Rick Richardson 2008. All Rights Reserved" ++ puticm foo2hp + ;; + 300|310|315|325|360|365|2160|3160|3175|3185|6110) + gettgz \ +@@ -322,6 +358,7 @@ getone() { + http://foo2qpdl.rkkda.com/icm samclp315.tar.gz \ + "" + copyright "(c) Copyright Rick Richardson 2008. All Rights Reserved" ++ puticm foo2qpdl + ;; + 600|610) + ;; +@@ -331,6 +368,7 @@ getone() { + http://foo2slx.rkkda.com/icm lexc500.tar.gz \ + "" + copyright "(c) Copyright Lexmark 2006" ++ puticm foo2slx + ;; + + oki) +@@ -346,48 +384,56 @@ getone() { + mv "$base.ICM" "$base.icm" + done + copyright "(c) Copyright Okidata 2005, 2006" ++ puticm foo2hiperc + ;; + 301) + gettgz \ + http://foo2hiperc.rkkda.com/icm okic301.tar.gz \ + "" + copyright "(c) Copyright Okidata 2012" ++ puticm foo2hiperc + ;; + c310) + gettgz \ + http://foo2hiperc.rkkda.com/icm okic310.tar.gz \ + "" + copyright "(c) Copyright Okidata 2010" ++ puticm foo2hiperc + ;; + c511) + gettgz \ + http://foo2hiperc.rkkda.com/icm okic511.tar.gz \ + "" + copyright "(c) Copyright Okidata 2012" ++ puticm foo2hiperc + ;; + c810) + gettgz \ + http://foo2hiperc.rkkda.com/icm okic810.tar.gz \ + "" + copyright "(c) Copyright Okidata 2012" ++ puticm foo2hiperc + ;; + 3100|3200|5100|5150|5200|5250) + gettgz \ + http://foo2hiperc.rkkda.com/icm okic3200.tar.gz \ + "" + copyright "(c) Copyright Okidata 2005" ++ puticm foo2hiperc + ;; + 3300|3400|3530) + gettgz \ + http://foo2hiperc.rkkda.com/icm okic3400.tar.gz \ + "" + copyright "(c) Copyright Okidata 2006" ++ puticm foo2hiperc + ;; + 5500|5600|5800|160) + gettgz \ + http://foo2hiperc.rkkda.com/icm okic5600.tar.gz \ + "" + copyright "(c) Copyright Okidata 2006" ++ puticm foo2hiperc + ;; + + xPPD) +@@ -443,23 +489,6 @@ getone() { + # | sed -e 's/\(^\*NickName.*\)"/\1 (foo2zjs recommended)"/' + done + ;; +- update) +- url=${URLZJS} +- file=foo2zjs.tar.gz +- wget $WGETOPTS -O $file $url/$file || +- error "Couldn't download $url/$exefile" +- mv getweb getweb.old +- HERE=`pwd` +- cd .. +- tar zxf $HERE/$file +- cd $HERE +- echo "The tarball is extracted and the current directory is up to date." +- echo -e "Remove the tarball (y/n)? \c" +- read ans +- if [ "$ans" = y ]; then +- rm -f $file +- fi +- ;; + "") + usage + ;; +@@ -474,6 +503,10 @@ if [ $# = 0 ]; then + usage + fi + ++OLDPWD=`pwd` ++NEWPWD=`mktemp --tmpdir --directory foo2zjs.XXXXXX` ++cd "$NEWPWD" ++ + for i in $* + do + case "$1" in +@@ -518,3 +551,6 @@ do + ;; + esac + done ++ ++cd "$OLDPWD" ++rmdir "$NEWPWD" diff -Nru foo2zjs-20160313dfsg0/debian/patches/0012-Use-the-same-firmware-folder-for-all-HP-LJ-printers.patch foo2zjs-20160902dfsg0/debian/patches/0012-Use-the-same-firmware-folder-for-all-HP-LJ-printers.patch --- foo2zjs-20160313dfsg0/debian/patches/0012-Use-the-same-firmware-folder-for-all-HP-LJ-printers.patch 1970-01-01 00:00:00.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/0012-Use-the-same-firmware-folder-for-all-HP-LJ-printers.patch 2016-10-08 16:37:40.000000000 +0000 @@ -0,0 +1,97 @@ +From 723dd04218ef05e82fbcbd2e1239867c004c4db4 Mon Sep 17 00:00:00 2001 +From: Didier Raboud +Date: Tue, 4 Oct 2016 11:43:55 +0200 +Subject: Use the same firmware folder for all HP LJ printers + +--- + hplj1000 | 6 ------ + hplj10xx.conf | 10 +++++----- + 2 files changed, 5 insertions(+), 11 deletions(-) + +diff --git a/hplj1000 b/hplj1000 +index bb87a79..2f22631 100755 +--- a/hplj1000 ++++ b/hplj1000 +@@ -90,37 +90,31 @@ case "$0" in + MODEL=P1005; FWMODEL=$MODEL + USB1=0x03f0 #Vendor + USB2=0x3d17 #Model +- FWDIR=/usr/share/foo2xqx/firmware + ;; + *P1006) + MODEL=P1006; FWMODEL=$MODEL + USB1=0x03f0 #Vendor + USB2=0x3e17 #Model +- FWDIR=/usr/share/foo2xqx/firmware + ;; + *P1007) + MODEL=P1007; FWMODEL=P1005 # Alias + USB1=0x03f0 #Vendor + USB2=0x4817 #Model +- FWDIR=/usr/share/foo2xqx/firmware + ;; + *P1008) + MODEL=P1008; FWMODEL=P1006 # Alias + USB1=0x03f0 #Vendor + USB2=0x4917 #Model +- FWDIR=/usr/share/foo2xqx/firmware + ;; + *P1505) + MODEL=P1505; FWMODEL=$MODEL + USB1=0x03f0 #Vendor + USB2=0x3f17 #Model +- FWDIR=/usr/share/foo2xqx/firmware + ;; + *P1505n) + MODEL=P1505n; FWMODEL=$MODEL + USB1=0x03f0 #Vendor + USB2=0x4017 #Model +- FWDIR=/usr/share/foo2xqx/firmware + ;; + *1000) + MODEL=1000; FWMODEL=$MODEL +diff --git a/hplj10xx.conf b/hplj10xx.conf +index a2083bb..fe32eea 100644 +--- a/hplj10xx.conf ++++ b/hplj10xx.conf +@@ -15,35 +15,35 @@ + attach 100 { + match "vendor" "0x03f0"; + match "product" "0x3d17"; +- action "cat /usr/share/foo2xqx/firmware/sihpP1005.dl > /dev/$device-name"; ++ action "cat /lib/firmware/hp/sihpP1005.dl > /dev/$device-name"; + }; + + # Firmware download HP LaserJet P1006 printer + attach 100 { + match "vendor" "0x03f0"; + match "product" "0x3e17"; +- action "cat /usr/share/foo2xqx/firmware/sihpP1006.dl > /dev/$device-name"; ++ action "cat /lib/firmware/hp/sihpP1006.dl > /dev/$device-name"; + }; + + # Firmware download HP LaserJet P1007 printer + attach 100 { + match "vendor" "0x03f0"; + match "product" "0x4817"; +- action "cat /usr/share/foo2xqx/firmware/sihpP1005.dl > /dev/$device-name"; ++ action "cat /lib/firmware/hp/sihpP1005.dl > /dev/$device-name"; + }; + + # Firmware download HP LaserJet P1008 printer + attach 100 { + match "vendor" "0x03f0"; + match "product" "0x4917"; +- action "cat /usr/share/foo2xqx/firmware/sihpP1006.dl > /dev/$device-name"; ++ action "cat /lib/firmware/hp/sihpP1006.dl > /dev/$device-name"; + }; + + # Firmware download HP LaserJet P1505 printer + attach 100 { + match "vendor" "0x03f0"; + match "product" "0x3f17"; +- action "cat /usr/share/foo2xqx/firmware/sihpP1505.dl > /dev/$device-name"; ++ action "cat /lib/firmware/hp/sihpP1505.dl > /dev/$device-name"; + }; + + # Firmware download HP LaserJet 1000 printer diff -Nru foo2zjs-20160313dfsg0/debian/patches/0013-Firmware-directory-is-lib-firmware-hp-Closes-517957.patch foo2zjs-20160902dfsg0/debian/patches/0013-Firmware-directory-is-lib-firmware-hp-Closes-517957.patch --- foo2zjs-20160313dfsg0/debian/patches/0013-Firmware-directory-is-lib-firmware-hp-Closes-517957.patch 1970-01-01 00:00:00.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/0013-Firmware-directory-is-lib-firmware-hp-Closes-517957.patch 2016-10-08 16:37:40.000000000 +0000 @@ -0,0 +1,73 @@ +From 2239fa29e1fe45a11e2db67530190650c0f5c5c4 Mon Sep 17 00:00:00 2001 +From: Didier Raboud +Date: Tue, 4 Oct 2016 11:43:56 +0200 +Subject: Firmware directory is /lib/firmware/hp/ (Closes: #517957) + +--- + arm2hpdl.1in | 2 +- + getweb.in | 2 +- + hplj1000 | 2 +- + usb_printerid.1in | 4 ++-- + 4 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/arm2hpdl.1in b/arm2hpdl.1in +index 213d21b..33e6ccd 100644 +--- a/arm2hpdl.1in ++++ b/arm2hpdl.1in +@@ -31,7 +31,7 @@ $ arm2hpdl sihp1005.img > sihp1005.dl + + .SH FILES + .BR /usr/bin/arm2hpdl, +-.BR /usr/share/foo2*/firmware/ ++.BR /lib/firmware/hp/* + .SH SEE ALSO + .BR foo2zjs (1) + .SH "AUTHOR" +diff --git a/getweb.in b/getweb.in +index 11f2aa6..3322de6 100755 +--- a/getweb.in ++++ b/getweb.in +@@ -127,7 +127,7 @@ fi + putfw() { + inputname=$1 + outputname=$2 +- $ARM2HPDL $inputname > /usr/share/foo2zjs/firmware/$outputname ++ $ARM2HPDL $inputname > /lib/firmware/hp/$outputname + rm $inputname + } + +diff --git a/hplj1000 b/hplj1000 +index 2f22631..21ca570 100755 +--- a/hplj1000 ++++ b/hplj1000 +@@ -48,7 +48,7 @@ USB_BACKEND=/usr/lib/cups/backend/usb + # + # Directory to find downloadable HP firmware files sihpMMMM.dl + # +-FWDIR=/usr/share/foo2zjs/firmware ++FWDIR=/lib/firmware/hp + + # + # Program used to determine USB printer id information +diff --git a/usb_printerid.1in b/usb_printerid.1in +index 0454ef6..34817e4 100644 +--- a/usb_printerid.1in ++++ b/usb_printerid.1in +@@ -26,7 +26,7 @@ GET_DEVICE_ID string: + MFG:Hewlett-Packard;MDL:HP LaserJet 1020;CMD:ACL;CLS:PRINTER;\e + DES:HP LaserJet 1020; + +-# cp /usr/share/foo2zjs/firmware/sihp1020.dl /dev/usb/lp0 ++# cp /lib/firmware/hp/sihp1020.dl /dev/usb/lp0 + + # usb_printerid /dev/usb/lp0 + GET_DEVICE_ID string: +@@ -37,7 +37,7 @@ DES:HP LaserJet 1020;FWVER:20050309; + + .SH FILES + .BR /usr/bin/usb_printerid, +-.BR /usr/share/foo2*/firmware/* ++.BR /lib/firmware/hp/* + .SH SEE ALSO + .BR arm2hpdl (1) + .SH "AUTHOR" diff -Nru foo2zjs-20160313dfsg0/debian/patches/0014-Don-t-delete-printer-profile-in-clean-target.patch foo2zjs-20160902dfsg0/debian/patches/0014-Don-t-delete-printer-profile-in-clean-target.patch --- foo2zjs-20160313dfsg0/debian/patches/0014-Don-t-delete-printer-profile-in-clean-target.patch 1970-01-01 00:00:00.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/0014-Don-t-delete-printer-profile-in-clean-target.patch 2016-10-08 16:37:40.000000000 +0000 @@ -0,0 +1,312 @@ +From 8b6665af8dea2a493bd905ac3acf6e1e2827dce1 Mon Sep 17 00:00:00 2001 +From: Didier Raboud +Date: Tue, 4 Oct 2016 11:43:57 +0200 +Subject: Don't delete printer-profile in clean target + +--- + printer-profile.in | 296 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 296 insertions(+) + create mode 100644 printer-profile.in + +diff --git a/printer-profile.in b/printer-profile.in +new file mode 100644 +index 0000000..5363847 +--- /dev/null ++++ b/printer-profile.in +@@ -0,0 +1,296 @@ ++#!/bin/sh ++ ++PROGNAME="$0" ++ ++usage() { ++ cat <&2 ++ exit 1 ++} ++ ++debug() { ++ if [ $DEBUG -ge $1 ]; then ++ echo "`basename $PROGNAME`: $2" >&2 ++ fi ++} ++ ++# ++# Execute a command as root ++# ++root() { ++ if [ -x /usr/bin/root ]; then ++ /usr/bin/root $@ ++ else ++ su -c "$*" ++ fi ++} ++ ++# ++# trap on error ++# ++trap "exit 1" ERR ++ ++# ++# Process the options ++# ++REMPRINT=amd ++REMSCAN=mac ++REMSCAN=none ++RGB=rgb ++PATCHES=196 #Per page! ++BPP=1 ++RES= ++DEBUG=0 ++while getopts "b:r:P:S:D:h?" opt ++do ++ case $opt in ++ b) BPP="$OPTARG";; ++ r) RES="$OPTARG";; ++ P) REMPRINT="$OPTARG";; ++ S) REMSCAN="$OPTARG";; ++ D) DEBUG="$OPTARG";; ++ h|\?) usage;; ++ esac ++done ++shift `expr $OPTIND - 1` ++ ++# ++# Main Program ++# ++if [ $# -lt 2 ]; then ++ usage ++fi ++ ++MANUF="$1" ++MODEL="$2" ++if [ $# -ge 3 ]; then ++ RGB="$3" ++fi ++if [ $# -ge 4 ]; then ++ PATCHES="$4" ++fi ++INK="$5" ++ ++BPP_b="-b$BPP" ++RES_r= ++if [ "$RES" != "" ]; then ++ RES_r="-r$RES" ++fi ++ ++case "$MANUF" in ++km) ++ MANUF=km ++ case "$MODEL" in ++ *1600*) ++ FOO=foo2lava ++ WRAPPER="foo2lava-wrapper $RES_r -z2 -c -C10 -Gnone.icm" ++ OUT="root cp xxx.prn /dev/usb/lp1" ++ ;; ++ *2530*) ++ FOO=foo2lava ++ WRAPPER="foo2lava-wrapper $RES_r -z0 -c -C10 -Gnone.icm" ++ OUT="nc 192.168.1.13 9100 < xxx.prn" ++ ;; ++ *2300*) ++ FOO=foo2zjs ++ WRAPPER="foo2zjs-wrapper $RES_r -c -C10 -Gnone.icm" ++ OUT="nc 192.168.1.10 9100 < xxx.prn" ++ ;; ++ *) ++ usage ++ ;; ++ esac ++ ;; ++sam*) ++ MANUF=sam ++ FOO=foo2qpdl ++ case "$MODEL" in ++ *300*) ++ WRAPPER="foo2qpdl-wrapper $RES_r -z0 -c -C10 -Gnone.icm" ++ OUT="nc 192.168.1.11 9100 < xxx.prn" ++ ;; ++ *315*) ++ WRAPPER="foo2qpdl-wrapper $RES_r -z2 -c -C10 -Gnone.icm" ++ OUT="root cp xxx.prn /dev/usb/lp1" ++ ;; ++ *) ++ usage ++ ;; ++ esac ++ ;; ++hp*) ++ MANUF=hp ++ FOO=foo2hp ++ case "$MODEL" in ++ *2600*) ++ WRAPPER="foo2hp2600-wrapper $RES_r $BPP_b -z0 -c -C10 -Gnone.icm" ++ OUT="nc 192.168.1.12 9100 < xxx.prn" ++ ;; ++ *cp1215*) ++ WRAPPER="foo2hp2600-wrapper $RES_r $BPP_b -z1 -c -C10 -Gnone.icm" ++ OUT="root cp xxx.prn /dev/usb/lp2" ++ ;; ++ *) ++ usage ++ ;; ++ esac ++ ;; ++*) ++ usage ++ ;; ++esac ++ ++mrp="$MANUF-$MODEL-$RGB-$PATCHES" ++if [ "$INK" != "" ]; then ++ mrp="$mrp-ink$INK" ++fi ++if [ "$BPP" != "" ]; then ++ mrp="$mrp-bpp$BPP" ++fi ++if [ "$RES" != "" ]; then ++ mrp="$mrp-$RES" ++fi ++echo "$mrp" ++ ++ ++BETABIN=~/src/Argyll_V1.1.0_Beta/bin ++if [ ! -x $BETABIN/printtarg ]; then ++ error "No beta bin in $BETABIN!" ++fi ++ ++targen_opts= ++case "$RGB" in ++rgb|RGB) targen_opts="$targen_opts -d3";; ++cmyk|CMYK) targen_opts="$targen_opts -d4";; ++*) error "Parm2: Must be rgb or cmyk";; ++esac ++ ++targen_opts="$targen_opts -f$PATCHES" ++ ++if [ "$INK" != "" ]; then ++ targen_opts="$targen_opts -l$INK" ++fi ++ ++echo ++echo "******************************** targen ********************************" ++echo "targen $targen_opts $mrp" ++if ! targen $targen_opts $mrp >$mrp.err1; then ++ cat $mrp.err1 ++ exit 1 ++fi ++ ++echo ++echo "******************************* printtarg ******************************" ++echo "$BETABIN/printtarg -h -v -iCM -p Letter -R0 $mrp" ++$BETABIN/printtarg -h -v -iCM -p Letter -R0 $mrp ++ ++evince $mrp.ps & ++ ++echo ++echo "******************************* print it *******************************" ++echo "$WRAPPER" ++case "$REMPRINT" in ++''|none) ++ $WRAPPER <$mrp.ps >$mrp.prn ++ ;; ++*) ++ ssh $REMPRINT "$WRAPPER" <$mrp.ps >$mrp.prn ++ ;; ++esac ++ls -l $mrp.prn ++echo -n "Print it? [y|n]? " ++read yes ++case "$yes" in ++y|Y) ++ cp $mrp.prn xxx.prn ++ echo " $OUT" ++ eval $OUT ++ rm -f xxx.prn ++esac ++ ++echo ++echo "******************************* chartread ******************************" ++case "$REMSCAN" in ++''|none) ++ echo "$BETABIN/chartread $mrp" ++ $BETABIN/chartread $mrp ++ ;; ++*) ++ echo "scp $mrp.ti2 mac:" ++ scp $mrp.ti2 mac: ++ echo "$BETABIN/chartread $mrp" ++ echo -n "Scanned on remote system $REMSCAN? [y/n]? " ++ read yes ++ case "$yes" in ++ y|Y) ++ scp $REMSCAN:$mrp.ti3 . ++ ;; ++ esac ++ ;; ++esac ++ ++echo ++echo "******************************** colprof *******************************" ++case $RGB in ++rgb) ++ echo "colprof -v -D\"$mrp\" -qm -cmt -dpp $mrp" ++ colprof -v -D"$mrp" -qm -cmt -dpp $mrp ++ ;; ++cymk) ++ echo "colprof -v -D\"$mrp\" -qm -cmt -dpp -kr $mrp" ++ colprof -v -D"$mrp" -qm -cmt -dpp -kr $mrp ++ ;; ++esac ++ ++root cp $mrp.icc /usr/share/$FOO/icm/testing.icm ++echo "/usr/share/$FOO/icm/testing.icm created!" ++ls -l /usr/share/$FOO/icm/ diff -Nru foo2zjs-20160313dfsg0/debian/patches/0015-Fixes-errors-and-hyphen-as-minus-in-manpages.patch foo2zjs-20160902dfsg0/debian/patches/0015-Fixes-errors-and-hyphen-as-minus-in-manpages.patch --- foo2zjs-20160313dfsg0/debian/patches/0015-Fixes-errors-and-hyphen-as-minus-in-manpages.patch 1970-01-01 00:00:00.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/0015-Fixes-errors-and-hyphen-as-minus-in-manpages.patch 2016-10-08 16:37:40.000000000 +0000 @@ -0,0 +1,1552 @@ +From abcfb3933bd0a8c0b77296af9363cf732dea6bb8 Mon Sep 17 00:00:00 2001 +From: Didier Raboud +Date: Tue, 4 Oct 2016 11:43:58 +0200 +Subject: Fixes errors and hyphen-as-minus in manpages + +--- + foo2hbpl2-wrapper.1in | 18 +++++++++--------- + foo2hbpl2.1in | 18 +++++++++--------- + foo2hiperc-wrapper.1in | 18 +++++++++--------- + foo2hiperc.1in | 26 +++++++++++++------------- + foo2hp.1in | 18 +++++++++--------- + foo2hp2600-wrapper.1in | 18 +++++++++--------- + foo2lava-wrapper.1in | 18 +++++++++--------- + foo2lava.1in | 18 +++++++++--------- + foo2oak-wrapper.1in | 18 +++++++++--------- + foo2oak.1in | 18 +++++++++--------- + foo2qpdl-wrapper.1in | 22 +++++++++++----------- + foo2qpdl.1in | 20 ++++++++++---------- + foo2slx-wrapper.1in | 16 ++++++++-------- + foo2slx.1in | 18 +++++++++--------- + foo2xqx-wrapper.1in | 12 ++++++------ + foo2xqx.1in | 10 +++++----- + foo2zjs-wrapper.1in | 28 +++++++++++++++------------- + foo2zjs.1in | 26 ++++++++++++++------------ + gipddecode.1in | 2 +- + hbpldecode.1in | 14 +++++++------- + hipercdecode.1in | 4 ++-- + icc2ps/foo2zjs-icc2ps.1in | 26 +++++++++++--------------- + lavadecode.1in | 4 ++-- + macros.man | 22 +++++++++++----------- + oakdecode.1in | 2 +- + opldecode.1in | 12 ++++++------ + osx-hotplug/osx-hplj-hotplug.1in | 2 +- + printer-profile.1in | 10 +++++----- + qpdldecode.1in | 8 ++++---- + slxdecode.1in | 2 +- + xqxdecode.1in | 4 ++-- + zjsdecode.1in | 2 +- + 32 files changed, 227 insertions(+), 227 deletions(-) + +diff --git a/foo2hbpl2-wrapper.1in b/foo2hbpl2-wrapper.1in +index 0fd1570..ba55b5c 100644 +--- a/foo2hbpl2-wrapper.1in ++++ b/foo2hbpl2-wrapper.1in +@@ -44,7 +44,7 @@ Print in color (else monochrome). + Color correction mode [0]. + .TS + n l . +-10 ICM color profile (using -G *.icm file) ++10 ICM color profile (using \-G *.icm file) + .TE + .TP + .BI \-d\0 duplex +@@ -123,9 +123,9 @@ Print in N-up. Requires the \fBpsutils\fP package. + Orientation used for N-up. + .TS + l l l. +-Portrait -op (normal) +-Landscape -ol (rotated 90 degrees anticlockwise) +-Seascape -os (rotated 90 degrees clockwise) ++Portrait \-op (normal) ++Landscape \-ol (rotated 90 degrees anticlockwise) ++Seascape \-os (rotated 90 degrees clockwise) + .TE + .SS Printer Tweaking Options + These are the options used to customize the operation of \fBfoo2hbpl2\fP +@@ -144,13 +144,13 @@ The defaults should work on the 2200DL and 2300DL, and have not + been tested on any other printers. + .TP + .BI \-L\0 mask +-Send the logical clipping values from -u/-l in the ZjStream. ++Send the logical clipping values from \-u/-l in the ZjStream. + \fBfoo2hbpl2-wrapper\fP always runs Ghostscript with the ideal page dimensions, + so that the scale of the image is correct, + regardless whether or not the printer has unprintable regions. + This option is used to move the position of the clipped image + back to where it belongs on the page. The default is to send +-the amount which was clipped by -u and -l, and should be ++the amount which was clipped by \-u and \-l, and should be + good in most cases. + .TS + l l. +@@ -176,7 +176,7 @@ These are the options used to control the quality of color output. + Color correction is currently a WORK IN PROGRESS. + .TP + .BI \-g\0 gsopts +-Additional options to pass to Ghostscript, such as -g\(lq-dDITHERPPI=nnn\(rq, ++Additional options to pass to Ghostscript, such as \-g\(lq-dDITHERPPI=nnn\(rq, + etc. This option may appear more than once. + .TP + .BI \-G\0 profile.icm +@@ -221,7 +221,7 @@ examine it, and then print it using a RAW print queue: + .nf + foo2hbpl2-wrapper testpage.ps > testpage.prn + hbpl2decode < testpage.prn +-lpr -P raw testpage.prn ++lpr \-P raw testpage.prn + .fi + .RE + .P +@@ -229,7 +229,7 @@ Create a color ZjStream stream from a Postscript document: + + .RS + .nf +-foo2hbpl2-wrapper -c testpage.ps > testpage.prn ++foo2hbpl2-wrapper \-c testpage.ps > testpage.prn + .fi + .RE + +diff --git a/foo2hbpl2.1in b/foo2hbpl2.1in +index 0d9590a..86e4de7 100644 +--- a/foo2hbpl2.1in ++++ b/foo2hbpl2.1in +@@ -130,7 +130,7 @@ Set the offset of the end of the printable region from the + lower right corner, in pixels [0x0]. + .TP + .BI \-L\0 mask +-Send logical clipping amounts implied by -u/-l in the ZjStream [3]. ++Send logical clipping amounts implied by \-u/-l in the ZjStream [3]. + .TS + l l. + 0 don't send any logical clipping amounts +@@ -178,10 +178,10 @@ Create a black and white ZJS stream: + + .RS + .nf +-gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ +- -sPAPERSIZE=letter -r1200x600 -sDEVICE=pbmraw \ +- -sOutputFile=- - < testpage.ps \ +-| foo2hbpl2 -r1200x600 -g10200x6600 -p1 >testpage.zm ++gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ ++ \-sPAPERSIZE=letter \-r1200x600 \-sDEVICE=pbmraw \ ++ \-sOutputFile=- \- < testpage.ps \ ++| foo2hbpl2 \-r1200x600 \-g10200x6600 \-p1 >testpage.zm + .fi + .RE + .P +@@ -189,10 +189,10 @@ Create a color ZJS stream: + + .RS + .nf +-gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ +- -sPAPERSIZE=letter -g10200x6600 -r1200x600 -sDEVICE=bitcmyk \ +- -sOutputFile=- - < testpage.ps \ +-| foo2hbpl2 -r1200x600 -g10200x6600 -p1 >testpage.zc ++gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ ++ \-sPAPERSIZE=letter \-g10200x6600 \-r1200x600 \-sDEVICE=bitcmyk \ ++ \-sOutputFile=- \- < testpage.ps \ ++| foo2hbpl2 \-r1200x600 \-g10200x6600 \-p1 >testpage.zc + .fi + .RE + +diff --git a/foo2hiperc-wrapper.1in b/foo2hiperc-wrapper.1in +index 3601f56..0dca96b 100644 +--- a/foo2hiperc-wrapper.1in ++++ b/foo2hiperc-wrapper.1in +@@ -37,7 +37,7 @@ Print in color (else monochrome). + Color correction mode [0]. + .TS + n l . +-10 ICM color profile (using -G *.icm file) ++10 ICM color profile (using \-G *.icm file) + .TE + .TP + .BI \-d\0 duplex +@@ -66,7 +66,7 @@ Paper size code to send to printer [2]. + box; + | n l | n l. + 1 A4 2 letter +-3 legal - - ++3 legal \- \- + 5 A5 6 B5jis + 7 A6 8 env Monarch + 9 env DL 10 env C5 +@@ -100,9 +100,9 @@ Print in N-up. Requires the \fBpsutils\fP package. + Orientation used for N-up. + .TS + l l l. +-Portrait -op (normal) +-Landscape -ol (rotated 90 degrees anticlockwise) +-Seascape -os (rotated 90 degrees clockwise) ++Portrait \-op (normal) ++Landscape \-ol (rotated 90 degrees anticlockwise) ++Seascape \-os (rotated 90 degrees clockwise) + .TE + .SS Printer Tweaking Options + These are the options used to customize the operation of \fBfoo2hiperc\fP +@@ -117,13 +117,13 @@ Set the offset of the end of the printable region from the + lower right corner, in pixels [varies with paper size]. + .TP + .BI \-L\0 mask +-Send the logical clipping values from -u/-l in the HIPERC stream. ++Send the logical clipping values from \-u/-l in the HIPERC stream. + \fBfoo2hiperc-wrapper\fP always runs Ghostscript with the ideal page dimensions, + so that the scale of the image is correct, + regardless whether or not the printer has unprintable regions. + This option is used to move the position of the clipped image + back to where it belongs on the page. The default is to send +-the amount which was clipped by -u and -l, and should be ++the amount which was clipped by \-u and \-l, and should be + good in most cases. + .TS + l l. +@@ -145,7 +145,7 @@ These are the options used to control the quality of color output. + Color correction is currently a WORK IN PROGRESS. + .TP + .BI \-g\0 gsopts +-Additional options to pass to Ghostscript, such as -g\(lq-dDITHERPPI=nnn\(rq, ++Additional options to pass to Ghostscript, such as \-g\(lq-dDITHERPPI=nnn\(rq, + etc. This option may appear more than once. + .TP + .BI \-G\0 profile.icm +@@ -198,7 +198,7 @@ Create a color HIPERC stream from a Postscript document: + + .RS + .nf +-foo2hiperc-wrapper -c testpage.ps > testpage.hc ++foo2hiperc-wrapper \-c testpage.ps > testpage.hc + .fi + .RE + +diff --git a/foo2hiperc.1in b/foo2hiperc.1in +index 6496984..dca0143 100644 +--- a/foo2hiperc.1in ++++ b/foo2hiperc.1in +@@ -11,13 +11,13 @@ foo2hiperc \- Convert Ghostscript pbmraw or bitcmyk format into a + HIPERC printer stream + .SH SYNOPSIS + .B foo2hiperc +-.RI [ options "] <" pbmraw-file " >" hiperc-file ++.RI [ options "] <" pbmraw\-file " >" hiperc\-file + .sp 1 + .B foo2hiperc +-.RI [ options "] <" bitcmyk-file " >" hiperc-file ++.RI [ options "] <" bitcmyk\-file " >" hiperc\-file + .sp 1 + .B foo2hiperc +-.RI [ options "] <" pksmraw-file " >" hiperc-file ++.RI [ options "] <" pksmraw\-file " >" hiperc\-file + .SH DESCRIPTION + .B foo2hiperc + converts Ghostscript pbmraw, bitcmyk, or pksmraw output formats to monochrome +@@ -63,7 +63,7 @@ Paper code to send to printer [2]. + box; + | n l | n l. + 1 A4 2 letter +-3 legal - - ++3 legal \- \- + 5 A5 6 B5jis + 7 A6 8 env Monarch + 9 env DL 10 env C5 +@@ -108,7 +108,7 @@ Set the offset of the end of the printable region from the + lower right corner, in pixels [0x0]. + .TP + .BI \-L\0 mask +-Send logical clipping amounts implied by -u/-l in the HIPERC stream [3]. ++Send logical clipping amounts implied by \-u/-l in the HIPERC stream [3]. + .TS + l l. + 0 don't send any logical clipping amounts +@@ -147,10 +147,10 @@ Create a black and white HIPERC stream: + + .RS + .nf +-gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ +- -sPAPERSIZE=letter -r600x600 -sDEVICE=pbmraw \ +- -sOutputFile=- - < testpage.ps \ +-| foo2hiperc -r600x600 -g5100x6600 -p0 >testpage.zm ++gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ ++ \-sPAPERSIZE=letter \-r600x600 \-sDEVICE=pbmraw \ ++ \-sOutputFile=- \- < testpage.ps \ ++| foo2hiperc \-r600x600 \-g5100x6600 \-p0 >testpage.zm + .fi + .RE + .P +@@ -158,10 +158,10 @@ Create a color HIPERC stream: + + .RS + .nf +-gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ +- -sPAPERSIZE=letter -g5100x6600 -r600x600 -sDEVICE=bitcmyk \ +- -sOutputFile=- - < testpage.ps \ +-| foo2hiperc -r600x600 -g5100x6600 -p0 >testpage.zc ++gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ ++ \-sPAPERSIZE=letter \-g5100x6600 \-r600x600 \-sDEVICE=bitcmyk \ ++ \-sOutputFile=- \- < testpage.ps \ ++| foo2hiperc \-r600x600 \-g5100x6600 \-p0 >testpage.zc + .fi + .RE + +diff --git a/foo2hp.1in b/foo2hp.1in +index d037311..f4e5e49 100644 +--- a/foo2hp.1in ++++ b/foo2hp.1in +@@ -123,7 +123,7 @@ Set the offset of the end of the printable region from the + lower right corner, in pixels [0x0]. + .TP + .BI \-L\0 mask +-Send logical clipping amounts implied by -u/-l in the ZjStream [3]. ++Send logical clipping amounts implied by \-u/-l in the ZjStream [3]. + .TS + l l. + 0 don't send any logical clipping amounts +@@ -171,10 +171,10 @@ Create a black and white ZJS stream: + + .RS + .nf +-gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ +- -sPAPERSIZE=letter -r600x600 -sDEVICE=pbmraw \ +- -sOutputFile=- - < testpage.ps \ +-| foo2hp -r600x600 -g5100x6600 -p1 >testpage.zm ++gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ ++ \-sPAPERSIZE=letter \-r600x600 \-sDEVICE=pbmraw \ ++ \-sOutputFile=- \- < testpage.ps \ ++| foo2hp \-r600x600 \-g5100x6600 \-p1 >testpage.zm + .fi + .RE + .P +@@ -182,10 +182,10 @@ Create a color ZJS stream: + + .RS + .nf +-gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ +- -sPAPERSIZE=letter -g5100x6600 -r600x600 -sDEVICE=bitcmyk \ +- -sOutputFile=- - < testpage.ps \ +-| foo2hp -r600x600 -g5100x6600 -p1 >testpage.zc ++gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ ++ \-sPAPERSIZE=letter \-g5100x6600 \-r600x600 \-sDEVICE=bitcmyk \ ++ \-sOutputFile=- \- < testpage.ps \ ++| foo2hp \-r600x600 \-g5100x6600 \-p1 >testpage.zc + .fi + .RE + +diff --git a/foo2hp2600-wrapper.1in b/foo2hp2600-wrapper.1in +index a71617d..26b69ae 100644 +--- a/foo2hp2600-wrapper.1in ++++ b/foo2hp2600-wrapper.1in +@@ -107,9 +107,9 @@ Print in N-up. Requires the \fBpsutils\fP package. + Orientation used for N-up. + .TS + l l l. +-Portrait -op (normal) +-Landscape -ol (rotated 90 degrees anticlockwise) +-Seascape -os (rotated 90 degrees clockwise) ++Portrait \-op (normal) ++Landscape \-ol (rotated 90 degrees anticlockwise) ++Seascape \-os (rotated 90 degrees clockwise) + .TE + .SS Printer Tweaking Options + These are the options used to customize the operation of \fBfoo2hp\fP +@@ -128,13 +128,13 @@ The defaults should work on the 2200DL and 2300DL, and have not + been tested on any other printers. + .TP + .BI \-L\0 mask +-Send the logical clipping values from -u/-l in the ZjStream. ++Send the logical clipping values from \-u/-l in the ZjStream. + \fBfoo2hp2600-wrapper\fP always runs Ghostscript with the ideal page dimensions, + so that the scale of the image is correct, + regardless whether or not the printer has unprintable regions. + This option is used to move the position of the clipped image + back to where it belongs on the page. The default is to send +-the amount which was clipped by -u and -l, and should be ++the amount which was clipped by \-u and \-l, and should be + good in most cases. + .TS + l l. +@@ -147,7 +147,7 @@ l l. + .BI \-O\0 parm=val + Alignment of CMYK. \fIparm\fP is c, m, y, or k. + \fIval\fP is in rows. Multiple options are allowed. +-The default is "-Oc=0 -Om=0 -Oy=0 -Ok=0". ++The default is "\-Oc=0 \-Om=0 \-Oy=0 \-Ok=0". + .TP + .BI \-P + Do not send START_PLANE codes on monochrome output. May be +@@ -168,7 +168,7 @@ These are the options used to control the quality of color output. + Color correction is currently a WORK IN PROGRESS. + .TP + .BI \-g\0 gsopts +-Additional options to pass to Ghostscript, such as -g\(lq-dDITHERPPI=nnn\(rq, ++Additional options to pass to Ghostscript, such as \-g\(lq-dDITHERPPI=nnn\(rq, + etc. This option may appear more than once. + .TP + .BI \-G\0 profile.icm +@@ -214,7 +214,7 @@ examine it, and then print it using a RAW print queue: + .nf + foo2hp2600-wrapper testpage.ps > testpage.zm + zjsdecode < testpage.zm +-lpr -P raw testpage.zm ++lpr \-P raw testpage.zm + .fi + .RE + .P +@@ -222,7 +222,7 @@ Create a color ZjStream stream from a Postscript document: + + .RS + .nf +-foo2hp2600-wrapper -c testpage.ps > testpage.zc ++foo2hp2600-wrapper \-c testpage.ps > testpage.zc + .fi + .RE + +diff --git a/foo2lava-wrapper.1in b/foo2lava-wrapper.1in +index f02d899..60629ea 100644 +--- a/foo2lava-wrapper.1in ++++ b/foo2lava-wrapper.1in +@@ -42,7 +42,7 @@ n l . + 1 Photos (using m2300w CRDs) + 2 Photos and text (using m2300w CRDs) + 3 Graphics and text (using m2300w CRDs) +-10 ICM color profile (using -G *.icm file) ++10 ICM color profile (using \-G *.icm file) + .TE + .TP + .BI \-d\0 duplex +@@ -108,9 +108,9 @@ Print in N-up. Requires the \fBpsutils\fP package. + Orientation used for N-up. + .TS + l l l. +-Portrait -op (normal) +-Landscape -ol (rotated 90 degrees anticlockwise) +-Seascape -os (rotated 90 degrees clockwise) ++Portrait \-op (normal) ++Landscape \-ol (rotated 90 degrees anticlockwise) ++Seascape \-os (rotated 90 degrees clockwise) + .TE + .SS Printer Tweaking Options + These are the options used to customize the operation of \fBfoo2lava\fP +@@ -129,13 +129,13 @@ The defaults should work on the 2200DL and 2300DL, and have not + been tested on any other printers. + .TP + .BI \-L\0 mask +-Send the logical clipping values from -u/-l in the LAVAFLOW stream. ++Send the logical clipping values from \-u/-l in the LAVAFLOW stream. + \fBfoo2lava-wrapper\fP always runs Ghostscript with the ideal page dimensions, + so that the scale of the image is correct, + regardless whether or not the printer has unprintable regions. + This option is used to move the position of the clipped image + back to where it belongs on the page. The default is to send +-the amount which was clipped by -u and -l, and should be ++the amount which was clipped by \-u and \-l, and should be + good in most cases. + .TS + l l. +@@ -162,7 +162,7 @@ These are the options used to control the quality of color output. + Color correction is currently a WORK IN PROGRESS. + .TP + .BI \-g\0 gsopts +-Additional options to pass to Ghostscript, such as -g\(lq-dDITHERPPI=nnn\(rq, ++Additional options to pass to Ghostscript, such as \-g\(lq-dDITHERPPI=nnn\(rq, + etc. This option may appear more than once. + .TP + .BI \-G\0 profile.icm +@@ -207,7 +207,7 @@ examine it, and then print it using a RAW print queue: + .nf + foo2lava-wrapper testpage.ps > testpage.zm + lavadecode < testpage.zm +-lpr -P raw testpage.zm ++lpr \-P raw testpage.zm + .fi + .RE + .P +@@ -215,7 +215,7 @@ Create a color LAVAFLOW stream from a Postscript document: + + .RS + .nf +-foo2lava-wrapper -c testpage.ps > testpage.zc ++foo2lava-wrapper \-c testpage.ps > testpage.zc + .fi + .RE + +diff --git a/foo2lava.1in b/foo2lava.1in +index 2328ae5..0b88544 100644 +--- a/foo2lava.1in ++++ b/foo2lava.1in +@@ -111,7 +111,7 @@ Set the offset of the end of the printable region from the + lower right corner, in pixels [0x0]. + .TP + .BI \-L\0 mask +-Send logical clipping amounts implied by -u/-l in the LAVAFLOW stream [3]. ++Send logical clipping amounts implied by \-u/-l in the LAVAFLOW stream [3]. + .TS + l l. + 0 don't send any logical clipping amounts +@@ -160,10 +160,10 @@ Create a black and white LAVAFLOW stream: + + .RS + .nf +-gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ +- -sPAPERSIZE=letter -r1200x600 -sDEVICE=pbmraw \ +- -sOutputFile=- - < testpage.ps \ +-| foo2lava -r1200x600 -g10200x6600 -p1 >testpage.zm ++gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ ++ \-sPAPERSIZE=letter \-r1200x600 \-sDEVICE=pbmraw \ ++ \-sOutputFile=- \- < testpage.ps \ ++| foo2lava \-r1200x600 \-g10200x6600 \-p1 >testpage.zm + .fi + .RE + .P +@@ -171,10 +171,10 @@ Create a color LAVAFLOW stream: + + .RS + .nf +-gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ +- -sPAPERSIZE=letter -g10200x6600 -r1200x600 -sDEVICE=bitcmyk \ +- -sOutputFile=- - < testpage.ps \ +-| foo2lava -r1200x600 -g10200x6600 -p1 >testpage.zc ++gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ ++ \-sPAPERSIZE=letter \-g10200x6600 \-r1200x600 \-sDEVICE=bitcmyk \ ++ \-sOutputFile=- \- < testpage.ps \ ++| foo2lava \-r1200x600 \-g10200x6600 \-p1 >testpage.zc + .fi + .RE + +diff --git a/foo2oak-wrapper.1in b/foo2oak-wrapper.1in +index 435dae3..bbf1d23 100644 +--- a/foo2oak-wrapper.1in ++++ b/foo2oak-wrapper.1in +@@ -49,7 +49,7 @@ l l l + l n n. + _ + Media HP CLJ 1500 KM-1635 +- -z0 -z1 ++ \-z0 \-z1 + _ + autoselect 0 0 + plain 1 1 +@@ -110,9 +110,9 @@ Print in N-up. Requires the \fBpsutils\fP package. + Orientation used for N-up. + .TS + l l l. +-Portrait -op (normal) +-Landscape -ol (rotated 90 degrees anticlockwise) +-Seascape -os (rotated 90 degrees clockwise) ++Portrait \-op (normal) ++Landscape \-ol (rotated 90 degrees anticlockwise) ++Seascape \-os (rotated 90 degrees clockwise) + .TE + .SS Printer Tweaking Options + These are the options used to customize the operation of \fBfoo2oak\fP +@@ -131,13 +131,13 @@ The defaults should work on the 2200DL and 2300DL, and have not + been tested on any other printers. + .TP + .BI \-L\0 mask +-Send the logical clipping values from -u/-l in the OAKT stream. ++Send the logical clipping values from \-u/-l in the OAKT stream. + \fBfoo2oak-wrapper\fP always runs Ghostscript with the ideal page dimensions, + so that the scale of the image is correct, + regardless whether or not the printer has unprintable regions. + This option is used to move the position of the clipped image + back to where it belongs on the page. The default is to send +-the amount which was clipped by -u and -l, and should be ++the amount which was clipped by \-u and \-l, and should be + good in most cases. + .TS + l l. +@@ -155,7 +155,7 @@ These are the options used to control the quality of color output. + Color correction is currently a WORK IN PROGRESS. + .TP + .BI \-g\0 gsopts +-Additional options to pass to Ghostscript, such as -g\(lq-dDITHERPPI=nnn\(rq, ++Additional options to pass to Ghostscript, such as \-g\(lq-dDITHERPPI=nnn\(rq, + etc. This option may appear more than once. + .TP + .BI \-G\0 profile.icm +@@ -200,7 +200,7 @@ examine it, and then print it using a RAW print queue: + .nf + foo2oak-wrapper testpage.ps > testpage.oak + oakdecode < testpage.oak +-lpr -P raw testpage.oak ++lpr \-P raw testpage.oak + .fi + .RE + .P +@@ -208,7 +208,7 @@ Create a color OAKT stream from a Postscript document: + + .RS + .nf +-foo2oak-wrapper -c testpage.ps > testpage.oak ++foo2oak-wrapper \-c testpage.ps > testpage.oak + .fi + .RE + +diff --git a/foo2oak.1in b/foo2oak.1in +index 1a1c863..94b3ed6 100644 +--- a/foo2oak.1in ++++ b/foo2oak.1in +@@ -122,7 +122,7 @@ Set the offset of the end of the printable region from the + lower right corner, in pixels [0x0]. + .TP + .BI \-L\0 mask +-Send logical clipping amounts implied by -u/-l in the OAKT stream [3]. ++Send logical clipping amounts implied by \-u/-l in the OAKT stream [3]. + .TS + l l. + 0 don't send any logical clipping amounts +@@ -167,10 +167,10 @@ Create a black and white OAKT stream: + + .RS + .nf +-gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ +- -sPAPERSIZE=letter -r600x600 -sDEVICE=pbmraw \ +- -sOutputFile=- - < testpage.ps \ +-| foo2oak -r600x600 -g5100x6600 -p1 >testpage.oak ++gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ ++ \-sPAPERSIZE=letter \-r600x600 \-sDEVICE=pbmraw \ ++ \-sOutputFile=- \- < testpage.ps \ ++| foo2oak \-r600x600 \-g5100x6600 \-p1 >testpage.oak + .fi + .RE + .P +@@ -178,10 +178,10 @@ Create a color OAKT stream: + + .RS + .nf +-gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ +- -sPAPERSIZE=letter -g5100x6600 -r600x600 -sDEVICE=bitcmyk \ +- -sOutputFile=- - < testpage.ps \ +-| foo2oak -r600x600 -g5100x6600 -p1 >testpage.oak ++gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ ++ \-sPAPERSIZE=letter \-g5100x6600 \-r600x600 \-sDEVICE=bitcmyk \ ++ \-sOutputFile=- \- < testpage.ps \ ++| foo2oak \-r600x600 \-g5100x6600 \-p1 >testpage.oak + .fi + .RE + +diff --git a/foo2qpdl-wrapper.1in b/foo2qpdl-wrapper.1in +index 7e476c1..4524372 100644 +--- a/foo2qpdl-wrapper.1in ++++ b/foo2qpdl-wrapper.1in +@@ -39,7 +39,7 @@ Color correction mode [0]. + .TS + n l . + 1 CRD +-10 ICM color profile (using -G *.icm file) ++10 ICM color profile (using \-G *.icm file) + .TE + .TP + .BI \-d\0 duplex +@@ -112,9 +112,9 @@ Print in N-up. Requires the \fBpsutils\fP package. + Orientation used for N-up. + .TS + l l l. +-Portrait -op (normal) +-Landscape -ol (rotated 90 degrees anticlockwise) +-Seascape -os (rotated 90 degrees clockwise) ++Portrait \-op (normal) ++Landscape \-ol (rotated 90 degrees anticlockwise) ++Seascape \-os (rotated 90 degrees clockwise) + .TE + .SS Printer Tweaking Options + These are the options used to customize the operation of \fBfoo2qpdl\fP +@@ -129,13 +129,13 @@ Set the offset of the end of the printable region from the + lower right corner, in pixels [varies with paper size]. + .TP + .BI \-L\0 mask +-Send the logical clipping values from -u/-l in the QPDL stream. ++Send the logical clipping values from \-u/-l in the QPDL stream. + \fBfoo2qpdl-wrapper\fP always runs Ghostscript with the ideal page dimensions, + so that the scale of the image is correct, + regardless whether or not the printer has unprintable regions. + This option is used to move the position of the clipped image + back to where it belongs on the page. The default is to send +-the amount which was clipped by -u and -l, and should be ++the amount which was clipped by \-u and \-l, and should be + good in most cases. + .TS + l l. +@@ -164,11 +164,11 @@ Color Adjust. \fIparm\fP is b, c, s, cr, mg, yb for + brightness, contrast, saturation, cyan-red balance, magenta-green balance, + and yellow-blue balance. + \fIval\fP is 0 to 100. Multiple options are allowed. +-The default is "-ab=50 -ac=50 -as=50 -acr=50 -amg=50 -ayb=50". +-This only works when the -z3 (e.g. CLP-365) model is set! ++The default is "\-ab=50 \-ac=50 \-as=50 \-acr=50 \-amg=50 \-ayb=50". ++This only works when the \-z3 (e.g. CLP\-365) model is set! + .TP + .BI \-g\0 gsopts +-Additional options to pass to Ghostscript, such as -g\(lq-dDITHERPPI=nnn\(rq, ++Additional options to pass to Ghostscript, such as \-g\(lq-dDITHERPPI=nnn\(rq, + etc. This option may appear more than once. + .TP + .BI \-G\0 profile.icm +@@ -213,7 +213,7 @@ examine it, and then print it using a RAW print queue: + .nf + foo2qpdl-wrapper testpage.ps > testpage.zm + qpdldecode < testpage.zm +-lpr -P raw testpage.zm ++lpr \-P raw testpage.zm + .fi + .RE + .P +@@ -221,7 +221,7 @@ Create a color QPDL stream from a Postscript document: + + .RS + .nf +-foo2qpdl-wrapper -c testpage.ps > testpage.zc ++foo2qpdl-wrapper \-c testpage.ps > testpage.zc + .fi + .RE + +diff --git a/foo2qpdl.1in b/foo2qpdl.1in +index bdc209d..780ee0d 100644 +--- a/foo2qpdl.1in ++++ b/foo2qpdl.1in +@@ -114,7 +114,7 @@ for a particular printer. + Color Adjust: brightness, contrast, saturation, cyan-red balance, + magenta-green balance, and yellow-blue balance from 0 to 100. + The default is 50,50,50,50,50,50. +-This only works when the -z3 (e.g. CLP-365) model is set! ++This only works when the \-z3 (e.g. CLP\-365) model is set! + .TP + .BI \-u\0 xoff x yoff + Set the offset of the start of the printable region from the +@@ -125,7 +125,7 @@ Set the offset of the end of the printable region from the + lower right corner, in pixels [0x0]. + .TP + .BI \-L\0 mask +-Send logical clipping amounts implied by -u/-l in the QPDL stream [3]. ++Send logical clipping amounts implied by \-u/-l in the QPDL stream [3]. + .TS + l l. + 0 don't send any logical clipping amounts +@@ -172,10 +172,10 @@ Create a black and white QPDL stream: + + .RS + .nf +-gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ +- -sPAPERSIZE=letter -r1200x600 -sDEVICE=pbmraw \ +- -sOutputFile=- - < testpage.ps \ +-| foo2qpdl -r1200x600 -g10200x6600 -p0 >testpage.zm ++gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ ++ \-sPAPERSIZE=letter \-r1200x600 \-sDEVICE=pbmraw \ ++ \-sOutputFile=- \- < testpage.ps \ ++| foo2qpdl \-r1200x600 \-g10200x6600 \-p0 >testpage.zm + .fi + .RE + .P +@@ -183,10 +183,10 @@ Create a color QPDL stream: + + .RS + .nf +-gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ +- -sPAPERSIZE=letter -g10200x6600 -r1200x600 -sDEVICE=bitcmyk \ +- -sOutputFile=- - < testpage.ps \ +-| foo2qpdl -r1200x600 -g10200x6600 -p0 >testpage.zc ++gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ ++ \-sPAPERSIZE=letter \-g10200x6600 \-r1200x600 \-sDEVICE=bitcmyk \ ++ \-sOutputFile=- \- < testpage.ps \ ++| foo2qpdl \-r1200x600 \-g10200x6600 \-p0 >testpage.zc + .fi + .RE + +diff --git a/foo2slx-wrapper.1in b/foo2slx-wrapper.1in +index 966ec6f..81326a1 100644 +--- a/foo2slx-wrapper.1in ++++ b/foo2slx-wrapper.1in +@@ -83,9 +83,9 @@ Print in N-up. Requires the \fBpsutils\fP package. + Orientation used for N-up. + .TS + l l l. +-Portrait -op (normal) +-Landscape -ol (rotated 90 degrees anticlockwise) +-Seascape -os (rotated 90 degrees clockwise) ++Portrait \-op (normal) ++Landscape \-ol (rotated 90 degrees anticlockwise) ++Seascape \-os (rotated 90 degrees clockwise) + .TE + .SS Printer Tweaking Options + These are the options used to customize the operation of \fBfoo2slx\fP +@@ -104,13 +104,13 @@ The defaults should work on the 2200DL and 2300DL, and have not + been tested on any other printers. + .TP + .BI \-L\0 mask +-Send the logical clipping values from -u/-l in the ZjStream. ++Send the logical clipping values from \-u/-l in the ZjStream. + \fBfoo2slx-wrapper\fP always runs Ghostscript with the ideal page dimensions, + so that the scale of the image is correct, + regardless whether or not the printer has unprintable regions. + This option is used to move the position of the clipped image + back to where it belongs on the page. The default is to send +-the amount which was clipped by -u and -l, and should be ++the amount which was clipped by \-u and \-l, and should be + good in most cases. + .TS + l l. +@@ -124,7 +124,7 @@ These are the options used to control the quality of color output. + Color correction is currently a WORK IN PROGRESS. + .TP + .BI \-g\0 gsopts +-Additional options to pass to Ghostscript, such as -g\(lq-dDITHERPPI=nnn\(rq, ++Additional options to pass to Ghostscript, such as \-g\(lq-dDITHERPPI=nnn\(rq, + etc. This option may appear more than once. + .TP + .BI \-G\0 profile.icm +@@ -169,7 +169,7 @@ examine it, and then print it using a RAW print queue: + .nf + foo2slx-wrapper testpage.ps > testpage.zm + slxdecode < testpage.zm +-lpr -P raw testpage.zm ++lpr \-P raw testpage.zm + .fi + .RE + .P +@@ -177,7 +177,7 @@ Create a color ZjStream stream from a Postscript document: + + .RS + .nf +-foo2slx-wrapper -c testpage.ps > testpage.zc ++foo2slx-wrapper \-c testpage.ps > testpage.zc + .fi + .RE + +diff --git a/foo2slx.1in b/foo2slx.1in +index 5a431e0..8eab873 100644 +--- a/foo2slx.1in ++++ b/foo2slx.1in +@@ -93,7 +93,7 @@ Set the offset of the end of the printable region from the + lower right corner, in pixels [0x0]. + .TP + .BI \-L\0 mask +-Send logical clipping amounts implied by -u/-l in the ZjStream [3]. ++Send logical clipping amounts implied by \-u/-l in the ZjStream [3]. + .TS + l l. + 0 don't send any logical clipping amounts +@@ -130,10 +130,10 @@ Create a black and white SLX stream: + + .RS + .nf +-gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ +- -sPAPERSIZE=letter -r1200x600 -sDEVICE=pbmraw \ +- -sOutputFile=- - < testpage.ps \ +-| foo2slx -r1200x600 -g10200x6600 -p1 >testpage.zm ++gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ ++ \-sPAPERSIZE=letter \-r1200x600 \-sDEVICE=pbmraw \ ++ \-sOutputFile=- \- < testpage.ps \ ++| foo2slx \-r1200x600 \-g10200x6600 \-p1 >testpage.zm + .fi + .RE + .P +@@ -141,10 +141,10 @@ Create a color SLX stream: + + .RS + .nf +-gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ +- -sPAPERSIZE=letter -g10200x6600 -r1200x600 -sDEVICE=bitcmyk \ +- -sOutputFile=- - < testpage.ps \ +-| foo2slx -r1200x600 -g10200x6600 -p1 >testpage.zc ++gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ ++ \-sPAPERSIZE=letter \-g10200x6600 \-r1200x600 \-sDEVICE=bitcmyk \ ++ \-sOutputFile=- \- < testpage.ps \ ++| foo2slx \-r1200x600 \-g10200x6600 \-p1 >testpage.zc + .fi + .RE + +diff --git a/foo2xqx-wrapper.1in b/foo2xqx-wrapper.1in +index bef7ba5..382a17a 100644 +--- a/foo2xqx-wrapper.1in ++++ b/foo2xqx-wrapper.1in +@@ -100,9 +100,9 @@ Print in N-up. Requires the \fBpsutils\fP package. + Orientation used for N-up. + .TS + l l l. +-Portrait -op (normal) +-Landscape -ol (rotated 90 degrees anticlockwise) +-Seascape -os (rotated 90 degrees clockwise) ++Portrait \-op (normal) ++Landscape \-ol (rotated 90 degrees anticlockwise) ++Seascape \-os (rotated 90 degrees clockwise) + .TE + .SS Printer Tweaking Options + These are the options used to customize the operation of \fBfoo2xqx\fP +@@ -121,13 +121,13 @@ The defaults should work on the 2200DL and 2300DL, and have not + been tested on any other printers. + .TP + .BI \-L\0 mask +-Send the logical clipping values from -u/-l in the ZjStream. ++Send the logical clipping values from \-u/-l in the ZjStream. + \fBfoo2xqx-wrapper\fP always runs Ghostscript with the ideal page dimensions, + so that the scale of the image is correct, + regardless whether or not the printer has unprintable regions. + This option is used to move the position of the clipped image + back to where it belongs on the page. The default is to send +-the amount which was clipped by -u and -l, and should be ++the amount which was clipped by \-u and \-l, and should be + good in most cases. + .TS + l l. +@@ -150,7 +150,7 @@ examine it, and then print it using a RAW print queue: + .nf + foo2xqx-wrapper testpage.ps > testpage.xqx + xqxdecode < testpage.xqx +-lpr -P raw testpage.xqx ++lpr \-P raw testpage.xqx + .fi + .RE + +diff --git a/foo2xqx.1in b/foo2xqx.1in +index 6c60c89..da521fb 100644 +--- a/foo2xqx.1in ++++ b/foo2xqx.1in +@@ -110,7 +110,7 @@ Set the offset of the end of the printable region from the + lower right corner, in pixels [0x0]. + .TP + .BI \-L\0 mask +-Send logical clipping amounts implied by -u/-l in the ZjStream [3]. ++Send logical clipping amounts implied by \-u/-l in the ZjStream [3]. + .TS + l l. + 0 don't send any logical clipping amounts +@@ -146,10 +146,10 @@ Create a black and white XQX stream: + + .RS + .nf +-gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ +- -sPAPERSIZE=letter -r1200x600 -sDEVICE=pbmraw \ +- -sOutputFile=- - < testpage.ps \ +-| foo2xqx -r1200x600 -g10200x6600 -p1 >testpage.zm ++gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ ++ \-sPAPERSIZE=letter \-r1200x600 \-sDEVICE=pbmraw \ ++ \-sOutputFile=- \- < testpage.ps \ ++| foo2xqx \-r1200x600 \-g10200x6600 \-p1 >testpage.zm + .fi + .RE + +diff --git a/foo2zjs-wrapper.1in b/foo2zjs-wrapper.1in +index 1648bf7..16998b1 100644 +--- a/foo2zjs-wrapper.1in ++++ b/foo2zjs-wrapper.1in +@@ -38,7 +38,7 @@ n l . + 1 Photos (using m2300w CRDs) + 2 Photos and text (using m2300w CRDs) + 3 Graphics and text (using m2300w CRDs) +-10 ICM color profile (using -G *.icm file) ++10 ICM color profile (using \-G *.icm file) + .TE + .TP + .BI \-d\0 duplex +@@ -55,7 +55,7 @@ l r r r r r. + _ + Media 2300DL 2200DL HP 1018 HP P1102 HP + \^ HP 1005 HP 1020 HP P1606 CP1025 +-\^ -z0 -z0 -z1 -z2 -z3 ++\^ \-z0 \-z0 \-z1 \-z2 \-z3 + _ + standard 1 1 1 1 1 + transparency 2 2 2 2 2 +@@ -84,7 +84,7 @@ l r r r r. + _ + Paper MC 2300DL HP 1018 HP P1102 HP + \^ HP 1005 HP 1020 HP P1606 CP1025 +-\^ -z0 -z1 -z2 -z3 ++\^ \-z0 \-z1 \-z2 \-z3 + _ + letter 1 1 1 1 + legal 5 5 5 5 +@@ -100,9 +100,11 @@ env Monarch 37 37 37 37 + postcard (japan) na 260 43 43 + B5iso na 259 na na + A6 na 262 70 70 +-double postcard rotated na 261 82 82 ++double postcard na 261 82 82 ++ rotated \^ \^ \^ \^ + 16k 197x273 na 257 257 257 +-fanfold german legal na 258 258 258 ++fanfold german na 258 258 258 ++ legal \^ \^ \^ \^ + 16k 184x260 na na 263 263 + 16k 195x270 na na 264 264 + photo 4x6 na na na 268 +@@ -137,9 +139,9 @@ Print in N-up. Requires the \fBpsutils\fP package. + Orientation used for N-up. + .TS + l l l. +-Portrait -op (normal) +-Landscape -ol (rotated 90 degrees anticlockwise) +-Seascape -os (rotated 90 degrees clockwise) ++Portrait \-op (normal) ++Landscape \-ol (rotated 90 degrees anticlockwise) ++Seascape \-os (rotated 90 degrees clockwise) + .TE + .SS Printer Tweaking Options + These are the options used to customize the operation of \fBfoo2zjs\fP +@@ -158,13 +160,13 @@ The defaults should work on the 2200DL and 2300DL, and have not + been tested on any other printers. + .TP + .BI \-L\0 mask +-Send the logical clipping values from -u/-l in the ZjStream. ++Send the logical clipping values from \-u/-l in the ZjStream. + \fBfoo2zjs-wrapper\fP always runs Ghostscript with the ideal page dimensions, + so that the scale of the image is correct, + regardless whether or not the printer has unprintable regions. + This option is used to move the position of the clipped image + back to where it belongs on the page. The default is to send +-the amount which was clipped by -u and -l, and should be ++the amount which was clipped by \-u and \-l, and should be + good in most cases. + .TS + l l. +@@ -200,7 +202,7 @@ These are the options used to control the quality of color output. + Color correction is currently a WORK IN PROGRESS. + .TP + .BI \-g\0 gsopts +-Additional options to pass to Ghostscript, such as -g\(lq-dDITHERPPI=nnn\(rq, ++Additional options to pass to Ghostscript, such as \-g\(lq-dDITHERPPI=nnn\(rq, + etc. This option may appear more than once. + .TP + .BI \-G\0 profile.icm +@@ -245,7 +247,7 @@ examine it, and then print it using a RAW print queue: + .nf + foo2zjs-wrapper testpage.ps > testpage.zm + zjsdecode < testpage.zm +-lpr -P raw testpage.zm ++lpr \-P raw testpage.zm + .fi + .RE + .P +@@ -253,7 +255,7 @@ Create a color ZjStream stream from a Postscript document: + + .RS + .nf +-foo2zjs-wrapper -c testpage.ps > testpage.zc ++foo2zjs-wrapper \-c testpage.ps > testpage.zc + .fi + .RE + +diff --git a/foo2zjs.1in b/foo2zjs.1in +index a26113c..feb973b 100644 +--- a/foo2zjs.1in ++++ b/foo2zjs.1in +@@ -50,7 +50,7 @@ l r r r r r. + _ + Media 2300DL 2200DL HP 1018 HP P1102 HP + \^ HP 1005 HP 1020 HP P1606 CP1025 +-\^ -z0 -z0 -z1 -z2 -z3 ++\^ \-z0 \-z0 \-z1 \-z2 \-z3 + _ + standard 1 1 1 1 1 + transparency 2 2 2 2 2 +@@ -79,7 +79,7 @@ l r r r r. + _ + Paper MC 2300DL HP 1018 HP P1102 HP + \^ HP 1005 HP 1020 HP P1606 CP1025 +-\^ -z0 -z1 -z2 -z3 ++\^ \-z0 \-z1 \-z2 \-z3 + _ + letter 1 1 1 1 + legal 5 5 5 5 +@@ -95,9 +95,11 @@ env Monarch 37 37 37 37 + postcard (japan) na 260 43 43 + B5iso na 259 na na + A6 na 262 70 70 +-double postcard rotated na 261 82 82 ++double postcard na 261 82 82 ++ rotated \^ \^ \^ \^ + 16k 197x273 na 257 257 257 + fanfold german legal na 258 258 258 ++ legal \^ \^ \^ \^ + 16k 184x260 na na 263 263 + 16k 195x270 na na 264 264 + photo 4x6 na na na 268 +@@ -143,7 +145,7 @@ Set the offset of the end of the printable region from the + lower right corner, in pixels [0x0]. + .TP + .BI \-L\0 mask +-Send logical clipping amounts implied by -u/-l in the ZjStream [3]. ++Send logical clipping amounts implied by \-u/-l in the ZjStream [3]. + .TS + l l. + 0 don't send any logical clipping amounts +@@ -201,10 +203,10 @@ Create a black and white ZJS stream: + + .RS + .nf +-gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ +- -sPAPERSIZE=letter -r1200x600 -sDEVICE=pbmraw \ +- -sOutputFile=- - < testpage.ps \ +-| foo2zjs -r1200x600 -g10200x6600 -p1 >testpage.zm ++gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ ++ \-sPAPERSIZE=letter \-r1200x600 \-sDEVICE=pbmraw \ ++ \-sOutputFile=- \- < testpage.ps \ ++| foo2zjs \-r1200x600 \-g10200x6600 \-p1 >testpage.zm + .fi + .RE + .P +@@ -212,10 +214,10 @@ Create a color ZJS stream: + + .RS + .nf +-gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ +- -sPAPERSIZE=letter -g10200x6600 -r1200x600 -sDEVICE=bitcmyk \ +- -sOutputFile=- - < testpage.ps \ +-| foo2zjs -r1200x600 -g10200x6600 -p1 >testpage.zc ++gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ ++ \-sPAPERSIZE=letter \-g10200x6600 \-r1200x600 \-sDEVICE=bitcmyk \ ++ \-sOutputFile=- \- < testpage.ps \ ++| foo2zjs \-r1200x600 \-g10200x6600 \-p1 >testpage.zc + .fi + .RE + +diff --git a/gipddecode.1in b/gipddecode.1in +index b802275..2b4ff71 100644 +--- a/gipddecode.1in ++++ b/gipddecode.1in +@@ -39,7 +39,7 @@ Decode an GIPD stream file. + + .nf + .ft CW +-$ gipddecode -h x500-mono.prn ++$ gipddecode \-h x500-mono.prn + 0: OFST 0 len=128 + 80: OFST 1 len=128 + 100: OFST 2 len=128 +diff --git a/hbpldecode.1in b/hbpldecode.1in +index 52d0ee7..61e294b 100644 +--- a/hbpldecode.1in ++++ b/hbpldecode.1in +@@ -49,12 +49,12 @@ Decode an HBPL stream file, version 1. + + .nf + .ft CW +-$ hbpldecode -h 1250c-mono.prn ++$ hbpldecode \-h 1250c-mono.prn + 0: \\033%-12345X@PJL JOB MODE=PRINTER + 1f: @PJL SET STRINGCODESET=UTF8 + 3b: @PJL COMMENT DATE=06/01/2011 + 58: @PJL COMMENT TIME=13:28:30 +- 73: @PJL COMMENT DNAME=empty - Notepad ++ 73: @PJL COMMENT DNAME=empty \- Notepad + 96: @PJL SET JOBATTR="@LUNA=rick" + b4: @PJL SET COPIES=1 + c6: @PJL SET QTY=1 +@@ -129,7 +129,7 @@ Decode an HBPL stream file, version 2. + + .nf + .ft CW +-$ hbpldecode -h 6015c-color.prn ++$ hbpldecode \-h 6015c-color.prn + 0: \033%-12345X@PJL JOB NAME=PRINTER + 20: @PJL SET JOBATTR="HOST:dual.rkkda.org" + 48: @PJL SET JOBATTR="USER:rick" +@@ -155,28 +155,28 @@ $ hbpldecode -h 6015c-color.prn + w,h=5120x6406 res=600 color=1 + mediatype=Plain(1) papersize=Letter(4) + 1cc: Cyan BIH: +- DL = 0, D = 0, P = 1, - = 0, XY = 10240 x 6406 ++ DL = 0, D = 0, P = 1, \- = 0, XY = 10240 x 6406 + L0 = 128, MX = 0, MY = 0 + Order = 0 + Options = 64 LRLTWO + 51 stripes, 0 layers, 1 planes + ...cyan data skipped... + 2ac: Magenta BIH: +- DL = 0, D = 0, P = 1, - = 0, XY = 10240 x 6406 ++ DL = 0, D = 0, P = 1, \- = 0, XY = 10240 x 6406 + L0 = 128, MX = 0, MY = 0 + Order = 0 + Options = 64 LRLTWO + 51 stripes, 0 layers, 1 planes + ...magenta data skipped... + 38c: Yellow BIH: +- DL = 0, D = 0, P = 1, - = 0, XY = 10240 x 6406 ++ DL = 0, D = 0, P = 1, \- = 0, XY = 10240 x 6406 + L0 = 128, MX = 0, MY = 0 + Order = 0 + Options = 64 LRLTWO + 51 stripes, 0 layers, 1 planes + ...yellow data skipped... + 46c: Black BIH: +- DL = 0, D = 0, P = 1, - = 0, XY = 10240 x 6406 ++ DL = 0, D = 0, P = 1, \- = 0, XY = 10240 x 6406 + L0 = 128, MX = 0, MY = 0 + Order = 0 + Options = 64 LRLTWO +diff --git a/hipercdecode.1in b/hipercdecode.1in +index f8dec45..10267cb 100644 +--- a/hipercdecode.1in ++++ b/hipercdecode.1in +@@ -40,7 +40,7 @@ Decode an HIPERC stream file created by foo2hiperc. + + .nf + .ft CW +-$ foo2hiperc-wrapper testpage.ps | hipercdecode -h ++$ foo2hiperc-wrapper testpage.ps | hipercdecode \-h + 0: \\033%-12345X@PJL + f: @PJL RDYMSG DISPLAY = "Unknown" + 30: @PJL SET OKIJOBACCOUNTJOB USERID="Unknown" JOBNAME="Unknown" +@@ -62,7 +62,7 @@ $ foo2hiperc-wrapper testpage.ps | hipercdecode -h + 289: RECTYPE 0 (len=52,0x34 cnt=1) + 291: BLKNUM 0, nbie=1, pn=3 [black] uc=0,0, wid=4864 ud=0,100 + 2a5: BLKNUM 1 (len=20), uncompressed=1, bie: +- DL = 48, D = 48, P = 49, - = 48, XY = 4864 x 6816 ++ DL = 48, D = 48, P = 49, \- = 48, XY = 4864 x 6816 + L0 = 256, MX = 0, MY = 0 + Order = 0 + Options = 0 +diff --git a/icc2ps/foo2zjs-icc2ps.1in b/icc2ps/foo2zjs-icc2ps.1in +index bbccb50..054bbdf 100644 +--- a/icc2ps/foo2zjs-icc2ps.1in ++++ b/icc2ps/foo2zjs-icc2ps.1in +@@ -1,16 +1,16 @@ +-.TH foo2zjs-icc2ps 1 "Sun Jun 20 04:33:46 2010" "foo2zjs-icc2ps 0.0" ++.TH foo2zjs\-icc2ps 1 "Sun Jun 20 04:33:46 2010" "foo2zjs\-icc2ps 0.0" + #ifndef OLDGROFF + #include "../macros.man" + #endif + .SH NAME +-foo2zjs-icc2ps - little cms PostScript converter. ++foo2zjs\-icc2ps \- little cms PostScript converter. + .SH SYNOPSIS +-.B foo2zjs-icc2ps ++.B foo2zjs\-icc2ps + .RI [ options ] + .SH DESCRIPTION + lcms is a standalone CMM engine, which deals with the color management. + It implements a fast transformation between ICC profiles. +-.B foo2zjs-icc2ps ++.B foo2zjs\-icc2ps + is little cms PostScript converter. + .SH COMMAND LINE OPTIONS + .TP +@@ -18,7 +18,7 @@ is little cms PostScript converter. + Black point compensation (CRD only). + .TP + .B \-c <0,1,2> +-Precision (0=LowRes, 1=Normal (default), 2=Hi-res) (CRD only) ++Precision (0=LowRes, 1=Normal (default), 2=Hi\-res) (CRD only) + .TP + .BI \-i\ profile + Input profile: Generates Color Space Array (CSA). +@@ -27,7 +27,6 @@ Input profile: Generates Color Space Array (CSA). + Alternate way to set precision, number of CLUT points (CRD only) + .TP + .BI \-o\ profile +-.p + Output profile: Generates Color Rendering Dictionary(CRD). + .TP + .B \-t <0,1,2,3> +@@ -38,17 +37,14 @@ Do NOT generate resource name on CRD. + .SH FILES + .BR /usr/share/foo2*/icm/* + .SH SEE ALSO +-.BR foo2hiperc-wrapper (1), +-.BR foo2hp2600-wrapper (1), +-.BR foo2lava-wrapper (1), +-.BR foo2oak-wrapper (1), +-.BR foo2qpdl-wrapper (1), +-.BR foo2zjs-wrapper (1), ++.BR foo2hiperc\-wrapper (1), ++.BR foo2hp2600\-wrapper (1), ++.BR foo2lava\-wrapper (1), ++.BR foo2oak\-wrapper (1), ++.BR foo2qpdl\-wrapper (1), ++.BR foo2zjs\-wrapper (1), + .SH "AUTHOR" + Rick Richardson + .br + http://foo2zjs.rkkda.com/ +-'/" +-'/" +-'/" + .em pdf_outline +diff --git a/lavadecode.1in b/lavadecode.1in +index 3a4901e..36e3cff 100644 +--- a/lavadecode.1in ++++ b/lavadecode.1in +@@ -37,7 +37,7 @@ Decode an LAVAFLOW stream file created by foo2lava. + + .nf + .ft CW +-$ lavadecode -h < testpage.prn ++$ lavadecode \-h < testpage.prn + 0: \\033%-12345X@PJL JOB NAME="stdin" + 1f: \\033%-12345X@PJL JOB USERNAME="" + 3d: \\033%-12345X@PJL JOB TIMESTAMP="07/20/2007" +@@ -67,7 +67,7 @@ $ lavadecode -h < testpage.prn + 133: \\033*p200Y Y OFFSET: [200] + 13a: \\033*r1A [Page 1] + 13f: \\033*b20V [black] +- DL = 0, D = 0, P = 1, - = 0, XY = 9792 x 6400 ++ DL = 0, D = 0, P = 1, \- = 0, XY = 9792 x 6400 + L0 = 128, MX = 0, MY = 0 + Order = 3 ILEAVE SMID + Options = 92 LRLTWO TPDON TPBON DPON +diff --git a/macros.man b/macros.man +index 289c457..cee9a52 100644 +--- a/macros.man ++++ b/macros.man +@@ -26,11 +26,11 @@ + .\} + .el \{\ + . ie !r ps4html \{\ +-'\" \(br\|\s-1\f(CB\\$1\fP\s+1\|\(br\l'|0\(rn'\l'|0\(ul' ++'\" \(br\|\s\-1\f(CB\\$1\fP\s+1\|\(br\l'|0\(rn'\l'|0\(ul' + . ft CW + . nr par*bxw \w'\\$1'+.4m +-\Z'\v'.25m'\D'l 0 -1m'\D'l \\n[par*bxw]u 0'\D'l 0 1m'\D'l -\\n[par*bxw]u 0''\ +-\Z'\h'.2m'\s-1\\$1\s+1'\ ++\Z'\v'.25m'\D'l 0 \-1m'\D'l \\n[par*bxw]u 0'\D'l 0 1m'\D'l \-\\n[par*bxw]u 0''\ ++\Z'\h'.2m'\s\-1\\$1\s+1'\ + \h'\\n[par*bxw]u'\\$2 + . ft P + . \} +@@ -53,26 +53,26 @@ + '\" + .if n .defcolor orange rgb #ffff00 + '\" +-'\" color - set the current color (ignores request with old groff) ++'\" color \- set the current color (ignores request with old groff) + '\" + .de color + .if mred \m[\\$1]\c + .. + '\" +-'\" colorword - colorize a word (ignored by old groff) ++'\" colorword \- colorize a word (ignored by old groff) + '\" + .de colorword + .ie m\\$1 \m[\\$1]\\$2\mP\c + .el \\$2\c + .. + '\" +-'\" colbox - colorize a word in a filled box ++'\" colbox \- colorize a word in a filled box + '\" + .de colbox + .ie mred \M[\\$2]\ + \v'+.167v'\ +-\D'P 0 -0.9v \w'\\$3'u 0 0 +0.9v -\w'\\$3'u 0'\ +-\v'-.167v'\ ++\D'P 0 \-0.9v \w'\\$3'u 0 0 +0.9v \-\w'\\$3'u 0'\ ++\v'\-.167v'\ + \m[\\$1]\\$3\mP\MP + .el \\$3\c + .. +@@ -94,7 +94,7 @@ + '\" pdfdest LINKNAME + '\" + .de pdfdest +-.pdfmark "/Dest /\\$1 /View [/XYZ -5 PL null] /DEST" ++.pdfmark "/Dest /\\$1 /View [/XYZ \-5 PL null] /DEST" + .. + '\" + '\" pdfbookmark COUNT LINKNAME STRING +@@ -140,7 +140,7 @@ + . \} + . \} + . ds hhh \\*[rr_labels!\\n[rr_i]] +-. pdfbookmark -\\n[rr_count] Link\\n[rr_i] "\\*[hhh]" ++. pdfbookmark \-\\n[rr_count] Link\\n[rr_i] "\\*[hhh]" + .\} + .. + '\" +@@ -159,7 +159,7 @@ + /Subject (\*[an-title] Manual Page) \ + /Author (Rick Richardson) \ + /Keywords (printing) \ +- /Creator (groff \n(.x.\n(.y.\n(.Y -man) \ ++ /Creator (groff \n(.x.\n(.y.\n(.Y \-man) \ + /CreationDate (\*[an-extra1]) \ + /ModDate (\*[an-extra1]) \ + /DOCINFO" +diff --git a/oakdecode.1in b/oakdecode.1in +index e248af7..4e421a8 100644 +--- a/oakdecode.1in ++++ b/oakdecode.1in +@@ -55,7 +55,7 @@ $ oakdecode < testpage.oak + 15 (16) (no args) + bih0 w h l0 bih5 dlen plen unk yOff P subP + 3c (64) 00010000 2176 256 256 58030020 1050 1056 000 64 3 0 +- DL = 0, D = 0, P = 1, - = 0, XY = 2176 x 256 ++ DL = 0, D = 0, P = 1, \- = 0, XY = 2176 x 256 + L0 = 256, MX = 32, MY = 0 + Order = 3 ILEAVE SMID + Options = 88 LRLTWO TPDON TPBON +diff --git a/opldecode.1in b/opldecode.1in +index 9706bb0..45d0544 100644 +--- a/opldecode.1in ++++ b/opldecode.1in +@@ -33,11 +33,11 @@ Print file offsets. + Set Debug level [0]. + + .SH EXAMPLES +-Decode an Raster Object stream file created by foo2lava-wrapper -z1. ++Decode an Raster Object stream file created by foo2lava-wrapper \-z1. + + .nf + .ft CW +-$ foo2lava-wrapper -z1 testpage.ps | opldecode -h ++$ foo2lava-wrapper \-z1 testpage.ps | opldecode \-h + 0: Event=StartOfJob; + 11: OSVersion=WindowsXP; + 25: DrvVersion=2.0.1410.0; +@@ -53,7 +53,7 @@ $ foo2lava-wrapper -z1 testpage.ps | opldecode -h + 11e: RasterObject.Height=6400; + 137: RasterObject.Data#20= + +- DL = 0, D = 0, P = 1, - = 0, XY = 9792 x 6400 ++ DL = 0, D = 0, P = 1, \- = 0, XY = 9792 x 6400 + L0 = 128, MX = 0, MY = 0 + Order = 3 ILEAVE SMID + Options = 92 LRLTWO TPDON TPBON DPON +@@ -66,7 +66,7 @@ $ foo2lava-wrapper -z1 testpage.ps | opldecode -h + 10e4a: RasterObject.Height=6400; + 10e63: RasterObject.Data#20= + +- DL = 0, D = 0, P = 1, - = 0, XY = 9792 x 6400 ++ DL = 0, D = 0, P = 1, \- = 0, XY = 9792 x 6400 + L0 = 128, MX = 0, MY = 0 + Order = 3 ILEAVE SMID + Options = 92 LRLTWO TPDON TPBON DPON +@@ -79,7 +79,7 @@ $ foo2lava-wrapper -z1 testpage.ps | opldecode -h + 25a17: RasterObject.Height=6400; + 25a30: RasterObject.Data#20= + +- DL = 0, D = 0, P = 1, - = 0, XY = 9792 x 6400 ++ DL = 0, D = 0, P = 1, \- = 0, XY = 9792 x 6400 + L0 = 128, MX = 0, MY = 0 + Order = 3 ILEAVE SMID + Options = 92 LRLTWO TPDON TPBON DPON +@@ -93,7 +93,7 @@ $ foo2lava-wrapper -z1 testpage.ps | opldecode -h + 3f68c: RasterObject.Height=6400; + 3f6a5: RasterObject.Data#20= + +- DL = 0, D = 0, P = 1, - = 0, XY = 9792 x 6400 ++ DL = 0, D = 0, P = 1, \- = 0, XY = 9792 x 6400 + L0 = 128, MX = 0, MY = 0 + Order = 3 ILEAVE SMID + Options = 92 LRLTWO TPDON TPBON DPON +diff --git a/osx-hotplug/osx-hplj-hotplug.1in b/osx-hotplug/osx-hplj-hotplug.1in +index 317c20f..8a3fe76 100644 +--- a/osx-hotplug/osx-hplj-hotplug.1in ++++ b/osx-hotplug/osx-hplj-hotplug.1in +@@ -3,7 +3,7 @@ + #include "../macros.man" + #endif + .SH NAME +-osx-hplj-hotplug - Daemon for downloading firmware files for Mac OS X ++osx-hplj-hotplug \- Daemon for downloading firmware files for Mac OS X + .SH SYNOPSIS + .B osx-hplj-hotplug + .RI [ options ] +diff --git a/printer-profile.1in b/printer-profile.1in +index 0f52054..9328db4 100644 +--- a/printer-profile.1in ++++ b/printer-profile.1in +@@ -29,11 +29,11 @@ Manuf is "dell". Model is "1355". + Edit the script for additional models. + + .SH OPTIONS +- -b 1|2 Bits per pixel (1) +- -r XRESxYRES Resolution. Default=''. () +- -P rem-print Remote print (64-bit) machine, or none (amd) +- -S rem-scan Remote scan (ColorMunki) machine, or none (mac) +- -D lvl Debug level ++ \-b 1|2 Bits per pixel (1) ++ \-r XRESxYRES Resolution. Default=''. () ++ \-P rem-print Remote print (64-bit) machine, or none (amd) ++ \-S rem-scan Remote scan (ColorMunki) machine, or none (mac) ++ \-D lvl Debug level + + .SH EXAMPLES + Profile the Samsung clp-315: +diff --git a/qpdldecode.1in b/qpdldecode.1in +index d8b2f35..7f9804b 100644 +--- a/qpdldecode.1in ++++ b/qpdldecode.1in +@@ -54,7 +54,7 @@ Decode an QPDL stream file created by foo2qpdl. + len=56(0x38) + magic=0x39abcdef, len=20(0x14), unk=0,0,0,0,0,0, + checksum=0x356 +- DL = 0, D = 0, P = 1, - = 0, XY = 9984 x 6400 ++ DL = 0, D = 0, P = 1, \- = 0, XY = 9984 x 6400 + L0 = 6400, MX = 0, MY = 0 + Order = 0 + Options = 72 LRLTWO TPBON +@@ -64,7 +64,7 @@ Decode an QPDL stream file created by foo2qpdl. + len=56(0x38) + magic=0x39abcdef, len=20(0x14), unk=0,0,0,0,0,0, + checksum=0x356 +- DL = 0, D = 0, P = 1, - = 0, XY = 9984 x 6400 ++ DL = 0, D = 0, P = 1, \- = 0, XY = 9984 x 6400 + L0 = 6400, MX = 0, MY = 0 + Order = 0 + Options = 72 LRLTWO TPBON +@@ -74,7 +74,7 @@ Decode an QPDL stream file created by foo2qpdl. + len=56(0x38) + magic=0x39abcdef, len=20(0x14), unk=0,0,0,0,0,0, + checksum=0x356 +- DL = 0, D = 0, P = 1, - = 0, XY = 9984 x 6400 ++ DL = 0, D = 0, P = 1, \- = 0, XY = 9984 x 6400 + L0 = 6400, MX = 0, MY = 0 + Order = 0 + Options = 72 LRLTWO TPBON +@@ -84,7 +84,7 @@ Decode an QPDL stream file created by foo2qpdl. + len=56(0x38) + magic=0x39abcdef, len=20(0x14), unk=0,0,0,0,0,0, + checksum=0x356 +- DL = 0, D = 0, P = 1, - = 0, XY = 9984 x 6400 ++ DL = 0, D = 0, P = 1, \- = 0, XY = 9984 x 6400 + L0 = 6400, MX = 0, MY = 0 + Order = 0 + Options = 72 LRLTWO TPBON +diff --git a/slxdecode.1in b/slxdecode.1in +index 7f9ebc5..30f24bc 100644 +--- a/slxdecode.1in ++++ b/slxdecode.1in +@@ -80,7 +80,7 @@ SLT_START_PAGE, 16 items [Page 1] + SLI_0x10f, 1 (0x1) + SLT_JBIG_BIH, 0 items + Data: 20 bytes +- DL = 0, D = 0, P = 1, - = 0, XY = 4896 x 6392 ++ DL = 0, D = 0, P = 1, \- = 0, XY = 4896 x 6392 + L0 = 128, MX = 0, MY = 0 + Order = 0 + Options = 8 TPBON +diff --git a/xqxdecode.1in b/xqxdecode.1in +index 488d192..fc32d76 100644 +--- a/xqxdecode.1in ++++ b/xqxdecode.1in +@@ -37,7 +37,7 @@ Decode an XQX stream file created by foo2xqx. + + .nf + .ft CW +-$ xqxdecode -h < testpage.xm ++$ xqxdecode \-h < testpage.xm + 0: \\033%-12345X@PJL JOB + 12: @PJL SET JAMRECOVERY=OFF + 2b: @PJL SET DENSITY=3 +@@ -78,7 +78,7 @@ $ xqxdecode -h < testpage.xm + 230: XQXI_0x80000000, 64 (0x40) + 23c: XQXI_0x40000000, 0 (0x0) + 248: XQXI_BIH(0x40000002) +- DL = 0, D = 0, P = 1, - = 0, XY = 9856 x 6432 ++ DL = 0, D = 0, P = 1, \- = 0, XY = 9856 x 6432 + L0 = 128, MX = 16, MY = 0 + Order = 3 ILEAVE SMID + Options = 92 LRLTWO TPDON TPBON DPON +diff --git a/zjsdecode.1in b/zjsdecode.1in +index ea6c443..567f840 100644 +--- a/zjsdecode.1in ++++ b/zjsdecode.1in +@@ -74,7 +74,7 @@ ZJT_START_PAGE, 17 items + ZJI_MINOLTA_PAGE_NUMBER, 1 (0x1) + ZJT_JBIG_BIH, 0 items + Data: 20 bytes +- DL = 0, D = 0, P = 1, - = 0, XY = 10200 x 6600 ++ DL = 0, D = 0, P = 1, \- = 0, XY = 10200 x 6600 + L0 = 128, MX = 16, MY = 0 + Order = 3 ILEAVE SMID + Options = 92 LRLTWO TPDON TPBON DPON diff -Nru foo2zjs-20160313dfsg0/debian/patches/0016-Fix-various-spelling-errors.patch foo2zjs-20160902dfsg0/debian/patches/0016-Fix-various-spelling-errors.patch --- foo2zjs-20160313dfsg0/debian/patches/0016-Fix-various-spelling-errors.patch 1970-01-01 00:00:00.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/0016-Fix-various-spelling-errors.patch 2016-10-08 16:37:40.000000000 +0000 @@ -0,0 +1,129 @@ +From 5b30ee424a2034dea0983d321f1da5334b61dd90 Mon Sep 17 00:00:00 2001 +From: Didier Raboud +Date: Tue, 4 Oct 2016 11:43:59 +0200 +Subject: Fix various spelling errors: + + precission + supress + langauge +--- + icc2ps/cmscgats.c | 2 +- + icc2ps/cmsio1.c | 2 +- + icc2ps/cmsmatsh.c | 4 ++-- + icc2ps/cmsps2.c | 4 ++-- + icc2ps/icc2ps.c | 4 ++-- + oakdecode.c | 2 +- + qpdldecode.c | 2 +- + 7 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/icc2ps/cmscgats.c b/icc2ps/cmscgats.c +index 042429f..db4ab3f 100644 +--- a/icc2ps/cmscgats.c ++++ b/icc2ps/cmscgats.c +@@ -620,7 +620,7 @@ void ReadReal(LPIT8 it8, int inum) + if (it8->ch == '.') { // Decimal point + + double frac = 0.0; // fraction +- int prec = 0; // precission ++ int prec = 0; // precision + + NextCh(it8); // Eats dec. point + +diff --git a/icc2ps/cmsio1.c b/icc2ps/cmsio1.c +index 9f9d6e4..1bd4e23 100644 +--- a/icc2ps/cmsio1.c ++++ b/icc2ps/cmsio1.c +@@ -1162,7 +1162,7 @@ LCMSBOOL ReadCLUT(LPLCMSICCPROFILE Icc, size_t Offset, LPLUT NewLUT) + AdjustEndianessArray16(NewLUT ->T, NewLUT->Tsize / sizeof(WORD)); + } + else { +- cmsSignalError(LCMS_ERRC_ABORTED, "Unknow precission of '%d'", CLUT.prec); ++ cmsSignalError(LCMS_ERRC_ABORTED, "Unknow precision of '%d'", CLUT.prec); + return FALSE; + } + +diff --git a/icc2ps/cmsmatsh.c b/icc2ps/cmsmatsh.c +index 634c9f3..971f931 100644 +--- a/icc2ps/cmsmatsh.c ++++ b/icc2ps/cmsmatsh.c +@@ -75,7 +75,7 @@ int ComputeTables(LPGAMMATABLE Table[3], LPWORD Out[3], LPL16PARAMS p16) + AllLinear += cmsIsLinear(PtrW, p16 -> nSamples); + } + +- // If is all linear, then supress table interpolation (this ++ // If is all linear, then suppress table interpolation (this + // will speed greately some trivial operations. + // Return 1 if present, 0 if all linear + +@@ -192,7 +192,7 @@ LPMATSHAPER cmsAllocMatShaper(LPMAT3 Matrix, LPGAMMATABLE Tables[], DWORD Behavi + AllLinear += cmsIsLinear(PtrW, NewMatShaper -> p16.nSamples); + } + +- // If is all linear, then supress table interpolation (this ++ // If is all linear, then suppress table interpolation (this + // will speed greately some trivial operations + + if (AllLinear != 3) +diff --git a/icc2ps/cmsps2.c b/icc2ps/cmsps2.c +index 6c352a7..31592e7 100644 +--- a/icc2ps/cmsps2.c ++++ b/icc2ps/cmsps2.c +@@ -54,7 +54,7 @@ LCMSAPI DWORD LCMSEXPORT cmsGetPostScriptCRDEx(cmsHPROFILE hProfile, int Intent, + Color Space Arrays (CSA) + ================================================================================== + +- In order to obtain precission, code chooses between three ways to implement ++ In order to obtain precision, code chooses between three ways to implement + the device -> XYZ transform. These cases identifies monochrome profiles (often + implemented as a set of curves), matrix-shaper and LUT-based. + +@@ -1456,7 +1456,7 @@ int WriteOutputLUT(LPMEMSTREAM m, cmsHPROFILE hProfile, int Intent, DWORD dwFlag + OutputFormat = CHANNELS_SH(nChannels) | BYTES_SH(2); + + // For absolute colorimetric, the LUT is encoded as relative +- // in order to preserve precission. ++ // in order to preserve precision. + + RelativeEncodingIntent = Intent; + if (RelativeEncodingIntent == INTENT_ABSOLUTE_COLORIMETRIC) +diff --git a/icc2ps/icc2ps.c b/icc2ps/icc2ps.c +index 7c7df2b..8f78a55 100644 +--- a/icc2ps/icc2ps.c ++++ b/icc2ps/icc2ps.c +@@ -139,8 +139,8 @@ void Help(void) + + fprintf(stderr, "%cb - Black point compensation (CRD only)\n", SW); + fprintf(stderr, "%cu - Do NOT generate resource name on CRD\n", SW); +- fprintf(stderr, "%cc<0,1,2> - Precission (0=LowRes, 1=Normal (default), 2=Hi-res) (CRD only)\n", SW); +- fprintf(stderr, "%cn - Alternate way to set precission, number of CLUT points (CRD only)\n", SW); ++ fprintf(stderr, "%cc<0,1,2> - Precision (0=LowRes, 1=Normal (default), 2=Hi-res) (CRD only)\n", SW); ++ fprintf(stderr, "%cn - Alternate way to set precision, number of CLUT points (CRD only)\n", SW); + + fprintf(stderr, "\n"); + fprintf(stderr, "This program is intended to be a demo of the little cms\n" +diff --git a/oakdecode.c b/oakdecode.c +index 0653954..2ec1b1e 100644 +--- a/oakdecode.c ++++ b/oakdecode.c +@@ -101,7 +101,7 @@ usage(void) + "Options:\n" + " -d basename Basename of .pbm file for saving decompressed planes\n" + " -r basename Basename of .jbg file for saving raw planes\n" +-" -i Supress display of image records\n" ++" -i Suppress display of image records\n" + " -o Print file offsets\n" + " -D lvl Set Debug level [%d]\n" + , Debug +diff --git a/qpdldecode.c b/qpdldecode.c +index d6336df..633ba97 100644 +--- a/qpdldecode.c ++++ b/qpdldecode.c +@@ -82,7 +82,7 @@ usage(void) + "\n" + " Decode a QPDL stream into human readable form.\n" + "\n" +-" A Quick Page Description Langauge (QPDL) is the printer language" ++" A Quick Page Description language (QPDL) is the printer language" + " used by some Samsung printers, such as the CLP-600n.\n" + "\n" + " Also known as SPLC." diff -Nru foo2zjs-20160313dfsg0/debian/patches/0017-Delay-firmware-transfer-for-UDEV-automatic-printer-s.patch foo2zjs-20160902dfsg0/debian/patches/0017-Delay-firmware-transfer-for-UDEV-automatic-printer-s.patch --- foo2zjs-20160313dfsg0/debian/patches/0017-Delay-firmware-transfer-for-UDEV-automatic-printer-s.patch 1970-01-01 00:00:00.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/0017-Delay-firmware-transfer-for-UDEV-automatic-printer-s.patch 2016-10-08 16:37:40.000000000 +0000 @@ -0,0 +1,29 @@ +From 06433363872ea15c514dd9fe17042fea92c9a89d Mon Sep 17 00:00:00 2001 +From: Didier Raboud +Date: Tue, 4 Oct 2016 11:44:00 +0200 +Subject: Delay firmware transfer for UDEV automatic printer setup + +--- + hplj1000 | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/hplj1000 b/hplj1000 +index 21ca570..6b74601 100755 +--- a/hplj1000 ++++ b/hplj1000 +@@ -33,6 +33,15 @@ esac + PROGNAME="$0" + + # ++# Wait some time before installing the firmware so that probing for ++# automatic printer setup which happens immediately after turning on ++# the printer does not interfere with the firmware transfer to the ++# printer ++# https://bugs.launchpad.net/ubuntu/+source/foo2zjs/+bug/543177 ++# ++sleep 3 ++ ++# + # Set $DEV to, e.g. /dev/usb/lp0, to force the device you want + # Else, leave it null to automatically detect the device + # diff -Nru foo2zjs-20160313dfsg0/debian/patches/0018-Removed-the-lines-in-the-UDEV-script-for-the-automat.patch foo2zjs-20160902dfsg0/debian/patches/0018-Removed-the-lines-in-the-UDEV-script-for-the-automat.patch --- foo2zjs-20160313dfsg0/debian/patches/0018-Removed-the-lines-in-the-UDEV-script-for-the-automat.patch 1970-01-01 00:00:00.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/0018-Removed-the-lines-in-the-UDEV-script-for-the-automat.patch 2016-10-08 16:37:40.000000000 +0000 @@ -0,0 +1,33 @@ +From 4f719bf41407960ac7f5f79302c5232a88718fcc Mon Sep 17 00:00:00 2001 +From: Till Kamppeter +Date: Tue, 4 Oct 2016 11:44:01 +0200 +Subject: Removed the lines in the UDEV script for the automatic firmware + + upload into the printer which remove the UDEV rules files for HPLIP's + automatic firmware upload. +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/foo2zjs/+bug/783389 +--- + hplj1000 | 10 ---------- + 1 file changed, 10 deletions(-) + +diff --git a/hplj1000 b/hplj1000 +index 6b74601..6bc0d18 100755 +--- a/hplj1000 ++++ b/hplj1000 +@@ -152,16 +152,6 @@ case "$0" in + esac + + # +-# Remove HPLIP proprietary rules! +-# +-model=` echo "$MODEL" | tr 'A-Z' 'a-z' ` +-rm -f /etc/udev/rules.d/*hpmud*laserjet_${model}* +-rm -f /etc/udev/rules.d/*hpmud_support.rules +-rm -f /etc/udev/rules.d/*hpmud_plugin.rules +-rm -f /lib/udev/rules.d/*hpmud_support.rules +-rm -f /lib/udev/rules.d/*hpmud_plugin.rules +- +-# + # The special command line argument "install-usermap" will install + # the proper entry into the /etc/hotplug/usb.usermap file + # diff -Nru foo2zjs-20160313dfsg0/debian/patches/0019-The-firmware-upload-script-tried-to-upload-the-firmw.patch foo2zjs-20160902dfsg0/debian/patches/0019-The-firmware-upload-script-tried-to-upload-the-firmw.patch --- foo2zjs-20160313dfsg0/debian/patches/0019-The-firmware-upload-script-tried-to-upload-the-firmw.patch 1970-01-01 00:00:00.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/0019-The-firmware-upload-script-tried-to-upload-the-firmw.patch 2016-10-08 16:37:40.000000000 +0000 @@ -0,0 +1,54 @@ +From 0eed24e2e359aa48d790c14cdfa709c71e7cc985 Mon Sep 17 00:00:00 2001 +From: Till Kamppeter +Date: Tue, 4 Oct 2016 11:44:02 +0200 +Subject: The firmware upload script tried to upload the firmware via + + the usblp kernel module and with the CUPS USB backend (using libusb) in + parallel, making the printer crash. +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1003843 +--- + hplj1000 | 24 ++++++++---------------- + 1 file changed, 8 insertions(+), 16 deletions(-) + +diff --git a/hplj1000 b/hplj1000 +index 6bc0d18..2cd24b9 100755 +--- a/hplj1000 ++++ b/hplj1000 +@@ -262,8 +262,14 @@ if [ "$DEV" != "" ]; then + # force downloading to a specific device + # + load_usblp "$DEV" +-elif [ -x $PRINTERID -o -x $USB_BACKEND ]; then +- if [ -x $PRINTERID ]; then ++elif [ -x $USB_BACKEND ]; then ++ # ++ # If we have CUPS installed, use the CUPS "usb" backend, as then we do ++ # not need to care whether the system uses the usblp kernel module or ++ # libusb ++ # ++ load_cups ++elif [ -x $PRINTERID ]; then + # + # Sniff around for printers that need a firmware download + # +@@ -282,20 +288,6 @@ elif [ -x $PRINTERID -o -x $USB_BACKEND ]; then + fi + fi + done +- if [ "$usblps" != " " ]; then +- # All done! +- exit +- fi +- fi +- +- if [ -x $USB_BACKEND ]; then +- # +- # If we have CUPS installed, use the CUPS "usb" backend, as then we do +- # not need to care whether the system uses the usblp kernel module or +- # libusb +- # +- load_cups +- fi + else + log "HP LaserJet $MODEL firmware was not downloaded..." + log "...couldn't find $PRINTERID, DEV is not set, and CUPS not installed." diff -Nru foo2zjs-20160313dfsg0/debian/patches/0020-Prevent-an-infinite-loop-when-loading-the-firmware.patch foo2zjs-20160902dfsg0/debian/patches/0020-Prevent-an-infinite-loop-when-loading-the-firmware.patch --- foo2zjs-20160313dfsg0/debian/patches/0020-Prevent-an-infinite-loop-when-loading-the-firmware.patch 1970-01-01 00:00:00.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/0020-Prevent-an-infinite-loop-when-loading-the-firmware.patch 2016-10-08 16:37:40.000000000 +0000 @@ -0,0 +1,58 @@ +From 44c18f29871509f3000bf709652ea60d9cb50b8c Mon Sep 17 00:00:00 2001 +From: Didier Raboud +Date: Tue, 4 Oct 2016 11:44:03 +0200 +Subject: Prevent an infinite loop when loading the firmware. + + When using the load_cups method, the CUPS backend will internally + unload and reload the usblp module. This will generate + SUBSYSTEM=usbmisc events that need to be ignored in the CUPS code + path, or this script will be rerun in an infite loop. + + But when using the load_usblp method, the usblp module is obviously + needed. So in this situation we need to ignore the SUBSYSTEM=usb + events. +Bug-Debian: http://bugs.debian.org/663868 +Author: Peter De Wachter +--- + hplj1000 | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +diff --git a/hplj1000 b/hplj1000 +index 2cd24b9..0461f24 100755 +--- a/hplj1000 ++++ b/hplj1000 +@@ -24,12 +24,6 @@ + # Mike Morgan (2004) + # + +-# udev calls us twice on FC4! Just want /dev/usb/lp +-case "$DEVNAME" in +-/dev/usb/usb*) exit;; # Bug: FC4 +-/dev/bus/usb/*) exit;; # Bug: Ubuntu 14 +-esac +- + PROGNAME="$0" + + # +@@ -261,6 +255,7 @@ if [ "$DEV" != "" ]; then + # + # force downloading to a specific device + # ++ if [ "$SUBSYSTEM" != "usbmisc" ]; then exit; fi + load_usblp "$DEV" + elif [ -x $USB_BACKEND ]; then + # +@@ -268,11 +263,13 @@ elif [ -x $USB_BACKEND ]; then + # not need to care whether the system uses the usblp kernel module or + # libusb + # ++ if [ "$SUBSYSTEM" != "usb" ]; then exit; fi + load_cups + elif [ -x $PRINTERID ]; then + # + # Sniff around for printers that need a firmware download + # ++ if [ "$SUBSYSTEM" != "usbmisc" ]; then exit; fi + usblps=`find /dev/usb -type c -name 'lp*'`" "`find /dev -type c -name 'usblp*'` + for dev in $usblps; do + status=`$PRINTERID $dev 2>/dev/null | grep -y "hp LaserJet $MODEL"` diff -Nru foo2zjs-20160313dfsg0/debian/patches/0021-Build-manpages-reproducibly-through-reading-the-MODT.patch foo2zjs-20160902dfsg0/debian/patches/0021-Build-manpages-reproducibly-through-reading-the-MODT.patch --- foo2zjs-20160313dfsg0/debian/patches/0021-Build-manpages-reproducibly-through-reading-the-MODT.patch 1970-01-01 00:00:00.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/0021-Build-manpages-reproducibly-through-reading-the-MODT.patch 2016-10-08 16:37:40.000000000 +0000 @@ -0,0 +1,39 @@ +From d1147170930a24a197a4d22198bc341ec5b5307a Mon Sep 17 00:00:00 2001 +From: Didier Raboud +Date: Tue, 4 Oct 2016 11:44:04 +0200 +Subject: Build manpages reproducibly, through reading the MODTIME from + + debian/changelog exclusively, and giving LC_ALL=C.UTF-8 TZ=UTC to various + commands +--- + Makefile | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 5b9eba5..bdffd0d 100644 +--- a/Makefile ++++ b/Makefile +@@ -79,6 +79,8 @@ endif + ifeq ($(UNAME),SunOS) + MODTIME= `ls -e $$1 | cut -c42-61` + endif ++# Define modtime from the debian changelog, for all files ++MODTIME= LC_ALL=C.UTF-8 TZ=UTC date -d "$$(dpkg-parsechangelog -SDate)" "+%a %b %d %T %Y" + + # + # Files for tarball +@@ -1526,12 +1528,12 @@ install-doc: doc + $(INSTALL) -c -m 644 ChangeLog $(DOCDIR) + + GROFF=/usr/local/test/bin/groff +-GROFF=groff ++GROFF=LC_ALL=C.UTF-8 TZ=UTC groff + manual.pdf: $(MANPAGES) osx-hotplug/osx-hplj-hotplug.1 + -$(GROFF) -t -man \ + `ls $(MANPAGES) \ + osx-hotplug/osx-hplj-hotplug.1 \ +- | sort` \ ++ | LC_ALL=C.UTF-8 sort` \ + | ps2pdf - $@ + + README: README.in diff -Nru foo2zjs-20160313dfsg0/debian/patches/10-makefile.patch foo2zjs-20160902dfsg0/debian/patches/10-makefile.patch --- foo2zjs-20160313dfsg0/debian/patches/10-makefile.patch 2016-04-25 19:57:55.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/10-makefile.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,227 +0,0 @@ -Description: Patch the Makefiles - This patch makes the Makefiles work correctly with LDFLAGS, Debian PREFIX usages, etc. -Author: Steffen Joeris -Author: Luca Capello -Author: Didier Raboud -Last-Update: 2016-04-16 - ---- a/Makefile -+++ b/Makefile -@@ -17,9 +17,7 @@ - VERSION=0.0 - - # Installation prefix... --PREFIX=/usr/local - PREFIX=/usr --PREFIX=$(DESTDIR)/usr - - # Pathnames for this package... - BIN=$(PREFIX)/bin -@@ -38,7 +36,7 @@ - ROOT=root - - # Pathnames for referenced packages... --FOODB=$(DESTDIR)/usr/share/foomatic/db/source -+FOODB=$(PREFIX)/share/foomatic/db/source - - # User ID's - LPuid=-oroot -@@ -451,32 +449,32 @@ - - - foo2zjs: foo2zjs.o $(LIBJBG) -- $(CC) $(CFLAGS) -o $@ foo2zjs.o $(LIBJBG) -+ $(CC) $(CFLAGS) -o $@ foo2zjs.o $(LIBJBG) $(LDFLAGS) - - foo2hp: foo2hp.o $(LIBJBG) -- # $(CC) $(CFLAGS) -o $@ foo2hp.o $(LIBJBG) /usr/local/lib/libdmalloc.a -- $(CC) $(CFLAGS) -o $@ foo2hp.o $(LIBJBG) -+ # $(CC) $(CFLAGS) -o $@ foo2hp.o $(LIBJBG) $(LDFLAGS) /usr/local/lib/libdmalloc.a -+ $(CC) $(CFLAGS) -o $@ foo2hp.o $(LIBJBG) $(LDFLAGS) - - foo2xqx: foo2xqx.o $(LIBJBG) -- $(CC) $(CFLAGS) -o $@ foo2xqx.o $(LIBJBG) -+ $(CC) $(CFLAGS) -o $@ foo2xqx.o $(LIBJBG) $(LDFLAGS) - - foo2lava: foo2lava.o $(LIBJBG) -- $(CC) $(CFLAGS) -o $@ foo2lava.o $(LIBJBG) -+ $(CC) $(CFLAGS) -o $@ foo2lava.o $(LIBJBG) $(LDFLAGS) - - foo2qpdl: foo2qpdl.o $(LIBJBG) -- $(CC) $(CFLAGS) -o $@ foo2qpdl.o $(LIBJBG) -+ $(CC) $(CFLAGS) -o $@ foo2qpdl.o $(LIBJBG) $(LDFLAGS) - - foo2oak: foo2oak.o $(LIBJBG) -- $(CC) $(CFLAGS) -o $@ foo2oak.o $(LIBJBG) -+ $(CC) $(CFLAGS) -o $@ foo2oak.o $(LIBJBG) $(LDFLAGS) - - foo2slx: foo2slx.o $(LIBJBG) -- $(CC) $(CFLAGS) -o $@ foo2slx.o $(LIBJBG) -+ $(CC) $(CFLAGS) -o $@ foo2slx.o $(LIBJBG) $(LDFLAGS) - - foo2hiperc: foo2hiperc.o $(LIBJBG) -- $(CC) $(CFLAGS) -o $@ foo2hiperc.o $(LIBJBG) -+ $(CC) $(CFLAGS) -o $@ foo2hiperc.o $(LIBJBG) $(LDFLAGS) - - foo2hbpl2: foo2hbpl2.o $(LIBJBG) -- $(CC) $(CFLAGS) -o $@ foo2hbpl2.o $(LIBJBG) -+ $(CC) $(CFLAGS) -o $@ foo2hbpl2.o $(LIBJBG) $(LDFLAGS) - - - foo2zjs-wrapper: foo2zjs-wrapper.in Makefile -@@ -556,46 +554,46 @@ - endif - - ok: ok.o $(LIBJBG) -- $(CC) $(CFLAGS) ok.o $(LIBJBG) -o $@ -+ $(CC) $(CFLAGS) ok.o $(LIBJBG) -o $@ $(LDFLAGS) - - gipddecode: gipddecode.o $(LIBJBG) -- $(CC) $(CFLAGS) gipddecode.o $(LIBJBG) -o $@ -+ $(CC) $(CFLAGS) gipddecode.o $(LIBJBG) -o $@ $(LDFLAGS) - - hbpldecode: hbpldecode.o $(LIBJBG) -- $(CC) $(CFLAGS) hbpldecode.o $(LIBJBG) -o $@ -+ $(CC) $(CFLAGS) hbpldecode.o $(LIBJBG) -o $@ $(LDFLAGS) - - hipercdecode: hipercdecode.o $(LIBJBG) -- $(CC) $(CFLAGS) hipercdecode.o $(LIBJBG) -o $@ -+ $(CC) $(CFLAGS) hipercdecode.o $(LIBJBG) -o $@ $(LDFLAGS) - - lavadecode: lavadecode.o $(LIBJBG) -- $(CC) $(CFLAGS) lavadecode.o $(LIBJBG) -o $@ -+ $(CC) $(CFLAGS) lavadecode.o $(LIBJBG) -o $@ $(LDFLAGS) - - oakdecode: oakdecode.o $(LIBJBG) -- $(CC) $(CFLAGS) -g oakdecode.o $(LIBJBG) -o $@ -+ $(CC) $(CFLAGS) -g oakdecode.o $(LIBJBG) -o $@ $(LDFLAGS) - - opldecode: opldecode.o $(LIBJBG) -- $(CC) $(CFLAGS) -g opldecode.o $(LIBJBG) -o $@ -+ $(CC) $(CFLAGS) -g opldecode.o $(LIBJBG) -o $@ $(LDFLAGS) - - qpdldecode: qpdldecode.o $(LIBJBG) -- $(CC) $(CFLAGS) qpdldecode.o $(LIBJBG) -o $@ -+ $(CC) $(CFLAGS) qpdldecode.o $(LIBJBG) -o $@ $(LDFLAGS) - - splcdecode: splcdecode.o $(LIBJBG) -- $(CC) $(CFLAGS) splcdecode.o $(LIBJBG) -lz -o $@ -+ $(CC) $(CFLAGS) splcdecode.o $(LIBJBG) -lz -o $@ $(LDFLAGS) - - slxdecode: slxdecode.o $(LIBJBG) -- $(CC) $(CFLAGS) slxdecode.o $(LIBJBG) -o $@ -+ $(CC) $(CFLAGS) slxdecode.o $(LIBJBG) -o $@ $(LDFLAGS) - - xqxdecode: xqxdecode.o $(LIBJBG) -- $(CC) $(CFLAGS) xqxdecode.o $(LIBJBG) -o $@ -+ $(CC) $(CFLAGS) xqxdecode.o $(LIBJBG) -o $@ $(LDFLAGS) - - zjsdecode: zjsdecode.o $(LIBJBG) -- $(CC) $(CFLAGS) zjsdecode.o $(LIBJBG) -o $@ -+ $(CC) $(CFLAGS) zjsdecode.o $(LIBJBG) -o $@ $(LDFLAGS) - - command2foo2lava-pjl: command2foo2lava-pjl.o -- $(CC) $(CFLAGS) -L/usr/local/lib command2foo2lava-pjl.o -lcups -o $@ -+ $(CC) $(CFLAGS) -L/usr/local/lib command2foo2lava-pjl.o -lcups -o $@ $(LDFLAGS) - - command2foo2lava-pjl.o: command2foo2lava-pjl.c -- $(CC) $(CFLAGS) -I/usr/local/include -c command2foo2lava-pjl.c -+ $(CC) $(CPPFLAGS) $(CFLAGS) -I/usr/local/include -c command2foo2lava-pjl.c - - # - # Installation rules -@@ -641,8 +639,6 @@ - # - - --UDEVBIN=$(DESTDIR)/bin/ -- - install-prog: - # - # Install driver, wrapper, and development tools -@@ -650,8 +646,7 @@ - $(INSTALL) -d $(BIN) - $(INSTALL) -c $(PROGS) $(SHELLS) $(BIN)/ - if [ "$(BINPROGS)" != "" ]; then \ -- $(INSTALL) -d $(UDEVBIN); \ -- $(INSTALL) -c $(BINPROGS) $(UDEVBIN); \ -+ $(INSTALL) -c $(BINPROGS) $(BIN); \ - fi - # - # Install gamma correction files. These are just templates, -@@ -837,10 +832,10 @@ - fi; \ - done - --MODEL=$(DESTDIR)/usr/share/cups/model --LOCALMODEL=$(DESTDIR)/usr/local/share/cups/model -+MODEL=$(PREFIX)/share/cups/model -+LOCALMODEL=$(PREFIX)/local/share/cups/model - MACMODEL=/Library/Printers/PPDs/Contents/Resources --PPD=$(DESTDIR)/usr/share/ppd -+PPD=$(PREFIX)/share/ppd - VARPPD=/var/lp/ppd - install-ppd: - # -@@ -898,9 +893,9 @@ - done; \ - fi - --APPL=$(DESTDIR)/usr/share/applications --OLDAPPL=$(DESTDIR)/usr/share/gnome/apps/System --PIXMAPS=$(DESTDIR)/usr/share/pixmaps -+APPL=$(PREFIX)/share/applications -+OLDAPPL=$(PREFIX)/share/gnome/apps/System -+PIXMAPS=$(PREFIX)/share/pixmaps - - install-desktop: - # -@@ -1034,6 +1029,7 @@ - - install-filter: - if [ "$(CUPS_SERVERBIN)" != "" ]; then \ -+ mkdir -p $(CUPS_SERVERBIN)/filter/; \ - ln -sf $(BIN)/command2foo2lava-pjl $(CUPS_SERVERBIN)/filter/; \ - fi - -@@ -1432,10 +1428,9 @@ - *) driver=foo2zjs;; \ - esac; \ - echo $$driver - $$printer; \ -- ENGINE=../foomatic/foomatic-db-engine; \ - PERL5LIB=$$ENGINE/lib \ - FOOMATICDB=foomatic-db \ -- $$ENGINE/foomatic-ppdfile \ -+ /usr/bin/foomatic-ppdfile \ - -d $$driver -p $$printer \ - > PPD/$$printer.ppd; \ - done -@@ -1869,7 +1864,7 @@ - misc: pksm2bitcmyk phorum-logo.gif - - pksm2bitcmyk: pksm2bitcmyk.c -- $(CC) $(CFLAGS) pksm2bitcmyk.c -lnetpbm -o $@ -+ $(CC) $(CFLAGS) pksm2bitcmyk.c -lnetpbm -o $@ $(LDFLAGS) - - phorum-logo.gif: archhp.fig - fig2dev -L gif -m.25 archhp.fig | giftrans -t "#ffffff" -o $@ ---- a/icc2ps/Makefile -+++ b/icc2ps/Makefile -@@ -9,7 +9,7 @@ - LIB= cmscam97.c cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \ - cmslut.c cmsmatsh.c cmsmtrx.c cmsnamed.c cmspack.c cmspcs.c cmsps2.c \ - cmssamp.c cmswtpnt.c cmsxform.c cmsio0.c cmsvirt.c --CFLAGS= -O3 -+CFLAGS+= -O3 - INSTALL=install - ifeq ($(UNAME),SunOS) - INSTALL=/usr/ucb/install -@@ -21,7 +21,7 @@ - all: foo2zjs-icc2ps man - - foo2zjs-icc2ps: $(SRC) $(LIB) -- $(CC) $(CFLAGS) $(SRC) $(LIB) -lm -o $@ -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(SRC) $(LIB) -lm -o $@ $(LDFLAGS) - - install: all - $(INSTALL) -c foo2zjs-icc2ps $(BIN) diff -Nru foo2zjs-20160313dfsg0/debian/patches/12-fix-implicit-declaration.patch foo2zjs-20160902dfsg0/debian/patches/12-fix-implicit-declaration.patch --- foo2zjs-20160313dfsg0/debian/patches/12-fix-implicit-declaration.patch 2016-04-25 19:56:31.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/12-fix-implicit-declaration.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -Description: Include unistd.h to make sure the swab function is not - implicitely declared, also declare _XOPEN_SOURCE to have it available - through unistd.h, and therefore declare _GNU_SOURCE to have - strcasecmp() and vsnprintf() -Author: Didier Raboud -Last-Update: 2014-01-08 ---- a/icc2ps/cmsio1.c -+++ b/icc2ps/cmsio1.c -@@ -71,6 +71,7 @@ - #undef STEP - } - #else -+#include - #define xswab swab - #endif - ---- a/icc2ps/Makefile -+++ b/icc2ps/Makefile -@@ -10,6 +10,10 @@ - cmslut.c cmsmatsh.c cmsmtrx.c cmsnamed.c cmspack.c cmspcs.c cmsps2.c \ - cmssamp.c cmswtpnt.c cmsxform.c cmsio0.c cmsvirt.c - CFLAGS+= -O3 -+ -+# _XOPEN_SOURCE is required for swab() but undefines strcasecmp(), so add _GNU_SOURCE as well: -+CFLAGS+= -D_XOPEN_SOURCE -D_GNU_SOURCE -+ - INSTALL=install - ifeq ($(UNAME),SunOS) - INSTALL=/usr/ucb/install diff -Nru foo2zjs-20160313dfsg0/debian/patches/20-honour-papersize.patch foo2zjs-20160902dfsg0/debian/patches/20-honour-papersize.patch --- foo2zjs-20160313dfsg0/debian/patches/20-honour-papersize.patch 2016-04-25 19:56:31.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/20-honour-papersize.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -Support /etc/papersize - -NB, this is now done in debian/rules, so it will automatically apply to - every new wrapper script which gets added to this package in the - future. The patch should however not be deleted, so it does show - up when looking at the differences with upstream. ---- foo2zjs_20100728.orig/foo2hp2600-wrapper.in -+++ foo2zjs_20100728/foo2hp2600-wrapper.in -@@ -204,7 +204,8 @@ - - MEDIA=1 - COPIES=1 --PAPER=1 -+test -r /etc/papersize && PAPER=$(cat /etc/papersize) -+test "$PAPER" || PAPER=1 - RES=600x600 - SOURCE=7 - NUP= ---- foo2zjs_20100728.orig/foo2oak-wrapper.in -+++ foo2zjs_20100728/foo2oak-wrapper.in -@@ -160,7 +160,8 @@ - QUALITY=wts - MEDIA=1 - COPIES=1 --PAPER=1 -+test -r /etc/papersize && PAPER=$(cat /etc/papersize) -+test "$PAPER" || PAPER=1 - RES=600x600 - SOURCE=7 - NUP= ---- foo2zjs_20100728.orig/foo2zjs-wrapper.in -+++ foo2zjs_20100728/foo2zjs-wrapper.in -@@ -194,7 +194,8 @@ - QUALITY=wts - MEDIA=1 - COPIES=1 --PAPER=1 -+test -r /etc/papersize && PAPER=$(cat /etc/papersize) -+test "$PAPER" || PAPER=1 - RES=1200x600 - SOURCE=7 - NUP= diff -Nru foo2zjs-20160313dfsg0/debian/patches/20-PDF-input-data-in-PPDs.patch foo2zjs-20160902dfsg0/debian/patches/20-PDF-input-data-in-PPDs.patch --- foo2zjs-20160313dfsg0/debian/patches/20-PDF-input-data-in-PPDs.patch 2016-04-25 19:56:31.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/20-PDF-input-data-in-PPDs.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -Add "*cupsFilter" line to accept PDF input data to the PPDs, see: - - - -NB, this is done in debian/rules, so it will automatically apply to - every new PPD which gets added to this package in the future. The - patch should however not be deleted, so it does show up when - looking at the differences with upstream. ---- foo2zjs_20100728dfsg.orig/PPD/Generic-OAKT_Printer.ppd -+++ foo2zjs_20100728dfsg/PPD/Generic-OAKT_Printer.ppd -@@ -33,7 +33,8 @@ - *cupsVersion: 1.0 - *cupsManualCopies: True - *cupsModelNumber: 2 --*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip" -+*cupsFilter: "application/vnd.cups-postscript 100 foomatic-rip" -+*cupsFilter: "application/vnd.cups-pdf 0 foomatic-rip" - *%pprRIP: foomatic-rip other - *ModelName: "Generic OAKT Printer" - *ShortNickName: "Generic OAKT Printer foo2oak" ---- foo2zjs_20100728dfsg.orig/PPD/Generic-ZjStream_Printer.ppd -+++ foo2zjs_20100728dfsg/PPD/Generic-ZjStream_Printer.ppd -@@ -33,7 +33,8 @@ - *cupsVersion: 1.0 - *cupsManualCopies: True - *cupsModelNumber: 2 --*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip" -+*cupsFilter: "application/vnd.cups-postscript 100 foomatic-rip" -+*cupsFilter: "application/vnd.cups-pdf 0 foomatic-rip" - *%pprRIP: foomatic-rip other - *ModelName: "Generic ZjStream Printer" - *ShortNickName: "Generic ZjStre. Printer foo2zjs" diff -Nru foo2zjs-20160313dfsg0/debian/patches/20-system-lcms.patch foo2zjs-20160902dfsg0/debian/patches/20-system-lcms.patch --- foo2zjs-20160313dfsg0/debian/patches/20-system-lcms.patch 2016-04-25 20:03:01.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/20-system-lcms.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,100 +0,0 @@ -Description: don't build icc2ps (instead use psicc from liblcms2-utils) -Author: Michael Gilbert -Last-Update: 2016-04-25 - ---- a/Makefile -+++ b/Makefile -@@ -188,13 +188,6 @@ - foomatic-db/*/*.xml \ - foomatic-test \ - getweb.in \ -- icc2ps/*.[ch] \ -- icc2ps/*.1in \ -- icc2ps/Makefile \ -- icc2ps/AUTHORS \ -- icc2ps/COPYING \ -- icc2ps/README \ -- icc2ps/README.foo2zjs \ - osx-hotplug/Makefile \ - osx-hotplug/*.m \ - osx-hotplug/*.1in \ -@@ -376,7 +369,7 @@ - # The usual build rules - # - all: all-test $(PROGS) $(BINPROGS) $(SHELLS) getweb \ -- all-icc2ps all-osx-hotplug man doc \ -+ all-osx-hotplug man doc \ - all-done - - all-test: -@@ -598,7 +591,7 @@ - # - # Installation rules - # --install: all install-test install-prog install-icc2ps install-osx-hotplug \ -+install: all install-test install-prog install-osx-hotplug \ - install-extra install-crd install-foo install-ppd \ - install-gui install-desktop install-filter \ - install-man install-doc -@@ -1126,7 +1119,6 @@ - -rm -f $(MANDIR)/man1/foo2hbpl*.1 $(MANDIR)/man1/hbpldecode.1 - -rm -f $(MANDIR)/man1/gipddecode.1 - -rm -f $(MANDIR)/man1/arm2hpdl.1 $(MANDIR)/man1/usb_printerid.1 -- -rm -f $(MANDIR)/man1/foo2zjs-icc2ps.1 - -rm -rf /usr/share/foo2zjs/ - -rm -rf /usr/share/foo2hp/ - -rm -rf /usr/share/foo2oak/ -@@ -1151,7 +1143,6 @@ - -rm -f /usr/bin/hbpldecode - -rm -f /usr/bin/opldecode - -rm -f /usr/bin/rodecode -- -rm -f /usr/bin/foo2zjs-icc2ps - -rm -f /usr/bin/foo2zjs-pstops - -rm -f /usr/bin/command2foo2lava-pjl - -rm -f /usr/lib/cups/filter/command2foo2lava-pjl -@@ -1194,7 +1185,6 @@ - -rm -f *.zjs *.zm *.zc *.zc? *.zc?? *.oak *.pbm *.pksm *.cmyk - -rm -f pksm2bitcmyk - -rm -f *.icm.*.ps -- cd icc2ps; $(MAKE) $@ - cd osx-hotplug; $(MAKE) $@ - - # -@@ -1344,7 +1334,7 @@ - # - # icc2ps regression tests - # --ICC2PS=./icc2ps/foo2zjs-icc2ps -+ICC2PS=/usr/bin/psicc - icctest: - for g in *.icm; do \ - for i in 0 1 2 3; do \ -@@ -1443,7 +1433,7 @@ - # Manpage generation. No, I am not interested in "info" files or - # HTML documentation. - # --man: $(MANPAGES) man-icc2ps man-osx-hotplug -+man: $(MANPAGES) man-osx-hotplug - - $(MANPAGES): macros.man includer-man - -@@ -1510,7 +1500,6 @@ - $(INSTALL) -c -m 644 arm2hpdl.1 $(MANDIR)/man1/ - $(INSTALL) -c -m 644 usb_printerid.1 $(MANDIR)/man1/ - $(INSTALL) -c -m 644 printer-profile.1 $(MANDIR)/man1/ -- cd icc2ps; $(MAKE) install-man - ifeq ($(UNAME),Darwin) - cd osx-hotplug; $(MAKE) install-man - endif -@@ -1531,10 +1520,9 @@ - - GROFF=/usr/local/test/bin/groff - GROFF=groff --manual.pdf: $(MANPAGES) icc2ps/foo2zjs-icc2ps.1 osx-hotplug/osx-hplj-hotplug.1 -+manual.pdf: $(MANPAGES) osx-hotplug/osx-hplj-hotplug.1 - -$(GROFF) -t -man \ - `ls $(MANPAGES) \ -- icc2ps/foo2zjs-icc2ps.1 \ - osx-hotplug/osx-hplj-hotplug.1 \ - | sort` \ - | ps2pdf - $@ diff -Nru foo2zjs-20160313dfsg0/debian/patches/20-system-libjbig.patch foo2zjs-20160902dfsg0/debian/patches/20-system-libjbig.patch --- foo2zjs-20160313dfsg0/debian/patches/20-system-libjbig.patch 2016-04-25 19:56:31.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/20-system-libjbig.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -Description: Use the Debian-provided libjbig. -Author: Didier Raboud -Last-Update: 2012-04-26 - ---- a/Makefile -+++ b/Makefile -@@ -125,10 +125,6 @@ - Makefile \ - foo2zjs.c \ - foo2zjs.1in \ -- jbig.c \ -- jbig.h \ -- jbig_ar.c \ -- jbig_ar.h \ - zjsdecode.c \ - zjsdecode.1in \ - zjs.h \ -@@ -274,7 +270,7 @@ - MANPAGES+= gipddecode.1 - MANPAGES+= foo2zjs-pstops.1 arm2hpdl.1 usb_printerid.1 - MANPAGES+= printer-profile.1 --LIBJBG = jbig.o jbig_ar.o -+LIBJBG = -ljbig - BINPROGS= - - ifeq ($(UNAME),Linux) diff -Nru foo2zjs-20160313dfsg0/debian/patches/20-system-liblcms.patch foo2zjs-20160902dfsg0/debian/patches/20-system-liblcms.patch --- foo2zjs-20160313dfsg0/debian/patches/20-system-liblcms.patch 2016-04-25 19:56:31.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/20-system-liblcms.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -Description: Link against system liblcms1 -Author: Didier Raboud -Last-Update: 2014-08-01 ---- a/icc2ps/Makefile -+++ b/icc2ps/Makefile -@@ -6,9 +6,7 @@ - MANDIR=$(PREFIX)/share/man - - SRC= icc2ps.c xgetopt.c --LIB= cmscam97.c cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \ -- cmslut.c cmsmatsh.c cmsmtrx.c cmsnamed.c cmspack.c cmspcs.c cmsps2.c \ -- cmssamp.c cmswtpnt.c cmsxform.c cmsio0.c cmsvirt.c -+LIB= -llcms - CFLAGS+= -O3 - - # _XOPEN_SOURCE is required for swab() but undefines strcasecmp(), so add _GNU_SOURCE as well: -@@ -55,7 +53,7 @@ - clean: - rm -f *.o foo2zjs-icc2ps *.1 - --foo2zjs-icc2ps: icc34.h lcms.h -+foo2zjs-icc2ps: icc34.h - - regress: all - @./foo2zjs-icc2ps a b 2>&1 | grep "little cms P" diff -Nru foo2zjs-20160313dfsg0/debian/patches/30-udev-rules.patch foo2zjs-20160902dfsg0/debian/patches/30-udev-rules.patch --- foo2zjs-20160313dfsg0/debian/patches/30-udev-rules.patch 2016-04-25 19:56:31.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/30-udev-rules.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,81 +0,0 @@ -Description: Correct the udev rules: - a) remove KERNEL=="lp*", as usblp is now blacklisted by CUPS (it will work without CUPS too). - b) Replace paths: /etc/hotplug/usb/ by no path, as the binaries are shipped in /lib/udev/ - c) Drop the MODE specification - d) Add ACTION=="ADD", otherwise the firmware script runs after unplugging as well -Author: Luca Capello -Author: Didier Raboud -Author: Peter De Wachter -Last-Update: 2014-01-02 ---- a/hplj10xx.rules -+++ b/hplj10xx.rules -@@ -2,38 +2,42 @@ - # hplj10xx.rules.old: udev equal or after 1.30 - # - #Own udev rule for HP Laserjet 1000 --KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ -- ATTRS{product}=="hp LaserJet 1000", NAME="usb/%k", \ -- SYMLINK+="hplj1000-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1000" -+ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ -+ ATTRS{product}=="hp LaserJet 1000", \ -+ SYMLINK+="hplj1000-%n", RUN+="hplj1000" - #Own udev rule for HP Laserjet 1005 --KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ -- ATTRS{product}=="hp LaserJet 1005 series", NAME="usb/%k", \ -- SYMLINK+="hplj1005-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1005" -+ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ -+ ATTRS{product}=="hp LaserJet 1005 series", \ -+ SYMLINK+="hplj1005-%n", RUN+="hplj1005" - #Own udev rule for HP Laserjet 1018 --KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ -- ATTRS{product}=="HP LaserJet 1018", NAME="usb/%k", \ -- SYMLINK+="hplj1018-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1018" -+ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ -+ ATTRS{product}=="HP LaserJet 1018", \ -+ SYMLINK+="hplj1018-%n", RUN+="hplj1018" - #Own udev rule for HP Laserjet 1020 --KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ -- ATTRS{product}=="HP LaserJet 1020", NAME="usb/%k", \ -- SYMLINK+="hplj1020-%n", MODE="0666", RUN+="/etc/hotplug/usb/hplj1020" -+ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ -+ ATTRS{product}=="HP LaserJet 1020", \ -+ SYMLINK+="hplj1020-%n", RUN+="hplj1020" - #Own udev rule for HP Laserjet P1005 --KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ -- ATTRS{product}=="HP LaserJet P1005", NAME="usb/%k", \ -- SYMLINK+="hpljP1005-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1005" -+ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ -+ ATTRS{product}=="HP LaserJet P1005", \ -+ SYMLINK+="hpljP1005-%n", RUN+="hpljP1005" - #Own udev rule for HP Laserjet P1006 --KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ -- ATTRS{product}=="HP LaserJet P1006", NAME="usb/%k", \ -- SYMLINK+="hpljP1006-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1006" -+ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ -+ ATTRS{product}=="HP LaserJet P1006", \ -+ SYMLINK+="hpljP1006-%n", RUN+="hpljP1006" - #Own udev rule for HP Laserjet P1007 --KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ -- ATTRS{product}=="HP LaserJet P1007", NAME="usb/%k", \ -- SYMLINK+="hpljP1007-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1007" -+ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ -+ ATTRS{product}=="HP LaserJet P1007", \ -+ SYMLINK+="hpljP1007-%n", RUN+="hpljP1007" - #Own udev rule for HP Laserjet P1008 --KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ -- ATTRS{product}=="HP LaserJet P1008", NAME="usb/%k", \ -- SYMLINK+="hpljP1008-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1008" -+ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ -+ ATTRS{product}=="HP LaserJet P1008", \ -+ SYMLINK+="hpljP1008-%n", RUN+="hpljP1008" - #Own udev rule for HP Laserjet P1505 --KERNEL=="lp*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ -- ATTRS{product}=="HP LaserJet P1505", NAME="usb/%k", \ -- SYMLINK+="hpljP1505-%n", MODE="0666", RUN+="/etc/hotplug/usb/hpljP1505" -+ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ -+ ATTRS{product}=="HP LaserJet P1505", \ -+ SYMLINK+="hpljP1505-%n", RUN+="hpljP1505" -+#Own udev rule for HP Laserjet P1505n -+ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ -+ ATTRS{product}=="HP LaserJet P1505n", \ -+ SYMLINK+="hpljP1505n-%n", RUN+="hpljP1505n" diff -Nru foo2zjs-20160313dfsg0/debian/patches/40-desktop-direct-launch.patch foo2zjs-20160902dfsg0/debian/patches/40-desktop-direct-launch.patch --- foo2zjs-20160313dfsg0/debian/patches/40-desktop-direct-launch.patch 2016-04-25 19:56:31.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/40-desktop-direct-launch.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -Description: Launch the _gui.tcl directly (instead of launching wish - outside of it), avoids a lintian warning. -Author: Didier Raboud -Last-Update: 2011-07-24 ---- a/hplj1020.desktop -+++ b/hplj1020.desktop -@@ -2,7 +2,7 @@ - Name=Reactivate HP LaserJet 1018/1020 after reloading paper - Comment=Click the button in this program when your printer ran out of paper and you have refilled the paper - # zExec=usb_printerid /dev/usb/lp0 --Exec=wish /usr/share/foo2zjs/hplj10xx_gui.tcl -+Exec=/usr/share/foo2zjs/hplj10xx_gui.tcl - Terminal=false - Type=Application - Icon=/usr/share/pixmaps/hplj1020_icon.png diff -Nru foo2zjs-20160313dfsg0/debian/patches/40-desktop-encoding-correction.patch foo2zjs-20160902dfsg0/debian/patches/40-desktop-encoding-correction.patch --- foo2zjs-20160313dfsg0/debian/patches/40-desktop-encoding-correction.patch 2016-04-25 19:56:31.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/40-desktop-encoding-correction.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -Remove the now useless Encoding key ---- a/hplj1020.desktop -+++ b/hplj1020.desktop -@@ -1,5 +1,4 @@ - [Desktop Entry] --Encoding=UTF-8 - Name=Reactivate HP LaserJet 1018/1020 after reloading paper - Comment=Click the button in this program when your printer ran out of paper and you have refilled the paper - # zExec=usb_printerid /dev/usb/lp0 diff -Nru foo2zjs-20160313dfsg0/debian/patches/40-desktop-nodisplay-true.patch foo2zjs-20160902dfsg0/debian/patches/40-desktop-nodisplay-true.patch --- foo2zjs-20160313dfsg0/debian/patches/40-desktop-nodisplay-true.patch 2016-04-25 19:56:31.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/40-desktop-nodisplay-true.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -Do not display the icon by default (see #579154) ---- a/hplj1020.desktop -+++ b/hplj1020.desktop -@@ -9,3 +9,4 @@ - StartupNotify=true - Categories=System; - X-Desktop-File-Install-Version=0.10 -+NoDisplay=true diff -Nru foo2zjs-20160313dfsg0/debian/patches/40-path-correction.patch foo2zjs-20160902dfsg0/debian/patches/40-path-correction.patch --- foo2zjs-20160313dfsg0/debian/patches/40-path-correction.patch 2016-04-25 19:56:31.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/40-path-correction.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -Correct the path for the usb_printerid program ---- a/hplj1000 -+++ b/hplj1000 -@@ -60,7 +60,7 @@ - # [snip] - # # Mount all other filesystems (except for NFS and /proc, which is already - # --PRINTERID=/bin/usb_printerid -+PRINTERID=`which usb_printerid` - - # - # Figure out how to log our messages diff -Nru foo2zjs-20160313dfsg0/debian/patches/60-getweb.in.patch foo2zjs-20160902dfsg0/debian/patches/60-getweb.in.patch --- foo2zjs-20160313dfsg0/debian/patches/60-getweb.in.patch 2016-04-25 19:56:31.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/60-getweb.in.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,304 +0,0 @@ -Improve getweb also for installing the firmware ---- a/getweb.in -+++ b/getweb.in -@@ -1,8 +1,10 @@ - #!/bin/sh - -+set -e -+ - # - # (c) Copyright Rick Richardson 2008 --# -+# This version has been modified by Debian - - # - # PLEASE don't remove the copyright statements. They should -@@ -12,6 +14,13 @@ - VERSION='$Id: getweb.in,v 1.114 2015/02/12 00:22:02 rick Exp $' - - WGETOPTS="--passive-ftp -q" -+ARM2HPDL="/usr/bin/arm2hpdl" -+ -+if [ $(id -ru) -ne 0 ]; then -+ echo "You need to be root" -+ exit 1 -+fi -+ - - usage() { - cat </dev/null` -+WGET=`which wget` - if [ "$SYSTEM" = Darwin -a "$WGET" = "" ] - then - WGETOPTS= -@@ -117,6 +124,18 @@ - } - fi - -+putfw() { -+ inputname=$1 -+ outputname=$2 -+ $ARM2HPDL $inputname > /usr/share/foo2zjs/firmware/$outputname -+ rm $inputname -+} -+ -+puticm() { -+ drivername=$1 -+ mv *.icm /usr/share/"$drivername"/icm/ -+} -+ - # - # Download a .EXE file from the web, unzip it, and extract the - # files we want -@@ -163,6 +182,7 @@ - #lj1488en.exe \ - #sihp1000.img - copyright "(c) Copyright Hewlett-Packard 2001" -+ putfw sihp1000.img sihp1000.dl - ;; - lj1005|1005) - gettgz \ -@@ -178,12 +198,14 @@ - http://foo2zjs.rkkda.com/firmware sihpP1005.tar.gz \ - "" - copyright "(c) Copyright Hewlett-Packard 2009" -+ putfw sihp1005.img sihp1005.dl - ;; - lj1018|1018) - gettgz \ - http://foo2zjs.rkkda.com/firmware sihp1018.tar.gz \ - "" - copyright "(c) Copyright Hewlett-Packard 2005" -+ putfw sihp1018.img sihp1018.dl - ;; - lj1020|1020) - # http://ftp.hp.com/pub/softlib/software8/COL14041/lj-39322-2/hp_LJ_1020-1022_Full_Solution.exe -@@ -191,24 +213,28 @@ - http://foo2zjs.rkkda.com/firmware sihp1020.tar.gz \ - "" - copyright "(c) Copyright Hewlett-Packard 2005" -+ putfw sihp1020.img sihp1020.dl - ;; - [pP]100[57]) - gettgz \ - http://foo2zjs.rkkda.com/firmware sihpP1005.tar.gz \ - "" - copyright "(c) Copyright Hewlett-Packard 2009" -+ putfw sihpP1005.img sihpP1005.dl - ;; - [pP]100[68]) - gettgz \ - http://foo2zjs.rkkda.com/firmware sihpP1006.tar.gz \ - "" - copyright "(c) Copyright Hewlett-Packard 2009" -+ putfw sihpP1006.img sihpP1006.dl - ;; - [pP]1505) - gettgz \ - http://foo2zjs.rkkda.com/firmware sihpP1505.tar.gz \ - "" - copyright "(c) Copyright Hewlett-Packard 2009" -+ putfw sihpP1505.img sihpP1505.dl - ;; - 2200dl|2200) - if true; then -@@ -221,6 +247,7 @@ - "*.icm" - fi - copyright "(c) Copyright Minolta-QMS 1999" -+ puticm foo2zjs - ;; - 2300dl|2300) - if true; then -@@ -236,6 +263,7 @@ - http://foo2zjs.rkkda.com/icm km2430.tar.gz \ - "" - copyright "(c) Copyright Minolta-QMS 2001" -+ puticm foo2zjs - ;; - 2300dl_fw) - # 2300DL firmware upgrade to v2.55 -@@ -264,12 +292,14 @@ - done - fi - copyright "(c) Copyright Minolta-QMS 1998" -+ puticm foo2zjs - ;; - 2430) - gettgz \ - http://foo2zjs.rkkda.com/icm km2430.tar.gz \ - "" - copyright "(c) Copyright Konica Minolta 2003" -+ puticm foo2zjs - ;; - 2530|2490|6115|2480|1600w|1680|1690|4690|110|6121) - gettgz \ -@@ -281,6 +311,7 @@ - http://foo2lava.rkkda.com/icm km-1600.tar.gz \ - "" - copyright "(c) Copyright Rick Richardson 2009. All Rights Reserved" -+ puticm foo2lava - ;; - 1500) - gettgz \ -@@ -292,12 +323,14 @@ - "" - copyright "(c) Copyright Hewlett-Packard 2003" - copyright "(c) Copyright Rick Richardson 2006. All Rights Reserved" -+ puticm foo2oak - ;; - 1025) - gettgz \ - http://foo2zjs.rkkda.com/icm hp-cp1025.tar.gz \ - "" - copyright "(c) Copyright Rick Richardson 2010. All Rights Reserved" -+ puticm foo2zjs - ;; - 1215|1600|2600*) - gettgz \ -@@ -312,6 +345,7 @@ - http://foo2hp.rkkda.com/icm hp1215.tar.gz \ - "" - copyright "(c) Copyright Rick Richardson 2008. All Rights Reserved" -+ puticm foo2hp - ;; - 300|310|315|325|360|365|2160|3160|3175|3185|6110) - gettgz \ -@@ -322,6 +356,7 @@ - http://foo2qpdl.rkkda.com/icm samclp315.tar.gz \ - "" - copyright "(c) Copyright Rick Richardson 2008. All Rights Reserved" -+ puticm foo2qpdl - ;; - 600|610) - ;; -@@ -331,6 +366,7 @@ - http://foo2slx.rkkda.com/icm lexc500.tar.gz \ - "" - copyright "(c) Copyright Lexmark 2006" -+ puticm foo2slx - ;; - - oki) -@@ -346,48 +382,56 @@ - mv "$base.ICM" "$base.icm" - done - copyright "(c) Copyright Okidata 2005, 2006" -+ puticm foo2hiperc - ;; - 301) - gettgz \ - http://foo2hiperc.rkkda.com/icm okic301.tar.gz \ - "" - copyright "(c) Copyright Okidata 2012" -+ puticm foo2hiperc - ;; - c310) - gettgz \ - http://foo2hiperc.rkkda.com/icm okic310.tar.gz \ - "" - copyright "(c) Copyright Okidata 2010" -+ puticm foo2hiperc - ;; - c511) - gettgz \ - http://foo2hiperc.rkkda.com/icm okic511.tar.gz \ - "" - copyright "(c) Copyright Okidata 2012" -+ puticm foo2hiperc - ;; - c810) - gettgz \ - http://foo2hiperc.rkkda.com/icm okic810.tar.gz \ - "" - copyright "(c) Copyright Okidata 2012" -+ puticm foo2hiperc - ;; - 3100|3200|5100|5150|5200|5250) - gettgz \ - http://foo2hiperc.rkkda.com/icm okic3200.tar.gz \ - "" - copyright "(c) Copyright Okidata 2005" -+ puticm foo2hiperc - ;; - 3300|3400|3530) - gettgz \ - http://foo2hiperc.rkkda.com/icm okic3400.tar.gz \ - "" - copyright "(c) Copyright Okidata 2006" -+ puticm foo2hiperc - ;; - 5500|5600|5800|160) - gettgz \ - http://foo2hiperc.rkkda.com/icm okic5600.tar.gz \ - "" - copyright "(c) Copyright Okidata 2006" -+ puticm foo2hiperc - ;; - - xPPD) -@@ -443,23 +487,6 @@ - # | sed -e 's/\(^\*NickName.*\)"/\1 (foo2zjs recommended)"/' - done - ;; -- update) -- url=${URLZJS} -- file=foo2zjs.tar.gz -- wget $WGETOPTS -O $file $url/$file || -- error "Couldn't download $url/$exefile" -- mv getweb getweb.old -- HERE=`pwd` -- cd .. -- tar zxf $HERE/$file -- cd $HERE -- echo "The tarball is extracted and the current directory is up to date." -- echo -e "Remove the tarball (y/n)? \c" -- read ans -- if [ "$ans" = y ]; then -- rm -f $file -- fi -- ;; - "") - usage - ;; -@@ -474,6 +501,10 @@ - usage - fi - -+OLDPWD=`pwd` -+NEWPWD=`mktemp --tmpdir --directory foo2zjs.XXXXXX` -+cd "$NEWPWD" -+ - for i in $* - do - case "$1" in -@@ -518,3 +549,6 @@ - ;; - esac - done -+ -+cd "$OLDPWD" -+rmdir "$NEWPWD" diff -Nru foo2zjs-20160313dfsg0/debian/patches/60-hplj1000.patch foo2zjs-20160902dfsg0/debian/patches/60-hplj1000.patch --- foo2zjs-20160313dfsg0/debian/patches/60-hplj1000.patch 2016-04-25 19:56:31.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/60-hplj1000.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,84 +0,0 @@ -Use the same firmware folder for all HP LJ printers ---- a/hplj1000 -+++ b/hplj1000 -@@ -90,37 +90,31 @@ - MODEL=P1005; FWMODEL=$MODEL - USB1=0x03f0 #Vendor - USB2=0x3d17 #Model -- FWDIR=/usr/share/foo2xqx/firmware - ;; - *P1006) - MODEL=P1006; FWMODEL=$MODEL - USB1=0x03f0 #Vendor - USB2=0x3e17 #Model -- FWDIR=/usr/share/foo2xqx/firmware - ;; - *P1007) - MODEL=P1007; FWMODEL=P1005 # Alias - USB1=0x03f0 #Vendor - USB2=0x4817 #Model -- FWDIR=/usr/share/foo2xqx/firmware - ;; - *P1008) - MODEL=P1008; FWMODEL=P1006 # Alias - USB1=0x03f0 #Vendor - USB2=0x4917 #Model -- FWDIR=/usr/share/foo2xqx/firmware - ;; - *P1505) - MODEL=P1505; FWMODEL=$MODEL - USB1=0x03f0 #Vendor - USB2=0x3f17 #Model -- FWDIR=/usr/share/foo2xqx/firmware - ;; - *P1505n) - MODEL=P1505n; FWMODEL=$MODEL - USB1=0x03f0 #Vendor - USB2=0x4017 #Model -- FWDIR=/usr/share/foo2xqx/firmware - ;; - *1000) - MODEL=1000; FWMODEL=$MODEL ---- a/hplj10xx.conf -+++ b/hplj10xx.conf -@@ -15,35 +15,35 @@ - attach 100 { - match "vendor" "0x03f0"; - match "product" "0x3d17"; -- action "cat /usr/share/foo2xqx/firmware/sihpP1005.dl > /dev/$device-name"; -+ action "cat /lib/firmware/hp/sihpP1005.dl > /dev/$device-name"; - }; - - # Firmware download HP LaserJet P1006 printer - attach 100 { - match "vendor" "0x03f0"; - match "product" "0x3e17"; -- action "cat /usr/share/foo2xqx/firmware/sihpP1006.dl > /dev/$device-name"; -+ action "cat /lib/firmware/hp/sihpP1006.dl > /dev/$device-name"; - }; - - # Firmware download HP LaserJet P1007 printer - attach 100 { - match "vendor" "0x03f0"; - match "product" "0x4817"; -- action "cat /usr/share/foo2xqx/firmware/sihpP1005.dl > /dev/$device-name"; -+ action "cat /lib/firmware/hp/sihpP1005.dl > /dev/$device-name"; - }; - - # Firmware download HP LaserJet P1008 printer - attach 100 { - match "vendor" "0x03f0"; - match "product" "0x4917"; -- action "cat /usr/share/foo2xqx/firmware/sihpP1006.dl > /dev/$device-name"; -+ action "cat /lib/firmware/hp/sihpP1006.dl > /dev/$device-name"; - }; - - # Firmware download HP LaserJet P1505 printer - attach 100 { - match "vendor" "0x03f0"; - match "product" "0x3f17"; -- action "cat /usr/share/foo2xqx/firmware/sihpP1505.dl > /dev/$device-name"; -+ action "cat /lib/firmware/hp/sihpP1505.dl > /dev/$device-name"; - }; - - # Firmware download HP LaserJet 1000 printer diff -Nru foo2zjs-20160313dfsg0/debian/patches/70-lib-firwmare-hp.patch foo2zjs-20160902dfsg0/debian/patches/70-lib-firwmare-hp.patch --- foo2zjs-20160313dfsg0/debian/patches/70-lib-firwmare-hp.patch 2016-04-25 19:56:31.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/70-lib-firwmare-hp.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,54 +0,0 @@ -Firmware directory is /lib/firmware/hp/ (Closes: #517957) ---- a/getweb.in -+++ b/getweb.in -@@ -127,7 +127,7 @@ - putfw() { - inputname=$1 - outputname=$2 -- $ARM2HPDL $inputname > /usr/share/foo2zjs/firmware/$outputname -+ $ARM2HPDL $inputname > /lib/firmware/hp/$outputname - rm $inputname - } - ---- a/hplj1000 -+++ b/hplj1000 -@@ -48,7 +48,7 @@ - # - # Directory to find downloadable HP firmware files sihpMMMM.dl - # --FWDIR=/usr/share/foo2zjs/firmware -+FWDIR=/lib/firmware/hp - - # - # Program used to determine USB printer id information ---- a/usb_printerid.1in -+++ b/usb_printerid.1in -@@ -26,7 +26,7 @@ - MFG:Hewlett-Packard;MDL:HP LaserJet 1020;CMD:ACL;CLS:PRINTER;\e - DES:HP LaserJet 1020; - --# cp /usr/share/foo2zjs/firmware/sihp1020.dl /dev/usb/lp0 -+# cp /lib/firmware/hp/sihp1020.dl /dev/usb/lp0 - - # usb_printerid /dev/usb/lp0 - GET_DEVICE_ID string: -@@ -37,7 +37,7 @@ - - .SH FILES - .BR /usr/bin/usb_printerid, --.BR /usr/share/foo2*/firmware/* -+.BR /lib/firmware/hp/* - .SH SEE ALSO - .BR arm2hpdl (1) - .SH "AUTHOR" ---- a/arm2hpdl.1in -+++ b/arm2hpdl.1in -@@ -31,7 +31,7 @@ - - .SH FILES - .BR /usr/bin/arm2hpdl, --.BR /usr/share/foo2*/firmware/ -+.BR /lib/firmware/hp/* - .SH SEE ALSO - .BR foo2zjs (1) - .SH "AUTHOR" diff -Nru foo2zjs-20160313dfsg0/debian/patches/70-printer-profile.patch foo2zjs-20160902dfsg0/debian/patches/70-printer-profile.patch --- foo2zjs-20160313dfsg0/debian/patches/70-printer-profile.patch 2016-04-25 19:56:31.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/70-printer-profile.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,300 +0,0 @@ -Don't delete printer-profile in clean target ---- /dev/null -+++ b/printer-profile.in -@@ -0,0 +1,296 @@ -+#!/bin/sh -+ -+PROGNAME="$0" -+ -+usage() { -+ cat <&2 -+ exit 1 -+} -+ -+debug() { -+ if [ $DEBUG -ge $1 ]; then -+ echo "`basename $PROGNAME`: $2" >&2 -+ fi -+} -+ -+# -+# Execute a command as root -+# -+root() { -+ if [ -x /usr/bin/root ]; then -+ /usr/bin/root $@ -+ else -+ su -c "$*" -+ fi -+} -+ -+# -+# trap on error -+# -+trap "exit 1" ERR -+ -+# -+# Process the options -+# -+REMPRINT=amd -+REMSCAN=mac -+REMSCAN=none -+RGB=rgb -+PATCHES=196 #Per page! -+BPP=1 -+RES= -+DEBUG=0 -+while getopts "b:r:P:S:D:h?" opt -+do -+ case $opt in -+ b) BPP="$OPTARG";; -+ r) RES="$OPTARG";; -+ P) REMPRINT="$OPTARG";; -+ S) REMSCAN="$OPTARG";; -+ D) DEBUG="$OPTARG";; -+ h|\?) usage;; -+ esac -+done -+shift `expr $OPTIND - 1` -+ -+# -+# Main Program -+# -+if [ $# -lt 2 ]; then -+ usage -+fi -+ -+MANUF="$1" -+MODEL="$2" -+if [ $# -ge 3 ]; then -+ RGB="$3" -+fi -+if [ $# -ge 4 ]; then -+ PATCHES="$4" -+fi -+INK="$5" -+ -+BPP_b="-b$BPP" -+RES_r= -+if [ "$RES" != "" ]; then -+ RES_r="-r$RES" -+fi -+ -+case "$MANUF" in -+km) -+ MANUF=km -+ case "$MODEL" in -+ *1600*) -+ FOO=foo2lava -+ WRAPPER="foo2lava-wrapper $RES_r -z2 -c -C10 -Gnone.icm" -+ OUT="root cp xxx.prn /dev/usb/lp1" -+ ;; -+ *2530*) -+ FOO=foo2lava -+ WRAPPER="foo2lava-wrapper $RES_r -z0 -c -C10 -Gnone.icm" -+ OUT="nc 192.168.1.13 9100 < xxx.prn" -+ ;; -+ *2300*) -+ FOO=foo2zjs -+ WRAPPER="foo2zjs-wrapper $RES_r -c -C10 -Gnone.icm" -+ OUT="nc 192.168.1.10 9100 < xxx.prn" -+ ;; -+ *) -+ usage -+ ;; -+ esac -+ ;; -+sam*) -+ MANUF=sam -+ FOO=foo2qpdl -+ case "$MODEL" in -+ *300*) -+ WRAPPER="foo2qpdl-wrapper $RES_r -z0 -c -C10 -Gnone.icm" -+ OUT="nc 192.168.1.11 9100 < xxx.prn" -+ ;; -+ *315*) -+ WRAPPER="foo2qpdl-wrapper $RES_r -z2 -c -C10 -Gnone.icm" -+ OUT="root cp xxx.prn /dev/usb/lp1" -+ ;; -+ *) -+ usage -+ ;; -+ esac -+ ;; -+hp*) -+ MANUF=hp -+ FOO=foo2hp -+ case "$MODEL" in -+ *2600*) -+ WRAPPER="foo2hp2600-wrapper $RES_r $BPP_b -z0 -c -C10 -Gnone.icm" -+ OUT="nc 192.168.1.12 9100 < xxx.prn" -+ ;; -+ *cp1215*) -+ WRAPPER="foo2hp2600-wrapper $RES_r $BPP_b -z1 -c -C10 -Gnone.icm" -+ OUT="root cp xxx.prn /dev/usb/lp2" -+ ;; -+ *) -+ usage -+ ;; -+ esac -+ ;; -+*) -+ usage -+ ;; -+esac -+ -+mrp="$MANUF-$MODEL-$RGB-$PATCHES" -+if [ "$INK" != "" ]; then -+ mrp="$mrp-ink$INK" -+fi -+if [ "$BPP" != "" ]; then -+ mrp="$mrp-bpp$BPP" -+fi -+if [ "$RES" != "" ]; then -+ mrp="$mrp-$RES" -+fi -+echo "$mrp" -+ -+ -+BETABIN=~/src/Argyll_V1.1.0_Beta/bin -+if [ ! -x $BETABIN/printtarg ]; then -+ error "No beta bin in $BETABIN!" -+fi -+ -+targen_opts= -+case "$RGB" in -+rgb|RGB) targen_opts="$targen_opts -d3";; -+cmyk|CMYK) targen_opts="$targen_opts -d4";; -+*) error "Parm2: Must be rgb or cmyk";; -+esac -+ -+targen_opts="$targen_opts -f$PATCHES" -+ -+if [ "$INK" != "" ]; then -+ targen_opts="$targen_opts -l$INK" -+fi -+ -+echo -+echo "******************************** targen ********************************" -+echo "targen $targen_opts $mrp" -+if ! targen $targen_opts $mrp >$mrp.err1; then -+ cat $mrp.err1 -+ exit 1 -+fi -+ -+echo -+echo "******************************* printtarg ******************************" -+echo "$BETABIN/printtarg -h -v -iCM -p Letter -R0 $mrp" -+$BETABIN/printtarg -h -v -iCM -p Letter -R0 $mrp -+ -+evince $mrp.ps & -+ -+echo -+echo "******************************* print it *******************************" -+echo "$WRAPPER" -+case "$REMPRINT" in -+''|none) -+ $WRAPPER <$mrp.ps >$mrp.prn -+ ;; -+*) -+ ssh $REMPRINT "$WRAPPER" <$mrp.ps >$mrp.prn -+ ;; -+esac -+ls -l $mrp.prn -+echo -n "Print it? [y|n]? " -+read yes -+case "$yes" in -+y|Y) -+ cp $mrp.prn xxx.prn -+ echo " $OUT" -+ eval $OUT -+ rm -f xxx.prn -+esac -+ -+echo -+echo "******************************* chartread ******************************" -+case "$REMSCAN" in -+''|none) -+ echo "$BETABIN/chartread $mrp" -+ $BETABIN/chartread $mrp -+ ;; -+*) -+ echo "scp $mrp.ti2 mac:" -+ scp $mrp.ti2 mac: -+ echo "$BETABIN/chartread $mrp" -+ echo -n "Scanned on remote system $REMSCAN? [y/n]? " -+ read yes -+ case "$yes" in -+ y|Y) -+ scp $REMSCAN:$mrp.ti3 . -+ ;; -+ esac -+ ;; -+esac -+ -+echo -+echo "******************************** colprof *******************************" -+case $RGB in -+rgb) -+ echo "colprof -v -D\"$mrp\" -qm -cmt -dpp $mrp" -+ colprof -v -D"$mrp" -qm -cmt -dpp $mrp -+ ;; -+cymk) -+ echo "colprof -v -D\"$mrp\" -qm -cmt -dpp -kr $mrp" -+ colprof -v -D"$mrp" -qm -cmt -dpp -kr $mrp -+ ;; -+esac -+ -+root cp $mrp.icc /usr/share/$FOO/icm/testing.icm -+echo "/usr/share/$FOO/icm/testing.icm created!" -+ls -l /usr/share/$FOO/icm/ diff -Nru foo2zjs-20160313dfsg0/debian/patches/90-manpages.patch foo2zjs-20160902dfsg0/debian/patches/90-manpages.patch --- foo2zjs-20160313dfsg0/debian/patches/90-manpages.patch 2016-04-25 19:56:31.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/90-manpages.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,1450 +0,0 @@ -Description: Fixes errors and hyphen-as-minus in manpages -Last-Update: 2014-06-05 ---- a/foo2hiperc.1in -+++ b/foo2hiperc.1in -@@ -11,13 +11,13 @@ - HIPERC printer stream - .SH SYNOPSIS - .B foo2hiperc --.RI [ options "] <" pbmraw-file " >" hiperc-file -+.RI [ options "] <" pbmraw\-file " >" hiperc\-file - .sp 1 - .B foo2hiperc --.RI [ options "] <" bitcmyk-file " >" hiperc-file -+.RI [ options "] <" bitcmyk\-file " >" hiperc\-file - .sp 1 - .B foo2hiperc --.RI [ options "] <" pksmraw-file " >" hiperc-file -+.RI [ options "] <" pksmraw\-file " >" hiperc\-file - .SH DESCRIPTION - .B foo2hiperc - converts Ghostscript pbmraw, bitcmyk, or pksmraw output formats to monochrome -@@ -63,7 +63,7 @@ - box; - | n l | n l. - 1 A4 2 letter --3 legal - - -+3 legal \- \- - 5 A5 6 B5jis - 7 A6 8 env Monarch - 9 env DL 10 env C5 -@@ -108,7 +108,7 @@ - lower right corner, in pixels [0x0]. - .TP - .BI \-L\0 mask --Send logical clipping amounts implied by -u/-l in the HIPERC stream [3]. -+Send logical clipping amounts implied by \-u/-l in the HIPERC stream [3]. - .TS - l l. - 0 don't send any logical clipping amounts -@@ -147,10 +147,10 @@ - - .RS - .nf --gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ -- -sPAPERSIZE=letter -r600x600 -sDEVICE=pbmraw \ -- -sOutputFile=- - < testpage.ps \ --| foo2hiperc -r600x600 -g5100x6600 -p0 >testpage.zm -+gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ -+ \-sPAPERSIZE=letter \-r600x600 \-sDEVICE=pbmraw \ -+ \-sOutputFile=- \- < testpage.ps \ -+| foo2hiperc \-r600x600 \-g5100x6600 \-p0 >testpage.zm - .fi - .RE - .P -@@ -158,10 +158,10 @@ - - .RS - .nf --gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ -- -sPAPERSIZE=letter -g5100x6600 -r600x600 -sDEVICE=bitcmyk \ -- -sOutputFile=- - < testpage.ps \ --| foo2hiperc -r600x600 -g5100x6600 -p0 >testpage.zc -+gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ -+ \-sPAPERSIZE=letter \-g5100x6600 \-r600x600 \-sDEVICE=bitcmyk \ -+ \-sOutputFile=- \- < testpage.ps \ -+| foo2hiperc \-r600x600 \-g5100x6600 \-p0 >testpage.zc - .fi - .RE - ---- a/macros.man -+++ b/macros.man -@@ -26,11 +26,11 @@ - .\} - .el \{\ - . ie !r ps4html \{\ --'\" \(br\|\s-1\f(CB\\$1\fP\s+1\|\(br\l'|0\(rn'\l'|0\(ul' -+'\" \(br\|\s\-1\f(CB\\$1\fP\s+1\|\(br\l'|0\(rn'\l'|0\(ul' - . ft CW - . nr par*bxw \w'\\$1'+.4m --\Z'\v'.25m'\D'l 0 -1m'\D'l \\n[par*bxw]u 0'\D'l 0 1m'\D'l -\\n[par*bxw]u 0''\ --\Z'\h'.2m'\s-1\\$1\s+1'\ -+\Z'\v'.25m'\D'l 0 \-1m'\D'l \\n[par*bxw]u 0'\D'l 0 1m'\D'l \-\\n[par*bxw]u 0''\ -+\Z'\h'.2m'\s\-1\\$1\s+1'\ - \h'\\n[par*bxw]u'\\$2 - . ft P - . \} -@@ -53,26 +53,26 @@ - '\" - .if n .defcolor orange rgb #ffff00 - '\" --'\" color - set the current color (ignores request with old groff) -+'\" color \- set the current color (ignores request with old groff) - '\" - .de color - .if mred \m[\\$1]\c - .. - '\" --'\" colorword - colorize a word (ignored by old groff) -+'\" colorword \- colorize a word (ignored by old groff) - '\" - .de colorword - .ie m\\$1 \m[\\$1]\\$2\mP\c - .el \\$2\c - .. - '\" --'\" colbox - colorize a word in a filled box -+'\" colbox \- colorize a word in a filled box - '\" - .de colbox - .ie mred \M[\\$2]\ - \v'+.167v'\ --\D'P 0 -0.9v \w'\\$3'u 0 0 +0.9v -\w'\\$3'u 0'\ --\v'-.167v'\ -+\D'P 0 \-0.9v \w'\\$3'u 0 0 +0.9v \-\w'\\$3'u 0'\ -+\v'\-.167v'\ - \m[\\$1]\\$3\mP\MP - .el \\$3\c - .. -@@ -94,7 +94,7 @@ - '\" pdfdest LINKNAME - '\" - .de pdfdest --.pdfmark "/Dest /\\$1 /View [/XYZ -5 PL null] /DEST" -+.pdfmark "/Dest /\\$1 /View [/XYZ \-5 PL null] /DEST" - .. - '\" - '\" pdfbookmark COUNT LINKNAME STRING -@@ -140,7 +140,7 @@ - . \} - . \} - . ds hhh \\*[rr_labels!\\n[rr_i]] --. pdfbookmark -\\n[rr_count] Link\\n[rr_i] "\\*[hhh]" -+. pdfbookmark \-\\n[rr_count] Link\\n[rr_i] "\\*[hhh]" - .\} - .. - '\" -@@ -159,7 +159,7 @@ - /Subject (\*[an-title] Manual Page) \ - /Author (Rick Richardson) \ - /Keywords (printing) \ -- /Creator (groff \n(.x.\n(.y.\n(.Y -man) \ -+ /Creator (groff \n(.x.\n(.y.\n(.Y \-man) \ - /CreationDate (\*[an-extra1]) \ - /ModDate (\*[an-extra1]) \ - /DOCINFO" ---- a/icc2ps/foo2zjs-icc2ps.1in -+++ b/icc2ps/foo2zjs-icc2ps.1in -@@ -1,16 +1,16 @@ --.TH foo2zjs-icc2ps 1 "Sun Jun 20 04:33:46 2010" "foo2zjs-icc2ps 0.0" -+.TH foo2zjs\-icc2ps 1 "Sun Jun 20 04:33:46 2010" "foo2zjs\-icc2ps 0.0" - #ifndef OLDGROFF - #include "../macros.man" - #endif - .SH NAME --foo2zjs-icc2ps - little cms PostScript converter. -+foo2zjs\-icc2ps \- little cms PostScript converter. - .SH SYNOPSIS --.B foo2zjs-icc2ps -+.B foo2zjs\-icc2ps - .RI [ options ] - .SH DESCRIPTION - lcms is a standalone CMM engine, which deals with the color management. - It implements a fast transformation between ICC profiles. --.B foo2zjs-icc2ps -+.B foo2zjs\-icc2ps - is little cms PostScript converter. - .SH COMMAND LINE OPTIONS - .TP -@@ -18,7 +18,7 @@ - Black point compensation (CRD only). - .TP - .B \-c <0,1,2> --Precision (0=LowRes, 1=Normal (default), 2=Hi-res) (CRD only) -+Precision (0=LowRes, 1=Normal (default), 2=Hi\-res) (CRD only) - .TP - .BI \-i\ profile - Input profile: Generates Color Space Array (CSA). -@@ -27,7 +27,6 @@ - Alternate way to set precision, number of CLUT points (CRD only) - .TP - .BI \-o\ profile --.p - Output profile: Generates Color Rendering Dictionary(CRD). - .TP - .B \-t <0,1,2,3> -@@ -38,17 +37,14 @@ - .SH FILES - .BR /usr/share/foo2*/icm/* - .SH SEE ALSO --.BR foo2hiperc-wrapper (1), --.BR foo2hp2600-wrapper (1), --.BR foo2lava-wrapper (1), --.BR foo2oak-wrapper (1), --.BR foo2qpdl-wrapper (1), --.BR foo2zjs-wrapper (1), -+.BR foo2hiperc\-wrapper (1), -+.BR foo2hp2600\-wrapper (1), -+.BR foo2lava\-wrapper (1), -+.BR foo2oak\-wrapper (1), -+.BR foo2qpdl\-wrapper (1), -+.BR foo2zjs\-wrapper (1), - .SH "AUTHOR" - Rick Richardson - .br - http://foo2zjs.rkkda.com/ --'/" --'/" --'/" - .em pdf_outline ---- a/foo2zjs.1in -+++ b/foo2zjs.1in -@@ -50,7 +50,7 @@ - _ - Media 2300DL 2200DL HP 1018 HP P1102 HP - \^ HP 1005 HP 1020 HP P1606 CP1025 --\^ -z0 -z0 -z1 -z2 -z3 -+\^ \-z0 \-z0 \-z1 \-z2 \-z3 - _ - standard 1 1 1 1 1 - transparency 2 2 2 2 2 -@@ -79,7 +79,7 @@ - _ - Paper MC 2300DL HP 1018 HP P1102 HP - \^ HP 1005 HP 1020 HP P1606 CP1025 --\^ -z0 -z1 -z2 -z3 -+\^ \-z0 \-z1 \-z2 \-z3 - _ - letter 1 1 1 1 - legal 5 5 5 5 -@@ -95,9 +95,11 @@ - postcard (japan) na 260 43 43 - B5iso na 259 na na - A6 na 262 70 70 --double postcard rotated na 261 82 82 -+double postcard na 261 82 82 -+ rotated \^ \^ \^ \^ - 16k 197x273 na 257 257 257 - fanfold german legal na 258 258 258 -+ legal \^ \^ \^ \^ - 16k 184x260 na na 263 263 - 16k 195x270 na na 264 264 - photo 4x6 na na na 268 -@@ -143,7 +145,7 @@ - lower right corner, in pixels [0x0]. - .TP - .BI \-L\0 mask --Send logical clipping amounts implied by -u/-l in the ZjStream [3]. -+Send logical clipping amounts implied by \-u/-l in the ZjStream [3]. - .TS - l l. - 0 don't send any logical clipping amounts -@@ -201,10 +203,10 @@ - - .RS - .nf --gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ -- -sPAPERSIZE=letter -r1200x600 -sDEVICE=pbmraw \ -- -sOutputFile=- - < testpage.ps \ --| foo2zjs -r1200x600 -g10200x6600 -p1 >testpage.zm -+gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ -+ \-sPAPERSIZE=letter \-r1200x600 \-sDEVICE=pbmraw \ -+ \-sOutputFile=- \- < testpage.ps \ -+| foo2zjs \-r1200x600 \-g10200x6600 \-p1 >testpage.zm - .fi - .RE - .P -@@ -212,10 +214,10 @@ - - .RS - .nf --gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ -- -sPAPERSIZE=letter -g10200x6600 -r1200x600 -sDEVICE=bitcmyk \ -- -sOutputFile=- - < testpage.ps \ --| foo2zjs -r1200x600 -g10200x6600 -p1 >testpage.zc -+gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ -+ \-sPAPERSIZE=letter \-g10200x6600 \-r1200x600 \-sDEVICE=bitcmyk \ -+ \-sOutputFile=- \- < testpage.ps \ -+| foo2zjs \-r1200x600 \-g10200x6600 \-p1 >testpage.zc - .fi - .RE - ---- a/foo2zjs-wrapper.1in -+++ b/foo2zjs-wrapper.1in -@@ -38,7 +38,7 @@ - 1 Photos (using m2300w CRDs) - 2 Photos and text (using m2300w CRDs) - 3 Graphics and text (using m2300w CRDs) --10 ICM color profile (using -G *.icm file) -+10 ICM color profile (using \-G *.icm file) - .TE - .TP - .BI \-d\0 duplex -@@ -55,7 +55,7 @@ - _ - Media 2300DL 2200DL HP 1018 HP P1102 HP - \^ HP 1005 HP 1020 HP P1606 CP1025 --\^ -z0 -z0 -z1 -z2 -z3 -+\^ \-z0 \-z0 \-z1 \-z2 \-z3 - _ - standard 1 1 1 1 1 - transparency 2 2 2 2 2 -@@ -84,7 +84,7 @@ - _ - Paper MC 2300DL HP 1018 HP P1102 HP - \^ HP 1005 HP 1020 HP P1606 CP1025 --\^ -z0 -z1 -z2 -z3 -+\^ \-z0 \-z1 \-z2 \-z3 - _ - letter 1 1 1 1 - legal 5 5 5 5 -@@ -100,9 +100,11 @@ - postcard (japan) na 260 43 43 - B5iso na 259 na na - A6 na 262 70 70 --double postcard rotated na 261 82 82 -+double postcard na 261 82 82 -+ rotated \^ \^ \^ \^ - 16k 197x273 na 257 257 257 --fanfold german legal na 258 258 258 -+fanfold german na 258 258 258 -+ legal \^ \^ \^ \^ - 16k 184x260 na na 263 263 - 16k 195x270 na na 264 264 - photo 4x6 na na na 268 -@@ -137,9 +139,9 @@ - Orientation used for N-up. - .TS - l l l. --Portrait -op (normal) --Landscape -ol (rotated 90 degrees anticlockwise) --Seascape -os (rotated 90 degrees clockwise) -+Portrait \-op (normal) -+Landscape \-ol (rotated 90 degrees anticlockwise) -+Seascape \-os (rotated 90 degrees clockwise) - .TE - .SS Printer Tweaking Options - These are the options used to customize the operation of \fBfoo2zjs\fP -@@ -158,13 +160,13 @@ - been tested on any other printers. - .TP - .BI \-L\0 mask --Send the logical clipping values from -u/-l in the ZjStream. -+Send the logical clipping values from \-u/-l in the ZjStream. - \fBfoo2zjs-wrapper\fP always runs Ghostscript with the ideal page dimensions, - so that the scale of the image is correct, - regardless whether or not the printer has unprintable regions. - This option is used to move the position of the clipped image - back to where it belongs on the page. The default is to send --the amount which was clipped by -u and -l, and should be -+the amount which was clipped by \-u and \-l, and should be - good in most cases. - .TS - l l. -@@ -200,7 +202,7 @@ - Color correction is currently a WORK IN PROGRESS. - .TP - .BI \-g\0 gsopts --Additional options to pass to Ghostscript, such as -g\(lq-dDITHERPPI=nnn\(rq, -+Additional options to pass to Ghostscript, such as \-g\(lq-dDITHERPPI=nnn\(rq, - etc. This option may appear more than once. - .TP - .BI \-G\0 profile.icm -@@ -245,7 +247,7 @@ - .nf - foo2zjs-wrapper testpage.ps > testpage.zm - zjsdecode < testpage.zm --lpr -P raw testpage.zm -+lpr \-P raw testpage.zm - .fi - .RE - .P -@@ -253,7 +255,7 @@ - - .RS - .nf --foo2zjs-wrapper -c testpage.ps > testpage.zc -+foo2zjs-wrapper \-c testpage.ps > testpage.zc - .fi - .RE - ---- a/foo2hbpl2-wrapper.1in -+++ b/foo2hbpl2-wrapper.1in -@@ -42,7 +42,7 @@ - Color correction mode [0]. - .TS - n l . --10 ICM color profile (using -G *.icm file) -+10 ICM color profile (using \-G *.icm file) - .TE - .TP - .BI \-d\0 duplex -@@ -121,9 +121,9 @@ - Orientation used for N-up. - .TS - l l l. --Portrait -op (normal) --Landscape -ol (rotated 90 degrees anticlockwise) --Seascape -os (rotated 90 degrees clockwise) -+Portrait \-op (normal) -+Landscape \-ol (rotated 90 degrees anticlockwise) -+Seascape \-os (rotated 90 degrees clockwise) - .TE - .SS Printer Tweaking Options - These are the options used to customize the operation of \fBfoo2hbpl2\fP -@@ -142,13 +142,13 @@ - been tested on any other printers. - .TP - .BI \-L\0 mask --Send the logical clipping values from -u/-l in the ZjStream. -+Send the logical clipping values from \-u/-l in the ZjStream. - \fBfoo2hbpl2-wrapper\fP always runs Ghostscript with the ideal page dimensions, - so that the scale of the image is correct, - regardless whether or not the printer has unprintable regions. - This option is used to move the position of the clipped image - back to where it belongs on the page. The default is to send --the amount which was clipped by -u and -l, and should be -+the amount which was clipped by \-u and \-l, and should be - good in most cases. - .TS - l l. -@@ -174,7 +174,7 @@ - Color correction is currently a WORK IN PROGRESS. - .TP - .BI \-g\0 gsopts --Additional options to pass to Ghostscript, such as -g\(lq-dDITHERPPI=nnn\(rq, -+Additional options to pass to Ghostscript, such as \-g\(lq-dDITHERPPI=nnn\(rq, - etc. This option may appear more than once. - .TP - .BI \-G\0 profile.icm -@@ -219,7 +219,7 @@ - .nf - foo2hbpl2-wrapper testpage.ps > testpage.prn - hbpl2decode < testpage.prn --lpr -P raw testpage.prn -+lpr \-P raw testpage.prn - .fi - .RE - .P -@@ -227,7 +227,7 @@ - - .RS - .nf --foo2hbpl2-wrapper -c testpage.ps > testpage.prn -+foo2hbpl2-wrapper \-c testpage.ps > testpage.prn - .fi - .RE - ---- a/foo2hbpl2.1in -+++ b/foo2hbpl2.1in -@@ -128,7 +128,7 @@ - lower right corner, in pixels [0x0]. - .TP - .BI \-L\0 mask --Send logical clipping amounts implied by -u/-l in the ZjStream [3]. -+Send logical clipping amounts implied by \-u/-l in the ZjStream [3]. - .TS - l l. - 0 don't send any logical clipping amounts -@@ -176,10 +176,10 @@ - - .RS - .nf --gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ -- -sPAPERSIZE=letter -r1200x600 -sDEVICE=pbmraw \ -- -sOutputFile=- - < testpage.ps \ --| foo2hbpl2 -r1200x600 -g10200x6600 -p1 >testpage.zm -+gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ -+ \-sPAPERSIZE=letter \-r1200x600 \-sDEVICE=pbmraw \ -+ \-sOutputFile=- \- < testpage.ps \ -+| foo2hbpl2 \-r1200x600 \-g10200x6600 \-p1 >testpage.zm - .fi - .RE - .P -@@ -187,10 +187,10 @@ - - .RS - .nf --gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ -- -sPAPERSIZE=letter -g10200x6600 -r1200x600 -sDEVICE=bitcmyk \ -- -sOutputFile=- - < testpage.ps \ --| foo2hbpl2 -r1200x600 -g10200x6600 -p1 >testpage.zc -+gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ -+ \-sPAPERSIZE=letter \-g10200x6600 \-r1200x600 \-sDEVICE=bitcmyk \ -+ \-sOutputFile=- \- < testpage.ps \ -+| foo2hbpl2 \-r1200x600 \-g10200x6600 \-p1 >testpage.zc - .fi - .RE - ---- a/foo2hiperc-wrapper.1in -+++ b/foo2hiperc-wrapper.1in -@@ -37,7 +37,7 @@ - Color correction mode [0]. - .TS - n l . --10 ICM color profile (using -G *.icm file) -+10 ICM color profile (using \-G *.icm file) - .TE - .TP - .BI \-d\0 duplex -@@ -66,7 +66,7 @@ - box; - | n l | n l. - 1 A4 2 letter --3 legal - - -+3 legal \- \- - 5 A5 6 B5jis - 7 A6 8 env Monarch - 9 env DL 10 env C5 -@@ -100,9 +100,9 @@ - Orientation used for N-up. - .TS - l l l. --Portrait -op (normal) --Landscape -ol (rotated 90 degrees anticlockwise) --Seascape -os (rotated 90 degrees clockwise) -+Portrait \-op (normal) -+Landscape \-ol (rotated 90 degrees anticlockwise) -+Seascape \-os (rotated 90 degrees clockwise) - .TE - .SS Printer Tweaking Options - These are the options used to customize the operation of \fBfoo2hiperc\fP -@@ -117,13 +117,13 @@ - lower right corner, in pixels [varies with paper size]. - .TP - .BI \-L\0 mask --Send the logical clipping values from -u/-l in the HIPERC stream. -+Send the logical clipping values from \-u/-l in the HIPERC stream. - \fBfoo2hiperc-wrapper\fP always runs Ghostscript with the ideal page dimensions, - so that the scale of the image is correct, - regardless whether or not the printer has unprintable regions. - This option is used to move the position of the clipped image - back to where it belongs on the page. The default is to send --the amount which was clipped by -u and -l, and should be -+the amount which was clipped by \-u and \-l, and should be - good in most cases. - .TS - l l. -@@ -145,7 +145,7 @@ - Color correction is currently a WORK IN PROGRESS. - .TP - .BI \-g\0 gsopts --Additional options to pass to Ghostscript, such as -g\(lq-dDITHERPPI=nnn\(rq, -+Additional options to pass to Ghostscript, such as \-g\(lq-dDITHERPPI=nnn\(rq, - etc. This option may appear more than once. - .TP - .BI \-G\0 profile.icm -@@ -198,7 +198,7 @@ - - .RS - .nf --foo2hiperc-wrapper -c testpage.ps > testpage.hc -+foo2hiperc-wrapper \-c testpage.ps > testpage.hc - .fi - .RE - ---- a/foo2hp.1in -+++ b/foo2hp.1in -@@ -123,7 +123,7 @@ - lower right corner, in pixels [0x0]. - .TP - .BI \-L\0 mask --Send logical clipping amounts implied by -u/-l in the ZjStream [3]. -+Send logical clipping amounts implied by \-u/-l in the ZjStream [3]. - .TS - l l. - 0 don't send any logical clipping amounts -@@ -171,10 +171,10 @@ - - .RS - .nf --gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ -- -sPAPERSIZE=letter -r600x600 -sDEVICE=pbmraw \ -- -sOutputFile=- - < testpage.ps \ --| foo2hp -r600x600 -g5100x6600 -p1 >testpage.zm -+gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ -+ \-sPAPERSIZE=letter \-r600x600 \-sDEVICE=pbmraw \ -+ \-sOutputFile=- \- < testpage.ps \ -+| foo2hp \-r600x600 \-g5100x6600 \-p1 >testpage.zm - .fi - .RE - .P -@@ -182,10 +182,10 @@ - - .RS - .nf --gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ -- -sPAPERSIZE=letter -g5100x6600 -r600x600 -sDEVICE=bitcmyk \ -- -sOutputFile=- - < testpage.ps \ --| foo2hp -r600x600 -g5100x6600 -p1 >testpage.zc -+gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ -+ \-sPAPERSIZE=letter \-g5100x6600 \-r600x600 \-sDEVICE=bitcmyk \ -+ \-sOutputFile=- \- < testpage.ps \ -+| foo2hp \-r600x600 \-g5100x6600 \-p1 >testpage.zc - .fi - .RE - ---- a/foo2hp2600-wrapper.1in -+++ b/foo2hp2600-wrapper.1in -@@ -107,9 +107,9 @@ - Orientation used for N-up. - .TS - l l l. --Portrait -op (normal) --Landscape -ol (rotated 90 degrees anticlockwise) --Seascape -os (rotated 90 degrees clockwise) -+Portrait \-op (normal) -+Landscape \-ol (rotated 90 degrees anticlockwise) -+Seascape \-os (rotated 90 degrees clockwise) - .TE - .SS Printer Tweaking Options - These are the options used to customize the operation of \fBfoo2hp\fP -@@ -128,13 +128,13 @@ - been tested on any other printers. - .TP - .BI \-L\0 mask --Send the logical clipping values from -u/-l in the ZjStream. -+Send the logical clipping values from \-u/-l in the ZjStream. - \fBfoo2hp2600-wrapper\fP always runs Ghostscript with the ideal page dimensions, - so that the scale of the image is correct, - regardless whether or not the printer has unprintable regions. - This option is used to move the position of the clipped image - back to where it belongs on the page. The default is to send --the amount which was clipped by -u and -l, and should be -+the amount which was clipped by \-u and \-l, and should be - good in most cases. - .TS - l l. -@@ -147,7 +147,7 @@ - .BI \-O\0 parm=val - Alignment of CMYK. \fIparm\fP is c, m, y, or k. - \fIval\fP is in rows. Multiple options are allowed. --The default is "-Oc=0 -Om=0 -Oy=0 -Ok=0". -+The default is "\-Oc=0 \-Om=0 \-Oy=0 \-Ok=0". - .TP - .BI \-P - Do not send START_PLANE codes on monochrome output. May be -@@ -168,7 +168,7 @@ - Color correction is currently a WORK IN PROGRESS. - .TP - .BI \-g\0 gsopts --Additional options to pass to Ghostscript, such as -g\(lq-dDITHERPPI=nnn\(rq, -+Additional options to pass to Ghostscript, such as \-g\(lq-dDITHERPPI=nnn\(rq, - etc. This option may appear more than once. - .TP - .BI \-G\0 profile.icm -@@ -214,7 +214,7 @@ - .nf - foo2hp2600-wrapper testpage.ps > testpage.zm - zjsdecode < testpage.zm --lpr -P raw testpage.zm -+lpr \-P raw testpage.zm - .fi - .RE - .P -@@ -222,7 +222,7 @@ - - .RS - .nf --foo2hp2600-wrapper -c testpage.ps > testpage.zc -+foo2hp2600-wrapper \-c testpage.ps > testpage.zc - .fi - .RE - ---- a/foo2lava-wrapper.1in -+++ b/foo2lava-wrapper.1in -@@ -42,7 +42,7 @@ - 1 Photos (using m2300w CRDs) - 2 Photos and text (using m2300w CRDs) - 3 Graphics and text (using m2300w CRDs) --10 ICM color profile (using -G *.icm file) -+10 ICM color profile (using \-G *.icm file) - .TE - .TP - .BI \-d\0 duplex -@@ -108,9 +108,9 @@ - Orientation used for N-up. - .TS - l l l. --Portrait -op (normal) --Landscape -ol (rotated 90 degrees anticlockwise) --Seascape -os (rotated 90 degrees clockwise) -+Portrait \-op (normal) -+Landscape \-ol (rotated 90 degrees anticlockwise) -+Seascape \-os (rotated 90 degrees clockwise) - .TE - .SS Printer Tweaking Options - These are the options used to customize the operation of \fBfoo2lava\fP -@@ -129,13 +129,13 @@ - been tested on any other printers. - .TP - .BI \-L\0 mask --Send the logical clipping values from -u/-l in the LAVAFLOW stream. -+Send the logical clipping values from \-u/-l in the LAVAFLOW stream. - \fBfoo2lava-wrapper\fP always runs Ghostscript with the ideal page dimensions, - so that the scale of the image is correct, - regardless whether or not the printer has unprintable regions. - This option is used to move the position of the clipped image - back to where it belongs on the page. The default is to send --the amount which was clipped by -u and -l, and should be -+the amount which was clipped by \-u and \-l, and should be - good in most cases. - .TS - l l. -@@ -162,7 +162,7 @@ - Color correction is currently a WORK IN PROGRESS. - .TP - .BI \-g\0 gsopts --Additional options to pass to Ghostscript, such as -g\(lq-dDITHERPPI=nnn\(rq, -+Additional options to pass to Ghostscript, such as \-g\(lq-dDITHERPPI=nnn\(rq, - etc. This option may appear more than once. - .TP - .BI \-G\0 profile.icm -@@ -207,7 +207,7 @@ - .nf - foo2lava-wrapper testpage.ps > testpage.zm - lavadecode < testpage.zm --lpr -P raw testpage.zm -+lpr \-P raw testpage.zm - .fi - .RE - .P -@@ -215,7 +215,7 @@ - - .RS - .nf --foo2lava-wrapper -c testpage.ps > testpage.zc -+foo2lava-wrapper \-c testpage.ps > testpage.zc - .fi - .RE - ---- a/foo2lava.1in -+++ b/foo2lava.1in -@@ -111,7 +111,7 @@ - lower right corner, in pixels [0x0]. - .TP - .BI \-L\0 mask --Send logical clipping amounts implied by -u/-l in the LAVAFLOW stream [3]. -+Send logical clipping amounts implied by \-u/-l in the LAVAFLOW stream [3]. - .TS - l l. - 0 don't send any logical clipping amounts -@@ -160,10 +160,10 @@ - - .RS - .nf --gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ -- -sPAPERSIZE=letter -r1200x600 -sDEVICE=pbmraw \ -- -sOutputFile=- - < testpage.ps \ --| foo2lava -r1200x600 -g10200x6600 -p1 >testpage.zm -+gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ -+ \-sPAPERSIZE=letter \-r1200x600 \-sDEVICE=pbmraw \ -+ \-sOutputFile=- \- < testpage.ps \ -+| foo2lava \-r1200x600 \-g10200x6600 \-p1 >testpage.zm - .fi - .RE - .P -@@ -171,10 +171,10 @@ - - .RS - .nf --gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ -- -sPAPERSIZE=letter -g10200x6600 -r1200x600 -sDEVICE=bitcmyk \ -- -sOutputFile=- - < testpage.ps \ --| foo2lava -r1200x600 -g10200x6600 -p1 >testpage.zc -+gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ -+ \-sPAPERSIZE=letter \-g10200x6600 \-r1200x600 \-sDEVICE=bitcmyk \ -+ \-sOutputFile=- \- < testpage.ps \ -+| foo2lava \-r1200x600 \-g10200x6600 \-p1 >testpage.zc - .fi - .RE - ---- a/foo2oak-wrapper.1in -+++ b/foo2oak-wrapper.1in -@@ -49,7 +49,7 @@ - l n n. - _ - Media HP CLJ 1500 KM-1635 -- -z0 -z1 -+ \-z0 \-z1 - _ - autoselect 0 0 - plain 1 1 -@@ -110,9 +110,9 @@ - Orientation used for N-up. - .TS - l l l. --Portrait -op (normal) --Landscape -ol (rotated 90 degrees anticlockwise) --Seascape -os (rotated 90 degrees clockwise) -+Portrait \-op (normal) -+Landscape \-ol (rotated 90 degrees anticlockwise) -+Seascape \-os (rotated 90 degrees clockwise) - .TE - .SS Printer Tweaking Options - These are the options used to customize the operation of \fBfoo2oak\fP -@@ -131,13 +131,13 @@ - been tested on any other printers. - .TP - .BI \-L\0 mask --Send the logical clipping values from -u/-l in the OAKT stream. -+Send the logical clipping values from \-u/-l in the OAKT stream. - \fBfoo2oak-wrapper\fP always runs Ghostscript with the ideal page dimensions, - so that the scale of the image is correct, - regardless whether or not the printer has unprintable regions. - This option is used to move the position of the clipped image - back to where it belongs on the page. The default is to send --the amount which was clipped by -u and -l, and should be -+the amount which was clipped by \-u and \-l, and should be - good in most cases. - .TS - l l. -@@ -155,7 +155,7 @@ - Color correction is currently a WORK IN PROGRESS. - .TP - .BI \-g\0 gsopts --Additional options to pass to Ghostscript, such as -g\(lq-dDITHERPPI=nnn\(rq, -+Additional options to pass to Ghostscript, such as \-g\(lq-dDITHERPPI=nnn\(rq, - etc. This option may appear more than once. - .TP - .BI \-G\0 profile.icm -@@ -200,7 +200,7 @@ - .nf - foo2oak-wrapper testpage.ps > testpage.oak - oakdecode < testpage.oak --lpr -P raw testpage.oak -+lpr \-P raw testpage.oak - .fi - .RE - .P -@@ -208,7 +208,7 @@ - - .RS - .nf --foo2oak-wrapper -c testpage.ps > testpage.oak -+foo2oak-wrapper \-c testpage.ps > testpage.oak - .fi - .RE - ---- a/foo2oak.1in -+++ b/foo2oak.1in -@@ -122,7 +122,7 @@ - lower right corner, in pixels [0x0]. - .TP - .BI \-L\0 mask --Send logical clipping amounts implied by -u/-l in the OAKT stream [3]. -+Send logical clipping amounts implied by \-u/-l in the OAKT stream [3]. - .TS - l l. - 0 don't send any logical clipping amounts -@@ -167,10 +167,10 @@ - - .RS - .nf --gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ -- -sPAPERSIZE=letter -r600x600 -sDEVICE=pbmraw \ -- -sOutputFile=- - < testpage.ps \ --| foo2oak -r600x600 -g5100x6600 -p1 >testpage.oak -+gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ -+ \-sPAPERSIZE=letter \-r600x600 \-sDEVICE=pbmraw \ -+ \-sOutputFile=- \- < testpage.ps \ -+| foo2oak \-r600x600 \-g5100x6600 \-p1 >testpage.oak - .fi - .RE - .P -@@ -178,10 +178,10 @@ - - .RS - .nf --gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ -- -sPAPERSIZE=letter -g5100x6600 -r600x600 -sDEVICE=bitcmyk \ -- -sOutputFile=- - < testpage.ps \ --| foo2oak -r600x600 -g5100x6600 -p1 >testpage.oak -+gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ -+ \-sPAPERSIZE=letter \-g5100x6600 \-r600x600 \-sDEVICE=bitcmyk \ -+ \-sOutputFile=- \- < testpage.ps \ -+| foo2oak \-r600x600 \-g5100x6600 \-p1 >testpage.oak - .fi - .RE - ---- a/foo2qpdl-wrapper.1in -+++ b/foo2qpdl-wrapper.1in -@@ -39,7 +39,7 @@ - .TS - n l . - 1 CRD --10 ICM color profile (using -G *.icm file) -+10 ICM color profile (using \-G *.icm file) - .TE - .TP - .BI \-d\0 duplex -@@ -112,9 +112,9 @@ - Orientation used for N-up. - .TS - l l l. --Portrait -op (normal) --Landscape -ol (rotated 90 degrees anticlockwise) --Seascape -os (rotated 90 degrees clockwise) -+Portrait \-op (normal) -+Landscape \-ol (rotated 90 degrees anticlockwise) -+Seascape \-os (rotated 90 degrees clockwise) - .TE - .SS Printer Tweaking Options - These are the options used to customize the operation of \fBfoo2qpdl\fP -@@ -129,13 +129,13 @@ - lower right corner, in pixels [varies with paper size]. - .TP - .BI \-L\0 mask --Send the logical clipping values from -u/-l in the QPDL stream. -+Send the logical clipping values from \-u/-l in the QPDL stream. - \fBfoo2qpdl-wrapper\fP always runs Ghostscript with the ideal page dimensions, - so that the scale of the image is correct, - regardless whether or not the printer has unprintable regions. - This option is used to move the position of the clipped image - back to where it belongs on the page. The default is to send --the amount which was clipped by -u and -l, and should be -+the amount which was clipped by \-u and \-l, and should be - good in most cases. - .TS - l l. -@@ -164,11 +164,11 @@ - brightness, contrast, saturation, cyan-red balance, magenta-green balance, - and yellow-blue balance. - \fIval\fP is 0 to 100. Multiple options are allowed. --The default is "-ab=50 -ac=50 -as=50 -acr=50 -amg=50 -ayb=50". --This only works when the -z3 (e.g. CLP-365) model is set! -+The default is "\-ab=50 \-ac=50 \-as=50 \-acr=50 \-amg=50 \-ayb=50". -+This only works when the \-z3 (e.g. CLP\-365) model is set! - .TP - .BI \-g\0 gsopts --Additional options to pass to Ghostscript, such as -g\(lq-dDITHERPPI=nnn\(rq, -+Additional options to pass to Ghostscript, such as \-g\(lq-dDITHERPPI=nnn\(rq, - etc. This option may appear more than once. - .TP - .BI \-G\0 profile.icm -@@ -213,7 +213,7 @@ - .nf - foo2qpdl-wrapper testpage.ps > testpage.zm - qpdldecode < testpage.zm --lpr -P raw testpage.zm -+lpr \-P raw testpage.zm - .fi - .RE - .P -@@ -221,7 +221,7 @@ - - .RS - .nf --foo2qpdl-wrapper -c testpage.ps > testpage.zc -+foo2qpdl-wrapper \-c testpage.ps > testpage.zc - .fi - .RE - ---- a/foo2qpdl.1in -+++ b/foo2qpdl.1in -@@ -114,7 +114,7 @@ - Color Adjust: brightness, contrast, saturation, cyan-red balance, - magenta-green balance, and yellow-blue balance from 0 to 100. - The default is 50,50,50,50,50,50. --This only works when the -z3 (e.g. CLP-365) model is set! -+This only works when the \-z3 (e.g. CLP\-365) model is set! - .TP - .BI \-u\0 xoff x yoff - Set the offset of the start of the printable region from the -@@ -125,7 +125,7 @@ - lower right corner, in pixels [0x0]. - .TP - .BI \-L\0 mask --Send logical clipping amounts implied by -u/-l in the QPDL stream [3]. -+Send logical clipping amounts implied by \-u/-l in the QPDL stream [3]. - .TS - l l. - 0 don't send any logical clipping amounts -@@ -172,10 +172,10 @@ - - .RS - .nf --gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ -- -sPAPERSIZE=letter -r1200x600 -sDEVICE=pbmraw \ -- -sOutputFile=- - < testpage.ps \ --| foo2qpdl -r1200x600 -g10200x6600 -p0 >testpage.zm -+gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ -+ \-sPAPERSIZE=letter \-r1200x600 \-sDEVICE=pbmraw \ -+ \-sOutputFile=- \- < testpage.ps \ -+| foo2qpdl \-r1200x600 \-g10200x6600 \-p0 >testpage.zm - .fi - .RE - .P -@@ -183,10 +183,10 @@ - - .RS - .nf --gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ -- -sPAPERSIZE=letter -g10200x6600 -r1200x600 -sDEVICE=bitcmyk \ -- -sOutputFile=- - < testpage.ps \ --| foo2qpdl -r1200x600 -g10200x6600 -p0 >testpage.zc -+gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ -+ \-sPAPERSIZE=letter \-g10200x6600 \-r1200x600 \-sDEVICE=bitcmyk \ -+ \-sOutputFile=- \- < testpage.ps \ -+| foo2qpdl \-r1200x600 \-g10200x6600 \-p0 >testpage.zc - .fi - .RE - ---- a/foo2slx-wrapper.1in -+++ b/foo2slx-wrapper.1in -@@ -83,9 +83,9 @@ - Orientation used for N-up. - .TS - l l l. --Portrait -op (normal) --Landscape -ol (rotated 90 degrees anticlockwise) --Seascape -os (rotated 90 degrees clockwise) -+Portrait \-op (normal) -+Landscape \-ol (rotated 90 degrees anticlockwise) -+Seascape \-os (rotated 90 degrees clockwise) - .TE - .SS Printer Tweaking Options - These are the options used to customize the operation of \fBfoo2slx\fP -@@ -104,13 +104,13 @@ - been tested on any other printers. - .TP - .BI \-L\0 mask --Send the logical clipping values from -u/-l in the ZjStream. -+Send the logical clipping values from \-u/-l in the ZjStream. - \fBfoo2slx-wrapper\fP always runs Ghostscript with the ideal page dimensions, - so that the scale of the image is correct, - regardless whether or not the printer has unprintable regions. - This option is used to move the position of the clipped image - back to where it belongs on the page. The default is to send --the amount which was clipped by -u and -l, and should be -+the amount which was clipped by \-u and \-l, and should be - good in most cases. - .TS - l l. -@@ -124,7 +124,7 @@ - Color correction is currently a WORK IN PROGRESS. - .TP - .BI \-g\0 gsopts --Additional options to pass to Ghostscript, such as -g\(lq-dDITHERPPI=nnn\(rq, -+Additional options to pass to Ghostscript, such as \-g\(lq-dDITHERPPI=nnn\(rq, - etc. This option may appear more than once. - .TP - .BI \-G\0 profile.icm -@@ -169,7 +169,7 @@ - .nf - foo2slx-wrapper testpage.ps > testpage.zm - slxdecode < testpage.zm --lpr -P raw testpage.zm -+lpr \-P raw testpage.zm - .fi - .RE - .P -@@ -177,7 +177,7 @@ - - .RS - .nf --foo2slx-wrapper -c testpage.ps > testpage.zc -+foo2slx-wrapper \-c testpage.ps > testpage.zc - .fi - .RE - ---- a/foo2slx.1in -+++ b/foo2slx.1in -@@ -93,7 +93,7 @@ - lower right corner, in pixels [0x0]. - .TP - .BI \-L\0 mask --Send logical clipping amounts implied by -u/-l in the ZjStream [3]. -+Send logical clipping amounts implied by \-u/-l in the ZjStream [3]. - .TS - l l. - 0 don't send any logical clipping amounts -@@ -130,10 +130,10 @@ - - .RS - .nf --gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ -- -sPAPERSIZE=letter -r1200x600 -sDEVICE=pbmraw \ -- -sOutputFile=- - < testpage.ps \ --| foo2slx -r1200x600 -g10200x6600 -p1 >testpage.zm -+gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ -+ \-sPAPERSIZE=letter \-r1200x600 \-sDEVICE=pbmraw \ -+ \-sOutputFile=- \- < testpage.ps \ -+| foo2slx \-r1200x600 \-g10200x6600 \-p1 >testpage.zm - .fi - .RE - .P -@@ -141,10 +141,10 @@ - - .RS - .nf --gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ -- -sPAPERSIZE=letter -g10200x6600 -r1200x600 -sDEVICE=bitcmyk \ -- -sOutputFile=- - < testpage.ps \ --| foo2slx -r1200x600 -g10200x6600 -p1 >testpage.zc -+gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ -+ \-sPAPERSIZE=letter \-g10200x6600 \-r1200x600 \-sDEVICE=bitcmyk \ -+ \-sOutputFile=- \- < testpage.ps \ -+| foo2slx \-r1200x600 \-g10200x6600 \-p1 >testpage.zc - .fi - .RE - ---- a/foo2xqx-wrapper.1in -+++ b/foo2xqx-wrapper.1in -@@ -100,9 +100,9 @@ - Orientation used for N-up. - .TS - l l l. --Portrait -op (normal) --Landscape -ol (rotated 90 degrees anticlockwise) --Seascape -os (rotated 90 degrees clockwise) -+Portrait \-op (normal) -+Landscape \-ol (rotated 90 degrees anticlockwise) -+Seascape \-os (rotated 90 degrees clockwise) - .TE - .SS Printer Tweaking Options - These are the options used to customize the operation of \fBfoo2xqx\fP -@@ -121,13 +121,13 @@ - been tested on any other printers. - .TP - .BI \-L\0 mask --Send the logical clipping values from -u/-l in the ZjStream. -+Send the logical clipping values from \-u/-l in the ZjStream. - \fBfoo2xqx-wrapper\fP always runs Ghostscript with the ideal page dimensions, - so that the scale of the image is correct, - regardless whether or not the printer has unprintable regions. - This option is used to move the position of the clipped image - back to where it belongs on the page. The default is to send --the amount which was clipped by -u and -l, and should be -+the amount which was clipped by \-u and \-l, and should be - good in most cases. - .TS - l l. -@@ -150,7 +150,7 @@ - .nf - foo2xqx-wrapper testpage.ps > testpage.xqx - xqxdecode < testpage.xqx --lpr -P raw testpage.xqx -+lpr \-P raw testpage.xqx - .fi - .RE - ---- a/foo2xqx.1in -+++ b/foo2xqx.1in -@@ -110,7 +110,7 @@ - lower right corner, in pixels [0x0]. - .TP - .BI \-L\0 mask --Send logical clipping amounts implied by -u/-l in the ZjStream [3]. -+Send logical clipping amounts implied by \-u/-l in the ZjStream [3]. - .TS - l l. - 0 don't send any logical clipping amounts -@@ -146,10 +146,10 @@ - - .RS - .nf --gs -q -dBATCH -dSAFER -dQUIET -dNOPAUSE \ -- -sPAPERSIZE=letter -r1200x600 -sDEVICE=pbmraw \ -- -sOutputFile=- - < testpage.ps \ --| foo2xqx -r1200x600 -g10200x6600 -p1 >testpage.zm -+gs \-q \-dBATCH \-dSAFER \-dQUIET \-dNOPAUSE \ -+ \-sPAPERSIZE=letter \-r1200x600 \-sDEVICE=pbmraw \ -+ \-sOutputFile=- \- < testpage.ps \ -+| foo2xqx \-r1200x600 \-g10200x6600 \-p1 >testpage.zm - .fi - .RE - ---- a/gipddecode.1in -+++ b/gipddecode.1in -@@ -39,7 +39,7 @@ - - .nf - .ft CW --$ gipddecode -h x500-mono.prn -+$ gipddecode \-h x500-mono.prn - 0: OFST 0 len=128 - 80: OFST 1 len=128 - 100: OFST 2 len=128 ---- a/hbpldecode.1in -+++ b/hbpldecode.1in -@@ -49,12 +49,12 @@ - - .nf - .ft CW --$ hbpldecode -h 1250c-mono.prn -+$ hbpldecode \-h 1250c-mono.prn - 0: \\033%-12345X@PJL JOB MODE=PRINTER - 1f: @PJL SET STRINGCODESET=UTF8 - 3b: @PJL COMMENT DATE=06/01/2011 - 58: @PJL COMMENT TIME=13:28:30 -- 73: @PJL COMMENT DNAME=empty - Notepad -+ 73: @PJL COMMENT DNAME=empty \- Notepad - 96: @PJL SET JOBATTR="@LUNA=rick" - b4: @PJL SET COPIES=1 - c6: @PJL SET QTY=1 -@@ -129,7 +129,7 @@ - - .nf - .ft CW --$ hbpldecode -h 6015c-color.prn -+$ hbpldecode \-h 6015c-color.prn - 0: \033%-12345X@PJL JOB NAME=PRINTER - 20: @PJL SET JOBATTR="HOST:dual.rkkda.org" - 48: @PJL SET JOBATTR="USER:rick" -@@ -155,28 +155,28 @@ - w,h=5120x6406 res=600 color=1 - mediatype=Plain(1) papersize=Letter(4) - 1cc: Cyan BIH: -- DL = 0, D = 0, P = 1, - = 0, XY = 10240 x 6406 -+ DL = 0, D = 0, P = 1, \- = 0, XY = 10240 x 6406 - L0 = 128, MX = 0, MY = 0 - Order = 0 - Options = 64 LRLTWO - 51 stripes, 0 layers, 1 planes - ...cyan data skipped... - 2ac: Magenta BIH: -- DL = 0, D = 0, P = 1, - = 0, XY = 10240 x 6406 -+ DL = 0, D = 0, P = 1, \- = 0, XY = 10240 x 6406 - L0 = 128, MX = 0, MY = 0 - Order = 0 - Options = 64 LRLTWO - 51 stripes, 0 layers, 1 planes - ...magenta data skipped... - 38c: Yellow BIH: -- DL = 0, D = 0, P = 1, - = 0, XY = 10240 x 6406 -+ DL = 0, D = 0, P = 1, \- = 0, XY = 10240 x 6406 - L0 = 128, MX = 0, MY = 0 - Order = 0 - Options = 64 LRLTWO - 51 stripes, 0 layers, 1 planes - ...yellow data skipped... - 46c: Black BIH: -- DL = 0, D = 0, P = 1, - = 0, XY = 10240 x 6406 -+ DL = 0, D = 0, P = 1, \- = 0, XY = 10240 x 6406 - L0 = 128, MX = 0, MY = 0 - Order = 0 - Options = 64 LRLTWO ---- a/hipercdecode.1in -+++ b/hipercdecode.1in -@@ -40,7 +40,7 @@ - - .nf - .ft CW --$ foo2hiperc-wrapper testpage.ps | hipercdecode -h -+$ foo2hiperc-wrapper testpage.ps | hipercdecode \-h - 0: \\033%-12345X@PJL - f: @PJL RDYMSG DISPLAY = "Unknown" - 30: @PJL SET OKIJOBACCOUNTJOB USERID="Unknown" JOBNAME="Unknown" -@@ -62,7 +62,7 @@ - 289: RECTYPE 0 (len=52,0x34 cnt=1) - 291: BLKNUM 0, nbie=1, pn=3 [black] uc=0,0, wid=4864 ud=0,100 - 2a5: BLKNUM 1 (len=20), uncompressed=1, bie: -- DL = 48, D = 48, P = 49, - = 48, XY = 4864 x 6816 -+ DL = 48, D = 48, P = 49, \- = 48, XY = 4864 x 6816 - L0 = 256, MX = 0, MY = 0 - Order = 0 - Options = 0 ---- a/lavadecode.1in -+++ b/lavadecode.1in -@@ -37,7 +37,7 @@ - - .nf - .ft CW --$ lavadecode -h < testpage.prn -+$ lavadecode \-h < testpage.prn - 0: \\033%-12345X@PJL JOB NAME="stdin" - 1f: \\033%-12345X@PJL JOB USERNAME="" - 3d: \\033%-12345X@PJL JOB TIMESTAMP="07/20/2007" -@@ -67,7 +67,7 @@ - 133: \\033*p200Y Y OFFSET: [200] - 13a: \\033*r1A [Page 1] - 13f: \\033*b20V [black] -- DL = 0, D = 0, P = 1, - = 0, XY = 9792 x 6400 -+ DL = 0, D = 0, P = 1, \- = 0, XY = 9792 x 6400 - L0 = 128, MX = 0, MY = 0 - Order = 3 ILEAVE SMID - Options = 92 LRLTWO TPDON TPBON DPON ---- a/oakdecode.1in -+++ b/oakdecode.1in -@@ -55,7 +55,7 @@ - 15 (16) (no args) - bih0 w h l0 bih5 dlen plen unk yOff P subP - 3c (64) 00010000 2176 256 256 58030020 1050 1056 000 64 3 0 -- DL = 0, D = 0, P = 1, - = 0, XY = 2176 x 256 -+ DL = 0, D = 0, P = 1, \- = 0, XY = 2176 x 256 - L0 = 256, MX = 32, MY = 0 - Order = 3 ILEAVE SMID - Options = 88 LRLTWO TPDON TPBON ---- a/opldecode.1in -+++ b/opldecode.1in -@@ -33,11 +33,11 @@ - Set Debug level [0]. - - .SH EXAMPLES --Decode an Raster Object stream file created by foo2lava-wrapper -z1. -+Decode an Raster Object stream file created by foo2lava-wrapper \-z1. - - .nf - .ft CW --$ foo2lava-wrapper -z1 testpage.ps | opldecode -h -+$ foo2lava-wrapper \-z1 testpage.ps | opldecode \-h - 0: Event=StartOfJob; - 11: OSVersion=WindowsXP; - 25: DrvVersion=2.0.1410.0; -@@ -53,7 +53,7 @@ - 11e: RasterObject.Height=6400; - 137: RasterObject.Data#20= - -- DL = 0, D = 0, P = 1, - = 0, XY = 9792 x 6400 -+ DL = 0, D = 0, P = 1, \- = 0, XY = 9792 x 6400 - L0 = 128, MX = 0, MY = 0 - Order = 3 ILEAVE SMID - Options = 92 LRLTWO TPDON TPBON DPON -@@ -66,7 +66,7 @@ - 10e4a: RasterObject.Height=6400; - 10e63: RasterObject.Data#20= - -- DL = 0, D = 0, P = 1, - = 0, XY = 9792 x 6400 -+ DL = 0, D = 0, P = 1, \- = 0, XY = 9792 x 6400 - L0 = 128, MX = 0, MY = 0 - Order = 3 ILEAVE SMID - Options = 92 LRLTWO TPDON TPBON DPON -@@ -79,7 +79,7 @@ - 25a17: RasterObject.Height=6400; - 25a30: RasterObject.Data#20= - -- DL = 0, D = 0, P = 1, - = 0, XY = 9792 x 6400 -+ DL = 0, D = 0, P = 1, \- = 0, XY = 9792 x 6400 - L0 = 128, MX = 0, MY = 0 - Order = 3 ILEAVE SMID - Options = 92 LRLTWO TPDON TPBON DPON -@@ -93,7 +93,7 @@ - 3f68c: RasterObject.Height=6400; - 3f6a5: RasterObject.Data#20= - -- DL = 0, D = 0, P = 1, - = 0, XY = 9792 x 6400 -+ DL = 0, D = 0, P = 1, \- = 0, XY = 9792 x 6400 - L0 = 128, MX = 0, MY = 0 - Order = 3 ILEAVE SMID - Options = 92 LRLTWO TPDON TPBON DPON ---- a/osx-hotplug/osx-hplj-hotplug.1in -+++ b/osx-hotplug/osx-hplj-hotplug.1in -@@ -3,7 +3,7 @@ - #include "../macros.man" - #endif - .SH NAME --osx-hplj-hotplug - Daemon for downloading firmware files for Mac OS X -+osx-hplj-hotplug \- Daemon for downloading firmware files for Mac OS X - .SH SYNOPSIS - .B osx-hplj-hotplug - .RI [ options ] ---- a/printer-profile.1in -+++ b/printer-profile.1in -@@ -29,11 +29,11 @@ - Edit the script for additional models. - - .SH OPTIONS -- -b 1|2 Bits per pixel (1) -- -r XRESxYRES Resolution. Default=''. () -- -P rem-print Remote print (64-bit) machine, or none (amd) -- -S rem-scan Remote scan (ColorMunki) machine, or none (mac) -- -D lvl Debug level -+ \-b 1|2 Bits per pixel (1) -+ \-r XRESxYRES Resolution. Default=''. () -+ \-P rem-print Remote print (64-bit) machine, or none (amd) -+ \-S rem-scan Remote scan (ColorMunki) machine, or none (mac) -+ \-D lvl Debug level - - .SH EXAMPLES - Profile the Samsung clp-315: ---- a/qpdldecode.1in -+++ b/qpdldecode.1in -@@ -54,7 +54,7 @@ - len=56(0x38) - magic=0x39abcdef, len=20(0x14), unk=0,0,0,0,0,0, - checksum=0x356 -- DL = 0, D = 0, P = 1, - = 0, XY = 9984 x 6400 -+ DL = 0, D = 0, P = 1, \- = 0, XY = 9984 x 6400 - L0 = 6400, MX = 0, MY = 0 - Order = 0 - Options = 72 LRLTWO TPBON -@@ -64,7 +64,7 @@ - len=56(0x38) - magic=0x39abcdef, len=20(0x14), unk=0,0,0,0,0,0, - checksum=0x356 -- DL = 0, D = 0, P = 1, - = 0, XY = 9984 x 6400 -+ DL = 0, D = 0, P = 1, \- = 0, XY = 9984 x 6400 - L0 = 6400, MX = 0, MY = 0 - Order = 0 - Options = 72 LRLTWO TPBON -@@ -74,7 +74,7 @@ - len=56(0x38) - magic=0x39abcdef, len=20(0x14), unk=0,0,0,0,0,0, - checksum=0x356 -- DL = 0, D = 0, P = 1, - = 0, XY = 9984 x 6400 -+ DL = 0, D = 0, P = 1, \- = 0, XY = 9984 x 6400 - L0 = 6400, MX = 0, MY = 0 - Order = 0 - Options = 72 LRLTWO TPBON -@@ -84,7 +84,7 @@ - len=56(0x38) - magic=0x39abcdef, len=20(0x14), unk=0,0,0,0,0,0, - checksum=0x356 -- DL = 0, D = 0, P = 1, - = 0, XY = 9984 x 6400 -+ DL = 0, D = 0, P = 1, \- = 0, XY = 9984 x 6400 - L0 = 6400, MX = 0, MY = 0 - Order = 0 - Options = 72 LRLTWO TPBON ---- a/slxdecode.1in -+++ b/slxdecode.1in -@@ -80,7 +80,7 @@ - SLI_0x10f, 1 (0x1) - SLT_JBIG_BIH, 0 items - Data: 20 bytes -- DL = 0, D = 0, P = 1, - = 0, XY = 4896 x 6392 -+ DL = 0, D = 0, P = 1, \- = 0, XY = 4896 x 6392 - L0 = 128, MX = 0, MY = 0 - Order = 0 - Options = 8 TPBON ---- a/xqxdecode.1in -+++ b/xqxdecode.1in -@@ -37,7 +37,7 @@ - - .nf - .ft CW --$ xqxdecode -h < testpage.xm -+$ xqxdecode \-h < testpage.xm - 0: \\033%-12345X@PJL JOB - 12: @PJL SET JAMRECOVERY=OFF - 2b: @PJL SET DENSITY=3 -@@ -78,7 +78,7 @@ - 230: XQXI_0x80000000, 64 (0x40) - 23c: XQXI_0x40000000, 0 (0x0) - 248: XQXI_BIH(0x40000002) -- DL = 0, D = 0, P = 1, - = 0, XY = 9856 x 6432 -+ DL = 0, D = 0, P = 1, \- = 0, XY = 9856 x 6432 - L0 = 128, MX = 16, MY = 0 - Order = 3 ILEAVE SMID - Options = 92 LRLTWO TPDON TPBON DPON ---- a/zjsdecode.1in -+++ b/zjsdecode.1in -@@ -74,7 +74,7 @@ - ZJI_MINOLTA_PAGE_NUMBER, 1 (0x1) - ZJT_JBIG_BIH, 0 items - Data: 20 bytes -- DL = 0, D = 0, P = 1, - = 0, XY = 10200 x 6600 -+ DL = 0, D = 0, P = 1, \- = 0, XY = 10200 x 6600 - L0 = 128, MX = 16, MY = 0 - Order = 3 ILEAVE SMID - Options = 92 LRLTWO TPDON TPBON DPON diff -Nru foo2zjs-20160313dfsg0/debian/patches/91-spelling-fixes.patch foo2zjs-20160902dfsg0/debian/patches/91-spelling-fixes.patch --- foo2zjs-20160313dfsg0/debian/patches/91-spelling-fixes.patch 2016-04-25 19:56:31.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/91-spelling-fixes.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,103 +0,0 @@ -Description: Fix various spelling errors: - precission - supress - langauge -Author: Didier Raboud -Last-Update: 2014-06-05 ---- a/icc2ps/cmsio1.c -+++ b/icc2ps/cmsio1.c -@@ -1162,7 +1162,7 @@ - AdjustEndianessArray16(NewLUT ->T, NewLUT->Tsize / sizeof(WORD)); - } - else { -- cmsSignalError(LCMS_ERRC_ABORTED, "Unknow precission of '%d'", CLUT.prec); -+ cmsSignalError(LCMS_ERRC_ABORTED, "Unknow precision of '%d'", CLUT.prec); - return FALSE; - } - ---- a/icc2ps/icc2ps.c -+++ b/icc2ps/icc2ps.c -@@ -139,8 +139,8 @@ - - fprintf(stderr, "%cb - Black point compensation (CRD only)\n", SW); - fprintf(stderr, "%cu - Do NOT generate resource name on CRD\n", SW); -- fprintf(stderr, "%cc<0,1,2> - Precission (0=LowRes, 1=Normal (default), 2=Hi-res) (CRD only)\n", SW); -- fprintf(stderr, "%cn - Alternate way to set precission, number of CLUT points (CRD only)\n", SW); -+ fprintf(stderr, "%cc<0,1,2> - Precision (0=LowRes, 1=Normal (default), 2=Hi-res) (CRD only)\n", SW); -+ fprintf(stderr, "%cn - Alternate way to set precision, number of CLUT points (CRD only)\n", SW); - - fprintf(stderr, "\n"); - fprintf(stderr, "This program is intended to be a demo of the little cms\n" ---- a/icc2ps/cmscgats.c -+++ b/icc2ps/cmscgats.c -@@ -620,7 +620,7 @@ - if (it8->ch == '.') { // Decimal point - - double frac = 0.0; // fraction -- int prec = 0; // precission -+ int prec = 0; // precision - - NextCh(it8); // Eats dec. point - ---- a/icc2ps/cmsps2.c -+++ b/icc2ps/cmsps2.c -@@ -54,7 +54,7 @@ - Color Space Arrays (CSA) - ================================================================================== - -- In order to obtain precission, code chooses between three ways to implement -+ In order to obtain precision, code chooses between three ways to implement - the device -> XYZ transform. These cases identifies monochrome profiles (often - implemented as a set of curves), matrix-shaper and LUT-based. - -@@ -1456,7 +1456,7 @@ - OutputFormat = CHANNELS_SH(nChannels) | BYTES_SH(2); - - // For absolute colorimetric, the LUT is encoded as relative -- // in order to preserve precission. -+ // in order to preserve precision. - - RelativeEncodingIntent = Intent; - if (RelativeEncodingIntent == INTENT_ABSOLUTE_COLORIMETRIC) ---- a/icc2ps/cmsmatsh.c -+++ b/icc2ps/cmsmatsh.c -@@ -75,7 +75,7 @@ - AllLinear += cmsIsLinear(PtrW, p16 -> nSamples); - } - -- // If is all linear, then supress table interpolation (this -+ // If is all linear, then suppress table interpolation (this - // will speed greately some trivial operations. - // Return 1 if present, 0 if all linear - -@@ -192,7 +192,7 @@ - AllLinear += cmsIsLinear(PtrW, NewMatShaper -> p16.nSamples); - } - -- // If is all linear, then supress table interpolation (this -+ // If is all linear, then suppress table interpolation (this - // will speed greately some trivial operations - - if (AllLinear != 3) ---- a/oakdecode.c -+++ b/oakdecode.c -@@ -101,7 +101,7 @@ - "Options:\n" - " -d basename Basename of .pbm file for saving decompressed planes\n" - " -r basename Basename of .jbg file for saving raw planes\n" --" -i Supress display of image records\n" -+" -i Suppress display of image records\n" - " -o Print file offsets\n" - " -D lvl Set Debug level [%d]\n" - , Debug ---- a/qpdldecode.c -+++ b/qpdldecode.c -@@ -82,7 +82,7 @@ - "\n" - " Decode a QPDL stream into human readable form.\n" - "\n" --" A Quick Page Description Langauge (QPDL) is the printer language" -+" A Quick Page Description language (QPDL) is the printer language" - " used by some Samsung printers, such as the CLP-600n.\n" - "\n" - " Also known as SPLC." diff -Nru foo2zjs-20160313dfsg0/debian/patches/92-udev-firmware-script-fixes.patch foo2zjs-20160902dfsg0/debian/patches/92-udev-firmware-script-fixes.patch --- foo2zjs-20160313dfsg0/debian/patches/92-udev-firmware-script-fixes.patch 2016-04-25 19:56:31.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/92-udev-firmware-script-fixes.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -Delay firmware transfer for UDEV automatic printer setup ---- a/hplj1000 -+++ b/hplj1000 -@@ -33,6 +33,15 @@ - PROGNAME="$0" - - # -+# Wait some time before installing the firmware so that probing for -+# automatic printer setup which happens immediately after turning on -+# the printer does not interfere with the firmware transfer to the -+# printer -+# https://bugs.launchpad.net/ubuntu/+source/foo2zjs/+bug/543177 -+# -+sleep 3 -+ -+# - # Set $DEV to, e.g. /dev/usb/lp0, to force the device you want - # Else, leave it null to automatically detect the device - # diff -Nru foo2zjs-20160313dfsg0/debian/patches/95-udev-firmware-script-no-hplip-rules-removal.patch foo2zjs-20160902dfsg0/debian/patches/95-udev-firmware-script-no-hplip-rules-removal.patch --- foo2zjs-20160313dfsg0/debian/patches/95-udev-firmware-script-no-hplip-rules-removal.patch 2016-04-25 19:56:31.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/95-udev-firmware-script-no-hplip-rules-removal.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -Description: Removed the lines in the UDEV script for the automatic firmware - upload into the printer which remove the UDEV rules files for HPLIP's - automatic firmware upload. -Author: Till Kamppeter -Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/foo2zjs/+bug/783389 -Last-Update: 2011-07-23 ---- a/hplj1000 -+++ b/hplj1000 -@@ -152,16 +152,6 @@ - esac - - # --# Remove HPLIP proprietary rules! --# --model=` echo "$MODEL" | tr 'A-Z' 'a-z' ` --rm -f /etc/udev/rules.d/*hpmud*laserjet_${model}* --rm -f /etc/udev/rules.d/*hpmud_support.rules --rm -f /etc/udev/rules.d/*hpmud_plugin.rules --rm -f /lib/udev/rules.d/*hpmud_support.rules --rm -f /lib/udev/rules.d/*hpmud_plugin.rules -- --# - # The special command line argument "install-usermap" will install - # the proper entry into the /etc/hotplug/usb.usermap file - # diff -Nru foo2zjs-20160313dfsg0/debian/patches/96-hplj1000-fix-cups-usb-backend-firmware-upload.patch foo2zjs-20160902dfsg0/debian/patches/96-hplj1000-fix-cups-usb-backend-firmware-upload.patch --- foo2zjs-20160313dfsg0/debian/patches/96-hplj1000-fix-cups-usb-backend-firmware-upload.patch 2016-04-25 19:56:31.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/96-hplj1000-fix-cups-usb-backend-firmware-upload.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -Description: The firmware upload script tried to upload the firmware via - the usblp kernel module and with the CUPS USB backend (using libusb) in - parallel, making the printer crash. -Bug-Ubuntu: https://bugs.launchpad.net/bugs/1003843 -Author: Till Kamppeter -Last-Update: 2013-02-21 - ---- a/hplj1000 -+++ b/hplj1000 -@@ -262,8 +262,14 @@ - # force downloading to a specific device - # - load_usblp "$DEV" --elif [ -x $PRINTERID -o -x $USB_BACKEND ]; then -- if [ -x $PRINTERID ]; then -+elif [ -x $USB_BACKEND ]; then -+ # -+ # If we have CUPS installed, use the CUPS "usb" backend, as then we do -+ # not need to care whether the system uses the usblp kernel module or -+ # libusb -+ # -+ load_cups -+elif [ -x $PRINTERID ]; then - # - # Sniff around for printers that need a firmware download - # -@@ -282,20 +288,6 @@ - fi - fi - done -- if [ "$usblps" != " " ]; then -- # All done! -- exit -- fi -- fi -- -- if [ -x $USB_BACKEND ]; then -- # -- # If we have CUPS installed, use the CUPS "usb" backend, as then we do -- # not need to care whether the system uses the usblp kernel module or -- # libusb -- # -- load_cups -- fi - else - log "HP LaserJet $MODEL firmware was not downloaded..." - log "...couldn't find $PRINTERID, DEV is not set, and CUPS not installed." diff -Nru foo2zjs-20160313dfsg0/debian/patches/97-hplj1000-fix-firmware-upload-infite-loop.patch foo2zjs-20160902dfsg0/debian/patches/97-hplj1000-fix-firmware-upload-infite-loop.patch --- foo2zjs-20160313dfsg0/debian/patches/97-hplj1000-fix-firmware-upload-infite-loop.patch 2016-04-25 19:56:31.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/97-hplj1000-fix-firmware-upload-infite-loop.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ -Description: Prevent an infinite loop when loading the firmware. - When using the load_cups method, the CUPS backend will internally - unload and reload the usblp module. This will generate - SUBSYSTEM=usbmisc events that need to be ignored in the CUPS code - path, or this script will be rerun in an infite loop. - - But when using the load_usblp method, the usblp module is obviously - needed. So in this situation we need to ignore the SUBSYSTEM=usb - events. -Bug-Debian: http://bugs.debian.org/663868 -Author: Peter De Wachter -Last-Update: 2014-10-02 ---- a/hplj1000 -+++ b/hplj1000 -@@ -24,12 +24,6 @@ - # Mike Morgan (2004) - # - --# udev calls us twice on FC4! Just want /dev/usb/lp --case "$DEVNAME" in --/dev/usb/usb*) exit;; # Bug: FC4 --/dev/bus/usb/*) exit;; # Bug: Ubuntu 14 --esac -- - PROGNAME="$0" - - # -@@ -261,6 +255,7 @@ - # - # force downloading to a specific device - # -+ if [ "$SUBSYSTEM" != "usbmisc" ]; then exit; fi - load_usblp "$DEV" - elif [ -x $USB_BACKEND ]; then - # -@@ -268,11 +263,13 @@ - # not need to care whether the system uses the usblp kernel module or - # libusb - # -+ if [ "$SUBSYSTEM" != "usb" ]; then exit; fi - load_cups - elif [ -x $PRINTERID ]; then - # - # Sniff around for printers that need a firmware download - # -+ if [ "$SUBSYSTEM" != "usbmisc" ]; then exit; fi - usblps=`find /dev/usb -type c -name 'lp*'`" "`find /dev -type c -name 'usblp*'` - for dev in $usblps; do - status=`$PRINTERID $dev 2>/dev/null | grep -y "hp LaserJet $MODEL"` diff -Nru foo2zjs-20160313dfsg0/debian/patches/98-build-manpages-reproducibly.patch foo2zjs-20160902dfsg0/debian/patches/98-build-manpages-reproducibly.patch --- foo2zjs-20160313dfsg0/debian/patches/98-build-manpages-reproducibly.patch 2016-04-25 20:03:44.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/98-build-manpages-reproducibly.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -Description: Build manpages reproducibly, through reading the MODTIME from - debian/changelog exclusively, and giving LC_ALL=C.UTF-8 TZ=UTC to various - commands -Author: Didier Raboud -Last-Update: 2016-04-25 ---- a/Makefile -+++ b/Makefile -@@ -79,6 +79,8 @@ - ifeq ($(UNAME),SunOS) - MODTIME= `ls -e $$1 | cut -c42-61` - endif -+# Define modtime from the debian changelog, for all files -+MODTIME= LC_ALL=C.UTF-8 TZ=UTC date -d "$$(dpkg-parsechangelog -SDate)" "+%a %b %d %T %Y" - - # - # Files for tarball -@@ -1515,12 +1517,12 @@ - $(INSTALL) -c -m 644 ChangeLog $(DOCDIR) - - GROFF=/usr/local/test/bin/groff --GROFF=groff -+GROFF=LC_ALL=C.UTF-8 TZ=UTC groff - manual.pdf: $(MANPAGES) osx-hotplug/osx-hplj-hotplug.1 - -$(GROFF) -t -man \ - `ls $(MANPAGES) \ - osx-hotplug/osx-hplj-hotplug.1 \ -- | sort` \ -+ | LC_ALL=C.UTF-8 sort` \ - | ps2pdf - $@ - - README: README.in diff -Nru foo2zjs-20160313dfsg0/debian/patches/series foo2zjs-20160902dfsg0/debian/patches/series --- foo2zjs-20160313dfsg0/debian/patches/series 2016-04-25 19:56:31.000000000 +0000 +++ foo2zjs-20160902dfsg0/debian/patches/series 2016-10-08 16:37:39.000000000 +0000 @@ -1,23 +1,21 @@ -10-makefile.patch -12-fix-implicit-declaration.patch -20-system-lcms.patch -20-system-libjbig.patch -20-system-liblcms.patch -# in debian/rules: 20-honour-papersize.patch -# in debian/rules: 20-PDF-input-data-in-PPDs.patch -30-udev-rules.patch -40-desktop-encoding-correction.patch -40-desktop-nodisplay-true.patch -40-desktop-direct-launch.patch -40-path-correction.patch -60-getweb.in.patch -60-hplj1000.patch -70-lib-firwmare-hp.patch -70-printer-profile.patch -90-manpages.patch -91-spelling-fixes.patch -92-udev-firmware-script-fixes.patch -95-udev-firmware-script-no-hplip-rules-removal.patch -96-hplj1000-fix-cups-usb-backend-firmware-upload.patch -97-hplj1000-fix-firmware-upload-infite-loop.patch -98-build-manpages-reproducibly.patch +0001-Update-makefiles-to-Debian-best-practices.patch +0002-Fix-icc2ps-build.patch +0003-Don-t-build-icc2ps-but-use-psicc-from-liblcms2-utils.patch +0004-Use-the-Debian-provided-libjbig.patch +0005-Link-against-system-liblcms1.patch +0006-Correct-the-udev-rules.patch +0007-Remove-Encoding-from-.desktop-file.patch +0008-Do-not-display-the-icon-by-default.patch +0009-Launch-the-_gui.tcl-directly-instead-of-launching-wi.patch +0010-Correct-the-path-for-the-usb_printerid-program.patch +0011-Improve-getweb-also-for-installing-the-firmware.patch +0012-Use-the-same-firmware-folder-for-all-HP-LJ-printers.patch +0013-Firmware-directory-is-lib-firmware-hp-Closes-517957.patch +0014-Don-t-delete-printer-profile-in-clean-target.patch +0015-Fixes-errors-and-hyphen-as-minus-in-manpages.patch +0016-Fix-various-spelling-errors.patch +0017-Delay-firmware-transfer-for-UDEV-automatic-printer-s.patch +0018-Removed-the-lines-in-the-UDEV-script-for-the-automat.patch +0019-The-firmware-upload-script-tried-to-upload-the-firmw.patch +0020-Prevent-an-infinite-loop-when-loading-the-firmware.patch +0021-Build-manpages-reproducibly-through-reading-the-MODT.patch diff -Nru foo2zjs-20160313dfsg0/foo2hbpl2.1in foo2zjs-20160902dfsg0/foo2hbpl2.1in --- foo2zjs-20160313dfsg0/foo2hbpl2.1in 2016-04-25 19:28:24.000000000 +0000 +++ foo2zjs-20160902dfsg0/foo2hbpl2.1in 2016-10-04 09:39:59.000000000 +0000 @@ -30,6 +30,8 @@ Fuji Xerox DocuPrint CM215, Fuji Xerox DocuPrint M215, Fuji Xerox DocuPrint P205, +Xerox Phaser 3010, +Xerox Phaser 3040, Xerox WorkCentre 3045 MFP, and Xerox WorkCentre 6015 MFP printers. diff -Nru foo2zjs-20160313dfsg0/foo2hbpl2.c foo2zjs-20160902dfsg0/foo2hbpl2.c --- foo2zjs-20160313dfsg0/foo2hbpl2.c 2016-04-25 19:28:24.000000000 +0000 +++ foo2zjs-20160902dfsg0/foo2hbpl2.c 2016-10-04 09:39:59.000000000 +0000 @@ -14,6 +14,8 @@ - Fuji Xerox DocuPrint CM215 B/W and color - Fuji Xerox DocuPrint M215 B/W - Fuji Xerox DocuPrint P205 B/W + - Xerox Phaser 3010 B/W + - Xerox Phaser 3040 B/W - Xerox WorkCentre 3045 B/W - Xerox WorkCentre 6015 B/W and color @@ -57,7 +59,7 @@ */ -static char Version[] = "$Id: foo2hbpl2.c,v 1.34 2015/10/11 19:24:50 rick Exp $"; +static char Version[] = "$Id: foo2hbpl2.c,v 1.36 2016/09/02 19:21:11 rick Exp $"; #include #include diff -Nru foo2zjs-20160313dfsg0/foo2hbpl2-wrapper.1in foo2zjs-20160902dfsg0/foo2hbpl2-wrapper.1in --- foo2zjs-20160313dfsg0/foo2hbpl2-wrapper.1in 2016-04-25 19:28:24.000000000 +0000 +++ foo2zjs-20160902dfsg0/foo2hbpl2-wrapper.1in 2016-10-04 09:39:59.000000000 +0000 @@ -23,6 +23,8 @@ Fuji Xerox DocuPrint CM205, Fuji Xerox DocuPrint CM215, Fuji Xerox DocuPrint P205, +Xerox Phaser 3010, +Xerox Phaser 3040, Xerox WorkCentre 3045 MFP, and Xerox WorkCentre 6015 MFP printers. .P diff -Nru foo2zjs-20160313dfsg0/foomatic-db/driver/foo2hbpl2.xml foo2zjs-20160902dfsg0/foomatic-db/driver/foo2hbpl2.xml --- foo2zjs-20160313dfsg0/foomatic-db/driver/foo2hbpl2.xml 2016-04-25 19:28:24.000000000 +0000 +++ foo2zjs-20160902dfsg0/foomatic-db/driver/foo2hbpl2.xml 2016-10-04 09:39:59.000000000 +0000 @@ -20,6 +20,8 @@ printer/Dell-C1765 printer/Epson-AcuLaser_M1400 printer/Epson-AcuLaser_CX17NF + printer/Xerox-Phaser_3010 + printer/Xerox-Phaser_3040 printer/Xerox-WorkCentre_3045 printer/Xerox-WorkCentre_6015 printer/Fuji_Xerox-DocuPrint_CM205 diff -Nru foo2zjs-20160313dfsg0/foomatic-db/opt/foo2hbpl2-ColorMode.xml foo2zjs-20160902dfsg0/foomatic-db/opt/foo2hbpl2-ColorMode.xml --- foo2zjs-20160313dfsg0/foomatic-db/opt/foo2hbpl2-ColorMode.xml 2016-04-25 19:28:24.000000000 +0000 +++ foo2zjs-20160902dfsg0/foomatic-db/opt/foo2hbpl2-ColorMode.xml 2016-10-04 09:39:59.000000000 +0000 @@ -44,6 +44,12 @@ Fuji Xerox DocuPrint P205 + Xerox Phaser 3010 + + + Xerox Phaser 3040 + + Xerox WorkCentre 3045 diff -Nru foo2zjs-20160313dfsg0/foomatic-db/opt/foo2hbpl2-ICM.xml foo2zjs-20160902dfsg0/foomatic-db/opt/foo2hbpl2-ICM.xml --- foo2zjs-20160313dfsg0/foomatic-db/opt/foo2hbpl2-ICM.xml 2016-04-25 19:28:24.000000000 +0000 +++ foo2zjs-20160902dfsg0/foomatic-db/opt/foo2hbpl2-ICM.xml 2016-10-04 09:39:59.000000000 +0000 @@ -66,6 +66,12 @@ Fuji Xerox DocuPrint P205 + Xerox Phaser 3010 + + + Xerox Phaser 3040 + + Xerox WorkCentre 3045 diff -Nru foo2zjs-20160313dfsg0/foomatic-db/opt/foo2hbpl2-Resolution.xml foo2zjs-20160902dfsg0/foomatic-db/opt/foo2hbpl2-Resolution.xml --- foo2zjs-20160313dfsg0/foomatic-db/opt/foo2hbpl2-Resolution.xml 2016-04-25 19:28:24.000000000 +0000 +++ foo2zjs-20160902dfsg0/foomatic-db/opt/foo2hbpl2-Resolution.xml 2016-10-04 09:39:59.000000000 +0000 @@ -32,6 +32,16 @@ ev/foo2hbpl2-Resolution-600x600 + Xerox Phaser 3010 + foo2hbpl2 + ev/foo2hbpl2-Resolution-600x600 + + + Xerox Phaser 3040 + foo2hbpl2 + ev/foo2hbpl2-Resolution-600x600 + + Xerox WorkCentre 3045 foo2hbpl2 ev/foo2hbpl2-Resolution-600x600 @@ -64,6 +74,12 @@ Fuji Xerox DocuPrint P205 + Xerox Phaser 3010 + + + Xerox Phaser 3040 + + Xerox WorkCentre 3045 @@ -85,6 +101,12 @@ Fuji Xerox DocuPrint P205 + Xerox Phaser 3010 + + + Xerox Phaser 3040 + + Xerox WorkCentre 3045 @@ -115,6 +137,12 @@ Fuji Xerox DocuPrint P205 + Xerox Phaser 3010 + + + Xerox Phaser 3040 + + Xerox WorkCentre 3045 diff -Nru foo2zjs-20160313dfsg0/foomatic-db/printer/Xerox-Phaser_3010.xml foo2zjs-20160902dfsg0/foomatic-db/printer/Xerox-Phaser_3010.xml --- foo2zjs-20160313dfsg0/foomatic-db/printer/Xerox-Phaser_3010.xml 1970-01-01 00:00:00.000000000 +0000 +++ foo2zjs-20160902dfsg0/foomatic-db/printer/Xerox-Phaser_3010.xml 2016-10-04 09:39:59.000000000 +0000 @@ -0,0 +1,71 @@ + + Xerox + Phaser 3010 + + + + + + 1200 + 1200 + + + + + mm + 4.23164 + 4.23164 + 3.175 + 3.175 + + + + + http://www.office.xerox.com/printers/laser-printers/phaser-3010/enin.html + + + + + + + + Xerox Phaser 3010 + + + C + foo2hbpl2 + + + + The Xerox Phaser 3010 + is a monochrome printer with a 2016 street price of $90. + + These printers are supported by the foo2hbpl2 open software printer + driver. + + + diff -Nru foo2zjs-20160313dfsg0/foomatic-db/printer/Xerox-Phaser_3040.xml foo2zjs-20160902dfsg0/foomatic-db/printer/Xerox-Phaser_3040.xml --- foo2zjs-20160313dfsg0/foomatic-db/printer/Xerox-Phaser_3040.xml 1970-01-01 00:00:00.000000000 +0000 +++ foo2zjs-20160902dfsg0/foomatic-db/printer/Xerox-Phaser_3040.xml 2016-10-04 09:39:59.000000000 +0000 @@ -0,0 +1,71 @@ + + Xerox + Phaser 3040 + + + + + + 1200 + 1200 + + + + + mm + 4.23164 + 4.23164 + 3.175 + 3.175 + + + + + http://www.office.xerox.com/printers/laser-printers/phaser-3040/enin.html + + + + + + + + Xerox Phaser 3040 + + + C + foo2hbpl2 + + + + The Xerox Phaser 3040 + is a monochrome printer with a 2016 street price of $90. + + These printers are supported by the foo2hbpl2 open software printer + driver. + + + diff -Nru foo2zjs-20160313dfsg0/INSTALL.osx foo2zjs-20160902dfsg0/INSTALL.osx --- foo2zjs-20160313dfsg0/INSTALL.osx 2016-04-25 19:28:24.000000000 +0000 +++ foo2zjs-20160902dfsg0/INSTALL.osx 2016-10-04 09:39:59.000000000 +0000 @@ -7,6 +7,18 @@ http://osxdaily.com/2015/10/05/disable-rootless-system-integrity-protection-mac-os-x/ + $ csrutil status + System Integrity Protection status: disabled + +OR + + Doing a make install in foo2zjs directory: + + $ cd foo2zjs + $ make install PREFIX=/usr/local + + also works. + ============================================================================== MAC OSX INSTALLATION NOTES - diff -Nru foo2zjs-20160313dfsg0/Makefile foo2zjs-20160902dfsg0/Makefile --- foo2zjs-20160313dfsg0/Makefile 2016-04-25 19:28:24.000000000 +0000 +++ foo2zjs-20160902dfsg0/Makefile 2016-10-04 09:39:59.000000000 +0000 @@ -240,6 +240,7 @@ hplj10xx.conf \ modify-ppd \ command2foo2lava-pjl.c \ + myftpput \ $(NULL) # CUPS vars @@ -310,8 +311,10 @@ .fig.gif: fig2dev -L gif $*.fig | giftrans -t "#ffffff" -o $*.gif - # fig2dev -L ppm $*.fig | pnmquant -fs 256 \ - #| ppmtogif -transparent rgb:ff/ff/ff >$*.gif + +# old .fig.gif +# fig2dev -L ppm $*.fig | pnmquant -fs 256 \ +# | ppmtogif -transparent rgb:ff/ff/ff >$*.gif .ps.cups: gs $(GSOPTS) -r600x600 \ @@ -837,10 +840,10 @@ fi; \ done -MODEL=$(DESTDIR)/usr/share/cups/model +MODEL=$(PREFIX)/share/cups/model LOCALMODEL=$(DESTDIR)/usr/local/share/cups/model MACMODEL=/Library/Printers/PPDs/Contents/Resources -PPD=$(DESTDIR)/usr/share/ppd +PPD=$(PREFIX)/share/ppd VARPPD=/var/lp/ppd install-ppd: # @@ -1047,7 +1050,9 @@ CUPSMAJVER=head -1 $(CUPSPRINTERS) | sed -e 's/.*CUPS v//' -e 's/\..*//' cups: FRC + # # CUPS + # if [ -r $(CUPSFILESCONF) ]; then \ ( echo "g/^FileDev/d"; \ echo "g/ foo2zjs.../d"; \ @@ -1077,7 +1082,9 @@ echo "w"; \ ) | ex $(CUPSDCONF); \ fi - # systemctl uses 2 things and no way to differentiate! + # + # CUPS restart + # if [ -x /etc/init.d/cups ]; then \ /etc/init.d/cups restart; \ if [ $$? != 0 ]; then \ @@ -1095,7 +1102,10 @@ cp /usr/local/etc/rc.d/cups.sh.sample /usr/local/etc/rc.d/cups.sh; \ /usr/local/etc/rc.d/cups.sh restart; \ elif [ -x /bin/systemctl ]; then \ - systemctl restart cups.service org.cups.cupsd.service || exit 0; \ + systemctl restart cups.service; \ + if [ $$? != 0 ]; then \ + systemctl restart org.cups.cupsd.service; \ + fi \ elif [ -x /bin/launchctl ]; then \ /bin/launchctl unload $(MACLOAD); \ /bin/launchctl load $(MACLOAD); \ @@ -1427,6 +1437,7 @@ *CX17*) driver=foo2hbpl2;; \ *CM2[01]5*) driver=foo2hbpl2;; \ *P205*|*3045*) driver=foo2hbpl2;; \ + *3010*|*3040*) driver=foo2hbpl2;; \ *M215*) driver=foo2hbpl2;; \ *M1400*) driver=foo2hbpl2;; \ *) driver=foo2zjs;; \ @@ -1651,12 +1662,17 @@ -e "s/\$${MODtarball}/$$MODtarball $$TZ/" chmod -w $@ +myftpput: ../geo/myftpput + rm -f myftpput + cp -a ../geo/myftpput . + chmod 555 myftpput + web: test tar manual.pdf webindex - ncftpput -m -f $(FTPSITE) foo2zjs \ + ./myftpput -S -m -f $(FTPSITE) foo2zjs \ ChangeLog INSTALL manual.pdf foo2zjs.tar.gz; webt: tar manual.pdf webindex - ncftpput -m -f $(FTPSITE) foo2zjs \ + ./myftpput -S -m -f $(FTPSITE) foo2zjs \ ChangeLog INSTALL manual.pdf foo2zjs.tar.gz; webworld: web webpics @@ -1671,7 +1687,7 @@ zjsindex: foo2zjs.html archzjs.gif thermometer.gif webphotos ln -sf foo2zjs.html index.html - ncftpput -m -f $(FTPSITE) foo2zjs \ + ./myftpput -S -m -f $(FTPSITE) foo2zjs \ index.html style.css archzjs.gif thermometer.gif \ images/flags.png INSTALL INSTALL.osx images/zjsfavicon.png \ Laserjet-1005-Series-MacOSX-10.pdf \ @@ -1679,56 +1695,56 @@ oakindex: foo2oak.html archoak.gif thermometer.gif webphotos ln -sf foo2oak.html index.html - ncftpput -m -f $(FTPSITE) foo2oak \ + ./myftpput -S -m -f $(FTPSITE) foo2oak \ index.html style.css archoak.gif thermometer.gif \ images/flags.png INSTALL \ printer-photos/printers.jpg; hpindex: foo2hp.html archhp.gif thermometer.gif webphotos ln -sf foo2hp.html index.html - ncftpput -m -f $(FTPSITE) foo2hp \ + ./myftpput -S -m -f $(FTPSITE) foo2hp \ index.html style.css archhp.gif thermometer.gif \ images/flags.png INSTALL images/hpfavicon.png \ printer-photos/printers.jpg; xqxindex: foo2xqx.html archxqx.gif thermometer.gif webphotos ln -sf foo2xqx.html index.html - ncftpput -m -f $(FTPSITE) foo2xqx \ + ./myftpput -S -m -f $(FTPSITE) foo2xqx \ index.html style.css archxqx.gif thermometer.gif \ images/flags.png INSTALL images/xqxfavicon.png \ printer-photos/printers.jpg; lavaindex: foo2lava.html archlava.gif thermometer.gif webphotos ln -sf foo2lava.html index.html - ncftpput -m -f $(FTPSITE) foo2lava \ + ./myftpput -S -m -f $(FTPSITE) foo2lava \ index.html style.css archlava.gif thermometer.gif \ images/flags.png INSTALL images/lavafavicon.png \ printer-photos/printers.jpg; qpdlindex: foo2qpdl.html archqpdl.gif thermometer.gif webphotos ln -sf foo2qpdl.html index.html - ncftpput -m -f $(FTPSITE) foo2qpdl \ + ./myftpput -S -m -f $(FTPSITE) foo2qpdl \ index.html style.css archqpdl.gif thermometer.gif \ images/flags.png INSTALL images/qpdlfavicon.png \ printer-photos/printers.jpg; slxindex: foo2slx.html archslx.gif thermometer.gif webphotos ln -sf foo2slx.html index.html - ncftpput -m -f $(FTPSITE) foo2slx \ + ./myftpput -S -m -f $(FTPSITE) foo2slx \ index.html style.css archslx.gif thermometer.gif \ images/flags.png INSTALL images/slxfavicon.png \ printer-photos/printers.jpg; hcindex: foo2hiperc.html archhiperc.gif thermometer.gif webphotos ln -sf foo2hiperc.html index.html - ncftpput -m -f $(FTPSITE) foo2hiperc \ + ./myftpput -S -m -f $(FTPSITE) foo2hiperc \ index.html style.css archhiperc.gif thermometer.gif \ images/flags.png INSTALL images/hipercfavicon.png \ printer-photos/printers.jpg; hbplindex: foo2hbpl.html archhbpl.gif thermometer.gif webphotos ln -sf foo2hbpl.html index.html - ncftpput -m -f $(FTPSITE) foo2hbpl \ + ./myftpput -S -m -f $(FTPSITE) foo2hbpl \ index.html style.css archhbpl.gif thermometer.gif \ images/flags.png INSTALL images/hbplfavicon.png \ printer-photos/printers.jpg; @@ -1780,24 +1796,24 @@ icm/okic3200.tar.gz \ icm/okic3400.tar.gz icm/okic5600.tar.gz \ icm/okic810.tar.gz - ncftpput -m -f $(FTPSITE) foo2zjs/icm icm/dl2300.tar.gz; - ncftpput -m -f $(FTPSITE) foo2zjs/icm icm/km2430.tar.gz; - ncftpput -m -f $(FTPSITE) foo2zjs/icm icm/hp-cp1025.tar.gz; - ncftpput -m -f $(FTPSITE) foo2hp/icm icm/hpclj2500.tar.gz; - ncftpput -m -f $(FTPSITE) foo2hp/icm icm/hpclj2600n.tar.gz; - ncftpput -m -f $(FTPSITE) foo2hp/icm icm/hp1215.tar.gz; - ncftpput -m -f $(FTPSITE) foo2lava/icm icm/km2530.tar.gz; - ncftpput -m -f $(FTPSITE) foo2lava/icm icm/km-1600.tar.gz; - ncftpput -m -f $(FTPSITE) foo2qpdl/icm icm/samclp300.tar.gz; - ncftpput -m -f $(FTPSITE) foo2qpdl/icm icm/samclp315.tar.gz; - ncftpput -m -f $(FTPSITE) foo2slx/icm icm/lexc500.tar.gz; - ncftpput -m -f $(FTPSITE) foo2hiperc/icm icm/okic301.tar.gz; - ncftpput -m -f $(FTPSITE) foo2hiperc/icm icm/okic310.tar.gz; - ncftpput -m -f $(FTPSITE) foo2hiperc/icm icm/okic511.tar.gz; - ncftpput -m -f $(FTPSITE) foo2hiperc/icm icm/okic3200.tar.gz; - ncftpput -m -f $(FTPSITE) foo2hiperc/icm icm/okic3400.tar.gz; - ncftpput -m -f $(FTPSITE) foo2hiperc/icm icm/okic5600.tar.gz; - ncftpput -m -f $(FTPSITE) foo2hiperc/icm icm/okic810.tar.gz; + ./myftpput -S -m -f $(FTPSITE) foo2zjs/icm icm/dl2300.tar.gz; + ./myftpput -S -m -f $(FTPSITE) foo2zjs/icm icm/km2430.tar.gz; + ./myftpput -S -m -f $(FTPSITE) foo2zjs/icm icm/hp-cp1025.tar.gz; + ./myftpput -S -m -f $(FTPSITE) foo2hp/icm icm/hpclj2500.tar.gz; + ./myftpput -S -m -f $(FTPSITE) foo2hp/icm icm/hpclj2600n.tar.gz; + ./myftpput -S -m -f $(FTPSITE) foo2hp/icm icm/hp1215.tar.gz; + ./myftpput -S -m -f $(FTPSITE) foo2lava/icm icm/km2530.tar.gz; + ./myftpput -S -m -f $(FTPSITE) foo2lava/icm icm/km-1600.tar.gz; + ./myftpput -S -m -f $(FTPSITE) foo2qpdl/icm icm/samclp300.tar.gz; + ./myftpput -S -m -f $(FTPSITE) foo2qpdl/icm icm/samclp315.tar.gz; + ./myftpput -S -m -f $(FTPSITE) foo2slx/icm icm/lexc500.tar.gz; + ./myftpput -S -m -f $(FTPSITE) foo2hiperc/icm icm/okic301.tar.gz; + ./myftpput -S -m -f $(FTPSITE) foo2hiperc/icm icm/okic310.tar.gz; + ./myftpput -S -m -f $(FTPSITE) foo2hiperc/icm icm/okic511.tar.gz; + ./myftpput -S -m -f $(FTPSITE) foo2hiperc/icm icm/okic3200.tar.gz; + ./myftpput -S -m -f $(FTPSITE) foo2hiperc/icm icm/okic3400.tar.gz; + ./myftpput -S -m -f $(FTPSITE) foo2hiperc/icm icm/okic5600.tar.gz; + ./myftpput -S -m -f $(FTPSITE) foo2hiperc/icm icm/okic810.tar.gz; icm/dl2300.tar.gz: FRC cd icm; tar -c -z -f ../$@ CP*.icm DL*.icm @@ -1844,7 +1860,7 @@ firmware/sihpP1006.tar.gz \ firmware/sihpP1505.tar.gz \ $(NULL) - ncftpput -m -f $(FTPSITE) foo2zjs/firmware firmware/*.tar.gz; + ./myftpput -S -m -f $(FTPSITE) foo2zjs/firmware firmware/*.tar.gz; firmware/sihp1000.tar.gz: FRC cd firmware; tar -c -z -f ../$@ sihp1000.img diff -Nru foo2zjs-20160313dfsg0/myftpput foo2zjs-20160902dfsg0/myftpput --- foo2zjs-20160313dfsg0/myftpput 1970-01-01 00:00:00.000000000 +0000 +++ foo2zjs-20160902dfsg0/myftpput 2016-10-04 09:39:59.000000000 +0000 @@ -0,0 +1,106 @@ +#!/bin/sh + +# +# only the file in ~/geo/myftpput is writeable! +# + +PROGNAME="$0" + +usage() { + cat < + user + pass + -D lvl Debug level + +EXAMPLE + Using ncftp: + + myftpput -f ~/.ncftp-website geo wherigo2jpg wherigo2lua + + Using lftp: + + myftpput -S -f ~/.ncftp-website geo wherigo2jpg wherigo2lua + +EOF + + exit 1 +} + +# +# Report an error and exit +# +error() { + echo "`basename $PROGNAME`: $1" >&2 + exit 1 +} + +debug() { + if [ $DEBUG -ge $1 ]; then + echo "`basename $PROGNAME`: $2" >&2 + fi +} + +# +# Process the options +# +DEBUG=0 +SFTP=0 +CFG= +FTP= +while getopts "mSf:D:h?" opt +do + case $opt in + S) SFTP=1;; + f) CFG="$OPTARG";; + m) FTP="-m $FTP";; + D) DEBUG="$OPTARG";; + h|\?) usage;; + esac +done +shift `expr $OPTIND - 1` + +# +# Main Program +# +if [ -r "$CFG" ]; then + host=$(grep host "$CFG" | tail -1 | awk '{print $2}') + user=$(grep user "$CFG" | tail -1 | awk '{print $2}') + pass=$(grep pass "$CFG" | tail -1 | awk '{print $2}') +else + usage +fi + +DIR="$1"; shift + +if [ "$SFTP" = 0 ]; then + ncftp <<-EOF + open -u $user -p $pass $host + mkdir $DIR + cd $DIR + mput -f $* + quit + EOF +else + lftp sftp://$user@$host <<-EOF + set sftp:auto-confirm yes + user $user $pass + mkdir -f -p $DIR + cd $DIR + mput $* + quit + EOF +fi diff -Nru foo2zjs-20160313dfsg0/PPD/Xerox-Phaser_3010.ppd foo2zjs-20160902dfsg0/PPD/Xerox-Phaser_3010.ppd --- foo2zjs-20160313dfsg0/PPD/Xerox-Phaser_3010.ppd 1970-01-01 00:00:00.000000000 +0000 +++ foo2zjs-20160902dfsg0/PPD/Xerox-Phaser_3010.ppd 2016-10-04 09:39:59.000000000 +0000 @@ -0,0 +1,427 @@ +*PPD-Adobe: "4.3" +*% +*% For information on using this, and to obtain the required backend +*% script, consult http://www.openprinting.org/ +*% +*% This file is published under the GNU General Public License +*% +*% PPD-O-MATIC (3.0.0 or newer) generated this PPD file. It is for use with +*% all programs and environments which use PPD files for dealing with +*% printer capability information. The printer must be configured with the +*% "foomatic-rip" backend filter script of Foomatic 3.0.0 or newer. This +*% file and "foomatic-rip" work together to support PPD-controlled printer +*% driver option access with arbitrary free software printer drivers and +*% printing spoolers. +*% +*% To save this file on your disk, wait until the download has completed +*% (the animation of the browser logo must stop) and then use the +*% "Save as..." command in the "File" menu of your browser or in the +*% pop-up manu when you click on this document with the right mouse button. +*% DO NOT cut and paste this file into an editor with your mouse. This can +*% introduce additional line breaks which lead to unexpected results. +*% +*% You may save this file as 'Xerox-Phaser_3010-foo2hbpl2.ppd' +*% +*% +*FormatVersion: "4.3" +*FileVersion: "1.1" +*LanguageVersion: English +*LanguageEncoding: ISOLatin1 +*PCFileName: "FOO2HBPL.PPD" +*Manufacturer: "Xerox" +*Product: "(Phaser 3010)" +*cupsVersion: 1.0 +*cupsManualCopies: True +*cupsModelNumber: 2 +*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip" +*%pprRIP: foomatic-rip other +*ModelName: "Xerox Phaser 3010" +*ShortNickName: "Xerox Phaser 3010 foo2hbpl2" +*NickName: "Xerox Phaser 3010 Foomatic/foo2hbpl2 (recommended)" +*PSVersion: "(3010.000) 550" +*PSVersion: "(3010.000) 651" +*PSVersion: "(3010.000) 652" +*PSVersion: "(3010.000) 653" +*PSVersion: "(3010.000) 704" +*PSVersion: "(3010.000) 705" +*PSVersion: "(3010.000) 800" +*LanguageLevel: "3" +*ColorDevice: True +*DefaultColorSpace: RGB +*FileSystem: False +*Throughput: "1" +*LandscapeOrientation: Plus90 +*TTRasterizer: Type42 +*1284DeviceID: "DRV:Dfoo2hbpl2,R1,M0,TF;" + +*driverName foo2hbpl2/foo2hbpl2: "" +*driverType F/Filter: "" +*driverUrl: "http://foo2hbpl.rkkda.com/" +*driverObsolete: False + + + + +*HWMargins: 9 12.00 9 12 +*VariablePaperSize: True +*MaxMediaWidth: 100000 +*MaxMediaHeight: 100000 +*NonUIOrderDependency: 135 AnySetup *CustomPageSize +*CustomPageSize True: "pop pop pop pop pop +%% FoomaticRIPOptionSetting: PageSize=Custom" +*End +*FoomaticRIPOptionSetting PageSize=Custom: "-pCustom.%0x%1 " +*ParamCustomPageSize Width: 1 points 36 100000 +*ParamCustomPageSize Height: 2 points 36 100000 +*ParamCustomPageSize Orientation: 3 int 0 0 +*ParamCustomPageSize WidthOffset: 4 points 0 0 +*ParamCustomPageSize HeightOffset: 5 points 0 0 + +*FoomaticIDs: Xerox-Phaser_3010 foo2hbpl2 +*FoomaticRIPCommandLine: "foo2hbpl2-wrapper %A" + +*OpenGroup: General/General + +*OpenUI *Quality/Printing Quality: PickOne +*FoomaticRIPOption Quality: enum CmdLine A +*OrderDependency: 110 AnySetup *Quality +*DefaultQuality: normal +*Quality draft/Draft: "%% FoomaticRIPOptionSetting: Quality=draft" +*FoomaticRIPOptionSetting Quality=draft: " -t " +*Quality normal/Normal: "%% FoomaticRIPOptionSetting: Quality=normal" +*FoomaticRIPOptionSetting Quality=normal: " " +*CloseUI: *Quality + +*FoomaticRIPOption ColorMode: enum CmdLine A 120 +*FoomaticRIPOptionSetting ColorMode=Monochrome: " " + +*OpenUI *Resolution/Resolution: PickOne +*FoomaticRIPOption Resolution: enum CmdLine A +*OrderDependency: 130 AnySetup *Resolution +*DefaultResolution: 600x600dpi +*Resolution 600x600dpi/600x600 dpi: "%% FoomaticRIPOptionSetting: Resolution=600x600dpi" +*FoomaticRIPOptionSetting Resolution=600x600dpi: "-r600x600 " +*Resolution 1200x1200dpi/1200x1200 dpi: "%% FoomaticRIPOptionSetting: Resolution=1200x1200dpi" +*FoomaticRIPOptionSetting Resolution=1200x1200dpi: "-r1200x1200 " +*CloseUI: *Resolution + +*OpenUI *PageSize/Page Size: PickOne +*FoomaticRIPOption PageSize: enum CmdLine A +*OrderDependency: 135 AnySetup *PageSize +*DefaultPageSize: Letter +*PageSize Letter/Letter: "%% FoomaticRIPOptionSetting: PageSize=Letter" +*FoomaticRIPOptionSetting PageSize=Letter: "-p4 " +*PageSize A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4" +*FoomaticRIPOptionSetting PageSize=A4: "-p1 " +*PageSize A5/A5: "%% FoomaticRIPOptionSetting: PageSize=A5" +*FoomaticRIPOptionSetting PageSize=A5: "-p3 " +*PageSize B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis" +*FoomaticRIPOptionSetting PageSize=B5jis: "-p2 " +*PageSize Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10" +*FoomaticRIPOptionSetting PageSize=Env10: "-p9 " +*PageSize EnvC5/Env C5: "%% FoomaticRIPOptionSetting: PageSize=EnvC5" +*FoomaticRIPOptionSetting PageSize=EnvC5: "-p11 " +*PageSize EnvDL/Env DL: "%% FoomaticRIPOptionSetting: PageSize=EnvDL" +*FoomaticRIPOptionSetting PageSize=EnvDL: "-p12 " +*PageSize EnvMonarch/Env Monarch: "%% FoomaticRIPOptionSetting: PageSize=EnvMonarch" +*FoomaticRIPOptionSetting PageSize=EnvMonarch: "-p10 " +*PageSize Executive/Executive: "%% FoomaticRIPOptionSetting: PageSize=Executive" +*FoomaticRIPOptionSetting PageSize=Executive: "-p5 " +*PageSize FanfoldGermanLegal/Fanfold German Legal: "%% FoomaticRIPOptionSetting: PageSize=FanfoldGermanLegal" +*FoomaticRIPOptionSetting PageSize=FanfoldGermanLegal: "-p6 " +*PageSize Folio/Folio: "%% FoomaticRIPOptionSetting: PageSize=Folio" +*FoomaticRIPOptionSetting PageSize=Folio: "-p6 " +*PageSize Legal/Legal: "%% FoomaticRIPOptionSetting: PageSize=Legal" +*FoomaticRIPOptionSetting PageSize=Legal: "-p7 " +*CloseUI: *PageSize + +*OpenUI *PageRegion: PickOne +*OrderDependency: 135 AnySetup *PageRegion +*DefaultPageRegion: Letter +*PageRegion Letter/Letter: "%% FoomaticRIPOptionSetting: PageSize=Letter" +*PageRegion A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4" +*PageRegion A5/A5: "%% FoomaticRIPOptionSetting: PageSize=A5" +*PageRegion B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis" +*PageRegion Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10" +*PageRegion EnvC5/Env C5: "%% FoomaticRIPOptionSetting: PageSize=EnvC5" +*PageRegion EnvDL/Env DL: "%% FoomaticRIPOptionSetting: PageSize=EnvDL" +*PageRegion EnvMonarch/Env Monarch: "%% FoomaticRIPOptionSetting: PageSize=EnvMonarch" +*PageRegion Executive/Executive: "%% FoomaticRIPOptionSetting: PageSize=Executive" +*PageRegion FanfoldGermanLegal/Fanfold German Legal: "%% FoomaticRIPOptionSetting: PageSize=FanfoldGermanLegal" +*PageRegion Folio/Folio: "%% FoomaticRIPOptionSetting: PageSize=Folio" +*PageRegion Legal/Legal: "%% FoomaticRIPOptionSetting: PageSize=Legal" +*CloseUI: *PageRegion + +*DefaultImageableArea: Letter +*ImageableArea Letter/Letter: "9 12.00 603 780.00" +*ImageableArea A4/A4: "9 12.00 586 830.00" +*ImageableArea A5/A5: "9 12.00 411 583.00" +*ImageableArea B5jis/B5 (JIS): "9 12.00 509 715.00" +*ImageableArea Env10/Env #10: "9 12.00 288 672.00" +*ImageableArea EnvC5/Env C5: "9 12.00 450 637.00" +*ImageableArea EnvDL/Env DL: "9 12.00 302 611.00" +*ImageableArea EnvMonarch/Env Monarch: "9 12.00 270 528.00" +*ImageableArea Executive/Executive: "9 12.00 513 744.00" +*ImageableArea FanfoldGermanLegal/Fanfold German Legal: "9 12.00 603 996.00" +*ImageableArea Folio/Folio: "9 12.00 603 924.00" +*ImageableArea Legal/Legal: "9 12.00 603 996.00" + +*DefaultPaperDimension: Letter +*PaperDimension Letter/Letter: "612 792" +*PaperDimension A4/A4: "595 842" +*PaperDimension A5/A5: "420 595" +*PaperDimension B5jis/B5 (JIS): "518 727" +*PaperDimension Env10/Env #10: "297 684" +*PaperDimension EnvC5/Env C5: "459 649" +*PaperDimension EnvDL/Env DL: "311 623" +*PaperDimension EnvMonarch/Env Monarch: "279 540" +*PaperDimension Executive/Executive: "522 756" +*PaperDimension FanfoldGermanLegal/Fanfold German Legal: "612 1008" +*PaperDimension Folio/Folio: "612 936" +*PaperDimension Legal/Legal: "612 1008" + +*OpenUI *MediaType/Media Type: PickOne +*FoomaticRIPOption MediaType: enum CmdLine A +*OrderDependency: 150 AnySetup *MediaType +*DefaultMediaType: plain +*MediaType plain/Plain Paper: "%% FoomaticRIPOptionSetting: MediaType=plain" +*FoomaticRIPOptionSetting MediaType=plain: "-m1 " +*MediaType plain2/Plain Paper Side 2: "%% FoomaticRIPOptionSetting: MediaType=plain2" +*FoomaticRIPOptionSetting MediaType=plain2: "-m8 " +*MediaType bond/Bond: "%% FoomaticRIPOptionSetting: MediaType=bond" +*FoomaticRIPOptionSetting MediaType=bond: "-m2 " +*MediaType bond2/Bond Side 2: "%% FoomaticRIPOptionSetting: MediaType=bond2" +*FoomaticRIPOptionSetting MediaType=bond2: "-m9 " +*MediaType envelope/Envelope: "%% FoomaticRIPOptionSetting: MediaType=envelope" +*FoomaticRIPOptionSetting MediaType=envelope: "-m6 " +*MediaType labels/Labels: "%% FoomaticRIPOptionSetting: MediaType=labels" +*FoomaticRIPOptionSetting MediaType=labels: "-m5 " +*MediaType lwcard/Light Weight Card: "%% FoomaticRIPOptionSetting: MediaType=lwcard" +*FoomaticRIPOptionSetting MediaType=lwcard: "-m3 " +*MediaType lwcard2/Light Weight Card Side 2: "%% FoomaticRIPOptionSetting: MediaType=lwcard2" +*FoomaticRIPOptionSetting MediaType=lwcard2: "-m10 " +*MediaType lwgcard/Light Weight Glossy Card: "%% FoomaticRIPOptionSetting: MediaType=lwgcard" +*FoomaticRIPOptionSetting MediaType=lwgcard: "-m4 " +*MediaType lwgcard2/Light Weight Glossy Card Side 2: "%% FoomaticRIPOptionSetting: MediaType=lwgcard2" +*FoomaticRIPOptionSetting MediaType=lwgcard2: "-m11 " +*MediaType recycled/Recycled Paper: "%% FoomaticRIPOptionSetting: MediaType=recycled" +*FoomaticRIPOptionSetting MediaType=recycled: "-m7 " +*MediaType recycled2/Recycled Paper Side 2: "%% FoomaticRIPOptionSetting: MediaType=recycled2" +*FoomaticRIPOptionSetting MediaType=recycled2: "-m12 " +*CloseUI: *MediaType + +*OpenUI *Copies/Copies: PickOne +*FoomaticRIPOption Copies: int CmdLine A +*FoomaticRIPOptionPrototype Copies: "-n%s " +*FoomaticRIPOptionRange Copies: 1 100 +*OrderDependency: 220 AnySetup *Copies +*DefaultCopies: 1 +*FoomaticRIPDefaultCopies: 1 +*Copies 1/1: "%% FoomaticRIPOptionSetting: Copies=1" +*Copies 2/2: "%% FoomaticRIPOptionSetting: Copies=2" +*Copies 3/3: "%% FoomaticRIPOptionSetting: Copies=3" +*Copies 4/4: "%% FoomaticRIPOptionSetting: Copies=4" +*Copies 5/5: "%% FoomaticRIPOptionSetting: Copies=5" +*Copies 6/6: "%% FoomaticRIPOptionSetting: Copies=6" +*Copies 7/7: "%% FoomaticRIPOptionSetting: Copies=7" +*Copies 8/8: "%% FoomaticRIPOptionSetting: Copies=8" +*Copies 9/9: "%% FoomaticRIPOptionSetting: Copies=9" +*Copies 10/10: "%% FoomaticRIPOptionSetting: Copies=10" +*Copies 11/11: "%% FoomaticRIPOptionSetting: Copies=11" +*Copies 12/12: "%% FoomaticRIPOptionSetting: Copies=12" +*Copies 13/13: "%% FoomaticRIPOptionSetting: Copies=13" +*Copies 14/14: "%% FoomaticRIPOptionSetting: Copies=14" +*Copies 15/15: "%% FoomaticRIPOptionSetting: Copies=15" +*Copies 16/16: "%% FoomaticRIPOptionSetting: Copies=16" +*Copies 17/17: "%% FoomaticRIPOptionSetting: Copies=17" +*Copies 18/18: "%% FoomaticRIPOptionSetting: Copies=18" +*Copies 19/19: "%% FoomaticRIPOptionSetting: Copies=19" +*Copies 20/20: "%% FoomaticRIPOptionSetting: Copies=20" +*Copies 21/21: "%% FoomaticRIPOptionSetting: Copies=21" +*Copies 22/22: "%% FoomaticRIPOptionSetting: Copies=22" +*Copies 23/23: "%% FoomaticRIPOptionSetting: Copies=23" +*Copies 24/24: "%% FoomaticRIPOptionSetting: Copies=24" +*Copies 25/25: "%% FoomaticRIPOptionSetting: Copies=25" +*Copies 26/26: "%% FoomaticRIPOptionSetting: Copies=26" +*Copies 27/27: "%% FoomaticRIPOptionSetting: Copies=27" +*Copies 28/28: "%% FoomaticRIPOptionSetting: Copies=28" +*Copies 29/29: "%% FoomaticRIPOptionSetting: Copies=29" +*Copies 30/30: "%% FoomaticRIPOptionSetting: Copies=30" +*Copies 31/31: "%% FoomaticRIPOptionSetting: Copies=31" +*Copies 32/32: "%% FoomaticRIPOptionSetting: Copies=32" +*Copies 33/33: "%% FoomaticRIPOptionSetting: Copies=33" +*Copies 34/34: "%% FoomaticRIPOptionSetting: Copies=34" +*Copies 35/35: "%% FoomaticRIPOptionSetting: Copies=35" +*Copies 36/36: "%% FoomaticRIPOptionSetting: Copies=36" +*Copies 37/37: "%% FoomaticRIPOptionSetting: Copies=37" +*Copies 38/38: "%% FoomaticRIPOptionSetting: Copies=38" +*Copies 39/39: "%% FoomaticRIPOptionSetting: Copies=39" +*Copies 40/40: "%% FoomaticRIPOptionSetting: Copies=40" +*Copies 41/41: "%% FoomaticRIPOptionSetting: Copies=41" +*Copies 42/42: "%% FoomaticRIPOptionSetting: Copies=42" +*Copies 43/43: "%% FoomaticRIPOptionSetting: Copies=43" +*Copies 44/44: "%% FoomaticRIPOptionSetting: Copies=44" +*Copies 45/45: "%% FoomaticRIPOptionSetting: Copies=45" +*Copies 46/46: "%% FoomaticRIPOptionSetting: Copies=46" +*Copies 47/47: "%% FoomaticRIPOptionSetting: Copies=47" +*Copies 48/48: "%% FoomaticRIPOptionSetting: Copies=48" +*Copies 49/49: "%% FoomaticRIPOptionSetting: Copies=49" +*Copies 50/50: "%% FoomaticRIPOptionSetting: Copies=50" +*Copies 51/51: "%% FoomaticRIPOptionSetting: Copies=51" +*Copies 52/52: "%% FoomaticRIPOptionSetting: Copies=52" +*Copies 53/53: "%% FoomaticRIPOptionSetting: Copies=53" +*Copies 54/54: "%% FoomaticRIPOptionSetting: Copies=54" +*Copies 55/55: "%% FoomaticRIPOptionSetting: Copies=55" +*Copies 56/56: "%% FoomaticRIPOptionSetting: Copies=56" +*Copies 57/57: "%% FoomaticRIPOptionSetting: Copies=57" +*Copies 58/58: "%% FoomaticRIPOptionSetting: Copies=58" +*Copies 59/59: "%% FoomaticRIPOptionSetting: Copies=59" +*Copies 60/60: "%% FoomaticRIPOptionSetting: Copies=60" +*Copies 61/61: "%% FoomaticRIPOptionSetting: Copies=61" +*Copies 62/62: "%% FoomaticRIPOptionSetting: Copies=62" +*Copies 63/63: "%% FoomaticRIPOptionSetting: Copies=63" +*Copies 64/64: "%% FoomaticRIPOptionSetting: Copies=64" +*Copies 65/65: "%% FoomaticRIPOptionSetting: Copies=65" +*Copies 66/66: "%% FoomaticRIPOptionSetting: Copies=66" +*Copies 67/67: "%% FoomaticRIPOptionSetting: Copies=67" +*Copies 68/68: "%% FoomaticRIPOptionSetting: Copies=68" +*Copies 69/69: "%% FoomaticRIPOptionSetting: Copies=69" +*Copies 70/70: "%% FoomaticRIPOptionSetting: Copies=70" +*Copies 71/71: "%% FoomaticRIPOptionSetting: Copies=71" +*Copies 72/72: "%% FoomaticRIPOptionSetting: Copies=72" +*Copies 73/73: "%% FoomaticRIPOptionSetting: Copies=73" +*Copies 74/74: "%% FoomaticRIPOptionSetting: Copies=74" +*Copies 75/75: "%% FoomaticRIPOptionSetting: Copies=75" +*Copies 76/76: "%% FoomaticRIPOptionSetting: Copies=76" +*Copies 77/77: "%% FoomaticRIPOptionSetting: Copies=77" +*Copies 78/78: "%% FoomaticRIPOptionSetting: Copies=78" +*Copies 79/79: "%% FoomaticRIPOptionSetting: Copies=79" +*Copies 80/80: "%% FoomaticRIPOptionSetting: Copies=80" +*Copies 81/81: "%% FoomaticRIPOptionSetting: Copies=81" +*Copies 82/82: "%% FoomaticRIPOptionSetting: Copies=82" +*Copies 83/83: "%% FoomaticRIPOptionSetting: Copies=83" +*Copies 84/84: "%% FoomaticRIPOptionSetting: Copies=84" +*Copies 85/85: "%% FoomaticRIPOptionSetting: Copies=85" +*Copies 86/86: "%% FoomaticRIPOptionSetting: Copies=86" +*Copies 87/87: "%% FoomaticRIPOptionSetting: Copies=87" +*Copies 88/88: "%% FoomaticRIPOptionSetting: Copies=88" +*Copies 89/89: "%% FoomaticRIPOptionSetting: Copies=89" +*Copies 90/90: "%% FoomaticRIPOptionSetting: Copies=90" +*Copies 91/91: "%% FoomaticRIPOptionSetting: Copies=91" +*Copies 92/92: "%% FoomaticRIPOptionSetting: Copies=92" +*Copies 93/93: "%% FoomaticRIPOptionSetting: Copies=93" +*Copies 94/94: "%% FoomaticRIPOptionSetting: Copies=94" +*Copies 95/95: "%% FoomaticRIPOptionSetting: Copies=95" +*Copies 96/96: "%% FoomaticRIPOptionSetting: Copies=96" +*Copies 97/97: "%% FoomaticRIPOptionSetting: Copies=97" +*Copies 98/98: "%% FoomaticRIPOptionSetting: Copies=98" +*Copies 99/99: "%% FoomaticRIPOptionSetting: Copies=99" +*Copies 100/100: "%% FoomaticRIPOptionSetting: Copies=100" +*CloseUI: *Copies + +*CloseGroup: General + +*OpenGroup: Adjustment/Adjustment + +*OpenUI *halftone/Halftone Algorithm: PickOne +*FoomaticRIPOption halftone: enum CmdLine A +*OrderDependency: 110 AnySetup *halftone +*Defaulthalftone: default +*halftone default/Default: "%% FoomaticRIPOptionSetting: halftone=default" +*FoomaticRIPOptionSetting halftone=default: " " +*halftone as/Accurate Screens (better): "%% FoomaticRIPOptionSetting: halftone=as" +*FoomaticRIPOptionSetting halftone=as: " -qas " +*halftone standard/Standard: "%% FoomaticRIPOptionSetting: halftone=standard" +*FoomaticRIPOptionSetting halftone=standard: " -q1 " +*halftone wts/Well Tempered Screens (best): "%% FoomaticRIPOptionSetting: halftone=wts" +*FoomaticRIPOptionSetting halftone=wts: " -qwts " +*CloseUI: *halftone + +*CloseGroup: Adjustment + +*OpenGroup: Miscellaneous/Miscellaneous + +*OpenUI *NupOrient/N-up Orientation: PickOne +*FoomaticRIPOption NupOrient: enum CmdLine A +*OrderDependency: 200 AnySetup *NupOrient +*DefaultNupOrient: port +*NupOrient land/Landscape: "%% FoomaticRIPOptionSetting: NupOrient=land" +*FoomaticRIPOptionSetting NupOrient=land: "-ol " +*NupOrient port/Portrait: "%% FoomaticRIPOptionSetting: NupOrient=port" +*FoomaticRIPOptionSetting NupOrient=port: " " +*NupOrient sea/Seascape: "%% FoomaticRIPOptionSetting: NupOrient=sea" +*FoomaticRIPOptionSetting NupOrient=sea: "-os " +*CloseUI: *NupOrient + +*OpenUI *NupPages/N-up Printing: PickOne +*FoomaticRIPOption NupPages: enum CmdLine A +*OrderDependency: 200 AnySetup *NupPages +*DefaultNupPages: 1up +*NupPages 1up/1-up: "%% FoomaticRIPOptionSetting: NupPages=1up" +*FoomaticRIPOptionSetting NupPages=1up: " " +*NupPages 2up/2-up: "%% FoomaticRIPOptionSetting: NupPages=2up" +*FoomaticRIPOptionSetting NupPages=2up: "-2 " +*NupPages 3up/3-up: "%% FoomaticRIPOptionSetting: NupPages=3up" +*FoomaticRIPOptionSetting NupPages=3up: "-3 " +*NupPages 4up/4-up: "%% FoomaticRIPOptionSetting: NupPages=4up" +*FoomaticRIPOptionSetting NupPages=4up: "-4 " +*NupPages 6up/6-up: "%% FoomaticRIPOptionSetting: NupPages=6up" +*FoomaticRIPOptionSetting NupPages=6up: "-6 " +*NupPages 8up/8-up: "%% FoomaticRIPOptionSetting: NupPages=8up" +*FoomaticRIPOptionSetting NupPages=8up: "-8 " +*NupPages 10up/10-up: "%% FoomaticRIPOptionSetting: NupPages=10up" +*FoomaticRIPOptionSetting NupPages=10up: "-10 " +*NupPages 12up/12-up: "%% FoomaticRIPOptionSetting: NupPages=12up" +*FoomaticRIPOptionSetting NupPages=12up: "-12 " +*NupPages 14up/14-up: "%% FoomaticRIPOptionSetting: NupPages=14up" +*FoomaticRIPOptionSetting NupPages=14up: "-14 " +*NupPages 15up/15-up: "%% FoomaticRIPOptionSetting: NupPages=15up" +*FoomaticRIPOptionSetting NupPages=15up: "-15 " +*NupPages 16up/16-up: "%% FoomaticRIPOptionSetting: NupPages=16up" +*FoomaticRIPOptionSetting NupPages=16up: "-16 " +*NupPages 18up/18-up: "%% FoomaticRIPOptionSetting: NupPages=18up" +*FoomaticRIPOptionSetting NupPages=18up: "-18 " +*CloseUI: *NupPages + +*CloseGroup: Miscellaneous + + +*% Generic boilerplate PPD stuff as standard PostScript fonts and so on + +*DefaultFont: Courier +*Font AvantGarde-Book: Standard "(001.006S)" Standard ROM +*Font AvantGarde-BookOblique: Standard "(001.006S)" Standard ROM +*Font AvantGarde-Demi: Standard "(001.007S)" Standard ROM +*Font AvantGarde-DemiOblique: Standard "(001.007S)" Standard ROM +*Font Bookman-Demi: Standard "(001.004S)" Standard ROM +*Font Bookman-DemiItalic: Standard "(001.004S)" Standard ROM +*Font Bookman-Light: Standard "(001.004S)" Standard ROM +*Font Bookman-LightItalic: Standard "(001.004S)" Standard ROM +*Font Courier: Standard "(002.004S)" Standard ROM +*Font Courier-Bold: Standard "(002.004S)" Standard ROM +*Font Courier-BoldOblique: Standard "(002.004S)" Standard ROM +*Font Courier-Oblique: Standard "(002.004S)" Standard ROM +*Font Helvetica: Standard "(001.006S)" Standard ROM +*Font Helvetica-Bold: Standard "(001.007S)" Standard ROM +*Font Helvetica-BoldOblique: Standard "(001.007S)" Standard ROM +*Font Helvetica-Narrow: Standard "(001.006S)" Standard ROM +*Font Helvetica-Narrow-Bold: Standard "(001.007S)" Standard ROM +*Font Helvetica-Narrow-BoldOblique: Standard "(001.007S)" Standard ROM +*Font Helvetica-Narrow-Oblique: Standard "(001.006S)" Standard ROM +*Font Helvetica-Oblique: Standard "(001.006S)" Standard ROM +*Font NewCenturySchlbk-Bold: Standard "(001.009S)" Standard ROM +*Font NewCenturySchlbk-BoldItalic: Standard "(001.007S)" Standard ROM +*Font NewCenturySchlbk-Italic: Standard "(001.006S)" Standard ROM +*Font NewCenturySchlbk-Roman: Standard "(001.007S)" Standard ROM +*Font Palatino-Bold: Standard "(001.005S)" Standard ROM +*Font Palatino-BoldItalic: Standard "(001.005S)" Standard ROM +*Font Palatino-Italic: Standard "(001.005S)" Standard ROM +*Font Palatino-Roman: Standard "(001.005S)" Standard ROM +*Font Symbol: Special "(001.007S)" Special ROM +*Font Times-Bold: Standard "(001.007S)" Standard ROM +*Font Times-BoldItalic: Standard "(001.009S)" Standard ROM +*Font Times-Italic: Standard "(001.007S)" Standard ROM +*Font Times-Roman: Standard "(001.007S)" Standard ROM +*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM +*Font ZapfDingbats: Special "(001.004S)" Standard ROM + diff -Nru foo2zjs-20160313dfsg0/PPD/Xerox-Phaser_3040.ppd foo2zjs-20160902dfsg0/PPD/Xerox-Phaser_3040.ppd --- foo2zjs-20160313dfsg0/PPD/Xerox-Phaser_3040.ppd 1970-01-01 00:00:00.000000000 +0000 +++ foo2zjs-20160902dfsg0/PPD/Xerox-Phaser_3040.ppd 2016-10-04 09:39:59.000000000 +0000 @@ -0,0 +1,427 @@ +*PPD-Adobe: "4.3" +*% +*% For information on using this, and to obtain the required backend +*% script, consult http://www.openprinting.org/ +*% +*% This file is published under the GNU General Public License +*% +*% PPD-O-MATIC (3.0.0 or newer) generated this PPD file. It is for use with +*% all programs and environments which use PPD files for dealing with +*% printer capability information. The printer must be configured with the +*% "foomatic-rip" backend filter script of Foomatic 3.0.0 or newer. This +*% file and "foomatic-rip" work together to support PPD-controlled printer +*% driver option access with arbitrary free software printer drivers and +*% printing spoolers. +*% +*% To save this file on your disk, wait until the download has completed +*% (the animation of the browser logo must stop) and then use the +*% "Save as..." command in the "File" menu of your browser or in the +*% pop-up manu when you click on this document with the right mouse button. +*% DO NOT cut and paste this file into an editor with your mouse. This can +*% introduce additional line breaks which lead to unexpected results. +*% +*% You may save this file as 'Xerox-Phaser_3040-foo2hbpl2.ppd' +*% +*% +*FormatVersion: "4.3" +*FileVersion: "1.1" +*LanguageVersion: English +*LanguageEncoding: ISOLatin1 +*PCFileName: "FOO2HBPL.PPD" +*Manufacturer: "Xerox" +*Product: "(Phaser 3040)" +*cupsVersion: 1.0 +*cupsManualCopies: True +*cupsModelNumber: 2 +*cupsFilter: "application/vnd.cups-postscript 0 foomatic-rip" +*%pprRIP: foomatic-rip other +*ModelName: "Xerox Phaser 3040" +*ShortNickName: "Xerox Phaser 3040 foo2hbpl2" +*NickName: "Xerox Phaser 3040 Foomatic/foo2hbpl2 (recommended)" +*PSVersion: "(3010.000) 550" +*PSVersion: "(3010.000) 651" +*PSVersion: "(3010.000) 652" +*PSVersion: "(3010.000) 653" +*PSVersion: "(3010.000) 704" +*PSVersion: "(3010.000) 705" +*PSVersion: "(3010.000) 800" +*LanguageLevel: "3" +*ColorDevice: True +*DefaultColorSpace: RGB +*FileSystem: False +*Throughput: "1" +*LandscapeOrientation: Plus90 +*TTRasterizer: Type42 +*1284DeviceID: "DRV:Dfoo2hbpl2,R1,M0,TF;" + +*driverName foo2hbpl2/foo2hbpl2: "" +*driverType F/Filter: "" +*driverUrl: "http://foo2hbpl.rkkda.com/" +*driverObsolete: False + + + + +*HWMargins: 9 12.00 9 12 +*VariablePaperSize: True +*MaxMediaWidth: 100000 +*MaxMediaHeight: 100000 +*NonUIOrderDependency: 135 AnySetup *CustomPageSize +*CustomPageSize True: "pop pop pop pop pop +%% FoomaticRIPOptionSetting: PageSize=Custom" +*End +*FoomaticRIPOptionSetting PageSize=Custom: "-pCustom.%0x%1 " +*ParamCustomPageSize Width: 1 points 36 100000 +*ParamCustomPageSize Height: 2 points 36 100000 +*ParamCustomPageSize Orientation: 3 int 0 0 +*ParamCustomPageSize WidthOffset: 4 points 0 0 +*ParamCustomPageSize HeightOffset: 5 points 0 0 + +*FoomaticIDs: Xerox-Phaser_3040 foo2hbpl2 +*FoomaticRIPCommandLine: "foo2hbpl2-wrapper %A" + +*OpenGroup: General/General + +*OpenUI *Quality/Printing Quality: PickOne +*FoomaticRIPOption Quality: enum CmdLine A +*OrderDependency: 110 AnySetup *Quality +*DefaultQuality: normal +*Quality draft/Draft: "%% FoomaticRIPOptionSetting: Quality=draft" +*FoomaticRIPOptionSetting Quality=draft: " -t " +*Quality normal/Normal: "%% FoomaticRIPOptionSetting: Quality=normal" +*FoomaticRIPOptionSetting Quality=normal: " " +*CloseUI: *Quality + +*FoomaticRIPOption ColorMode: enum CmdLine A 120 +*FoomaticRIPOptionSetting ColorMode=Monochrome: " " + +*OpenUI *Resolution/Resolution: PickOne +*FoomaticRIPOption Resolution: enum CmdLine A +*OrderDependency: 130 AnySetup *Resolution +*DefaultResolution: 600x600dpi +*Resolution 600x600dpi/600x600 dpi: "%% FoomaticRIPOptionSetting: Resolution=600x600dpi" +*FoomaticRIPOptionSetting Resolution=600x600dpi: "-r600x600 " +*Resolution 1200x1200dpi/1200x1200 dpi: "%% FoomaticRIPOptionSetting: Resolution=1200x1200dpi" +*FoomaticRIPOptionSetting Resolution=1200x1200dpi: "-r1200x1200 " +*CloseUI: *Resolution + +*OpenUI *PageSize/Page Size: PickOne +*FoomaticRIPOption PageSize: enum CmdLine A +*OrderDependency: 135 AnySetup *PageSize +*DefaultPageSize: Letter +*PageSize Letter/Letter: "%% FoomaticRIPOptionSetting: PageSize=Letter" +*FoomaticRIPOptionSetting PageSize=Letter: "-p4 " +*PageSize A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4" +*FoomaticRIPOptionSetting PageSize=A4: "-p1 " +*PageSize A5/A5: "%% FoomaticRIPOptionSetting: PageSize=A5" +*FoomaticRIPOptionSetting PageSize=A5: "-p3 " +*PageSize B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis" +*FoomaticRIPOptionSetting PageSize=B5jis: "-p2 " +*PageSize Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10" +*FoomaticRIPOptionSetting PageSize=Env10: "-p9 " +*PageSize EnvC5/Env C5: "%% FoomaticRIPOptionSetting: PageSize=EnvC5" +*FoomaticRIPOptionSetting PageSize=EnvC5: "-p11 " +*PageSize EnvDL/Env DL: "%% FoomaticRIPOptionSetting: PageSize=EnvDL" +*FoomaticRIPOptionSetting PageSize=EnvDL: "-p12 " +*PageSize EnvMonarch/Env Monarch: "%% FoomaticRIPOptionSetting: PageSize=EnvMonarch" +*FoomaticRIPOptionSetting PageSize=EnvMonarch: "-p10 " +*PageSize Executive/Executive: "%% FoomaticRIPOptionSetting: PageSize=Executive" +*FoomaticRIPOptionSetting PageSize=Executive: "-p5 " +*PageSize FanfoldGermanLegal/Fanfold German Legal: "%% FoomaticRIPOptionSetting: PageSize=FanfoldGermanLegal" +*FoomaticRIPOptionSetting PageSize=FanfoldGermanLegal: "-p6 " +*PageSize Folio/Folio: "%% FoomaticRIPOptionSetting: PageSize=Folio" +*FoomaticRIPOptionSetting PageSize=Folio: "-p6 " +*PageSize Legal/Legal: "%% FoomaticRIPOptionSetting: PageSize=Legal" +*FoomaticRIPOptionSetting PageSize=Legal: "-p7 " +*CloseUI: *PageSize + +*OpenUI *PageRegion: PickOne +*OrderDependency: 135 AnySetup *PageRegion +*DefaultPageRegion: Letter +*PageRegion Letter/Letter: "%% FoomaticRIPOptionSetting: PageSize=Letter" +*PageRegion A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4" +*PageRegion A5/A5: "%% FoomaticRIPOptionSetting: PageSize=A5" +*PageRegion B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis" +*PageRegion Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10" +*PageRegion EnvC5/Env C5: "%% FoomaticRIPOptionSetting: PageSize=EnvC5" +*PageRegion EnvDL/Env DL: "%% FoomaticRIPOptionSetting: PageSize=EnvDL" +*PageRegion EnvMonarch/Env Monarch: "%% FoomaticRIPOptionSetting: PageSize=EnvMonarch" +*PageRegion Executive/Executive: "%% FoomaticRIPOptionSetting: PageSize=Executive" +*PageRegion FanfoldGermanLegal/Fanfold German Legal: "%% FoomaticRIPOptionSetting: PageSize=FanfoldGermanLegal" +*PageRegion Folio/Folio: "%% FoomaticRIPOptionSetting: PageSize=Folio" +*PageRegion Legal/Legal: "%% FoomaticRIPOptionSetting: PageSize=Legal" +*CloseUI: *PageRegion + +*DefaultImageableArea: Letter +*ImageableArea Letter/Letter: "9 12.00 603 780.00" +*ImageableArea A4/A4: "9 12.00 586 830.00" +*ImageableArea A5/A5: "9 12.00 411 583.00" +*ImageableArea B5jis/B5 (JIS): "9 12.00 509 715.00" +*ImageableArea Env10/Env #10: "9 12.00 288 672.00" +*ImageableArea EnvC5/Env C5: "9 12.00 450 637.00" +*ImageableArea EnvDL/Env DL: "9 12.00 302 611.00" +*ImageableArea EnvMonarch/Env Monarch: "9 12.00 270 528.00" +*ImageableArea Executive/Executive: "9 12.00 513 744.00" +*ImageableArea FanfoldGermanLegal/Fanfold German Legal: "9 12.00 603 996.00" +*ImageableArea Folio/Folio: "9 12.00 603 924.00" +*ImageableArea Legal/Legal: "9 12.00 603 996.00" + +*DefaultPaperDimension: Letter +*PaperDimension Letter/Letter: "612 792" +*PaperDimension A4/A4: "595 842" +*PaperDimension A5/A5: "420 595" +*PaperDimension B5jis/B5 (JIS): "518 727" +*PaperDimension Env10/Env #10: "297 684" +*PaperDimension EnvC5/Env C5: "459 649" +*PaperDimension EnvDL/Env DL: "311 623" +*PaperDimension EnvMonarch/Env Monarch: "279 540" +*PaperDimension Executive/Executive: "522 756" +*PaperDimension FanfoldGermanLegal/Fanfold German Legal: "612 1008" +*PaperDimension Folio/Folio: "612 936" +*PaperDimension Legal/Legal: "612 1008" + +*OpenUI *MediaType/Media Type: PickOne +*FoomaticRIPOption MediaType: enum CmdLine A +*OrderDependency: 150 AnySetup *MediaType +*DefaultMediaType: plain +*MediaType plain/Plain Paper: "%% FoomaticRIPOptionSetting: MediaType=plain" +*FoomaticRIPOptionSetting MediaType=plain: "-m1 " +*MediaType plain2/Plain Paper Side 2: "%% FoomaticRIPOptionSetting: MediaType=plain2" +*FoomaticRIPOptionSetting MediaType=plain2: "-m8 " +*MediaType bond/Bond: "%% FoomaticRIPOptionSetting: MediaType=bond" +*FoomaticRIPOptionSetting MediaType=bond: "-m2 " +*MediaType bond2/Bond Side 2: "%% FoomaticRIPOptionSetting: MediaType=bond2" +*FoomaticRIPOptionSetting MediaType=bond2: "-m9 " +*MediaType envelope/Envelope: "%% FoomaticRIPOptionSetting: MediaType=envelope" +*FoomaticRIPOptionSetting MediaType=envelope: "-m6 " +*MediaType labels/Labels: "%% FoomaticRIPOptionSetting: MediaType=labels" +*FoomaticRIPOptionSetting MediaType=labels: "-m5 " +*MediaType lwcard/Light Weight Card: "%% FoomaticRIPOptionSetting: MediaType=lwcard" +*FoomaticRIPOptionSetting MediaType=lwcard: "-m3 " +*MediaType lwcard2/Light Weight Card Side 2: "%% FoomaticRIPOptionSetting: MediaType=lwcard2" +*FoomaticRIPOptionSetting MediaType=lwcard2: "-m10 " +*MediaType lwgcard/Light Weight Glossy Card: "%% FoomaticRIPOptionSetting: MediaType=lwgcard" +*FoomaticRIPOptionSetting MediaType=lwgcard: "-m4 " +*MediaType lwgcard2/Light Weight Glossy Card Side 2: "%% FoomaticRIPOptionSetting: MediaType=lwgcard2" +*FoomaticRIPOptionSetting MediaType=lwgcard2: "-m11 " +*MediaType recycled/Recycled Paper: "%% FoomaticRIPOptionSetting: MediaType=recycled" +*FoomaticRIPOptionSetting MediaType=recycled: "-m7 " +*MediaType recycled2/Recycled Paper Side 2: "%% FoomaticRIPOptionSetting: MediaType=recycled2" +*FoomaticRIPOptionSetting MediaType=recycled2: "-m12 " +*CloseUI: *MediaType + +*OpenUI *Copies/Copies: PickOne +*FoomaticRIPOption Copies: int CmdLine A +*FoomaticRIPOptionPrototype Copies: "-n%s " +*FoomaticRIPOptionRange Copies: 1 100 +*OrderDependency: 220 AnySetup *Copies +*DefaultCopies: 1 +*FoomaticRIPDefaultCopies: 1 +*Copies 1/1: "%% FoomaticRIPOptionSetting: Copies=1" +*Copies 2/2: "%% FoomaticRIPOptionSetting: Copies=2" +*Copies 3/3: "%% FoomaticRIPOptionSetting: Copies=3" +*Copies 4/4: "%% FoomaticRIPOptionSetting: Copies=4" +*Copies 5/5: "%% FoomaticRIPOptionSetting: Copies=5" +*Copies 6/6: "%% FoomaticRIPOptionSetting: Copies=6" +*Copies 7/7: "%% FoomaticRIPOptionSetting: Copies=7" +*Copies 8/8: "%% FoomaticRIPOptionSetting: Copies=8" +*Copies 9/9: "%% FoomaticRIPOptionSetting: Copies=9" +*Copies 10/10: "%% FoomaticRIPOptionSetting: Copies=10" +*Copies 11/11: "%% FoomaticRIPOptionSetting: Copies=11" +*Copies 12/12: "%% FoomaticRIPOptionSetting: Copies=12" +*Copies 13/13: "%% FoomaticRIPOptionSetting: Copies=13" +*Copies 14/14: "%% FoomaticRIPOptionSetting: Copies=14" +*Copies 15/15: "%% FoomaticRIPOptionSetting: Copies=15" +*Copies 16/16: "%% FoomaticRIPOptionSetting: Copies=16" +*Copies 17/17: "%% FoomaticRIPOptionSetting: Copies=17" +*Copies 18/18: "%% FoomaticRIPOptionSetting: Copies=18" +*Copies 19/19: "%% FoomaticRIPOptionSetting: Copies=19" +*Copies 20/20: "%% FoomaticRIPOptionSetting: Copies=20" +*Copies 21/21: "%% FoomaticRIPOptionSetting: Copies=21" +*Copies 22/22: "%% FoomaticRIPOptionSetting: Copies=22" +*Copies 23/23: "%% FoomaticRIPOptionSetting: Copies=23" +*Copies 24/24: "%% FoomaticRIPOptionSetting: Copies=24" +*Copies 25/25: "%% FoomaticRIPOptionSetting: Copies=25" +*Copies 26/26: "%% FoomaticRIPOptionSetting: Copies=26" +*Copies 27/27: "%% FoomaticRIPOptionSetting: Copies=27" +*Copies 28/28: "%% FoomaticRIPOptionSetting: Copies=28" +*Copies 29/29: "%% FoomaticRIPOptionSetting: Copies=29" +*Copies 30/30: "%% FoomaticRIPOptionSetting: Copies=30" +*Copies 31/31: "%% FoomaticRIPOptionSetting: Copies=31" +*Copies 32/32: "%% FoomaticRIPOptionSetting: Copies=32" +*Copies 33/33: "%% FoomaticRIPOptionSetting: Copies=33" +*Copies 34/34: "%% FoomaticRIPOptionSetting: Copies=34" +*Copies 35/35: "%% FoomaticRIPOptionSetting: Copies=35" +*Copies 36/36: "%% FoomaticRIPOptionSetting: Copies=36" +*Copies 37/37: "%% FoomaticRIPOptionSetting: Copies=37" +*Copies 38/38: "%% FoomaticRIPOptionSetting: Copies=38" +*Copies 39/39: "%% FoomaticRIPOptionSetting: Copies=39" +*Copies 40/40: "%% FoomaticRIPOptionSetting: Copies=40" +*Copies 41/41: "%% FoomaticRIPOptionSetting: Copies=41" +*Copies 42/42: "%% FoomaticRIPOptionSetting: Copies=42" +*Copies 43/43: "%% FoomaticRIPOptionSetting: Copies=43" +*Copies 44/44: "%% FoomaticRIPOptionSetting: Copies=44" +*Copies 45/45: "%% FoomaticRIPOptionSetting: Copies=45" +*Copies 46/46: "%% FoomaticRIPOptionSetting: Copies=46" +*Copies 47/47: "%% FoomaticRIPOptionSetting: Copies=47" +*Copies 48/48: "%% FoomaticRIPOptionSetting: Copies=48" +*Copies 49/49: "%% FoomaticRIPOptionSetting: Copies=49" +*Copies 50/50: "%% FoomaticRIPOptionSetting: Copies=50" +*Copies 51/51: "%% FoomaticRIPOptionSetting: Copies=51" +*Copies 52/52: "%% FoomaticRIPOptionSetting: Copies=52" +*Copies 53/53: "%% FoomaticRIPOptionSetting: Copies=53" +*Copies 54/54: "%% FoomaticRIPOptionSetting: Copies=54" +*Copies 55/55: "%% FoomaticRIPOptionSetting: Copies=55" +*Copies 56/56: "%% FoomaticRIPOptionSetting: Copies=56" +*Copies 57/57: "%% FoomaticRIPOptionSetting: Copies=57" +*Copies 58/58: "%% FoomaticRIPOptionSetting: Copies=58" +*Copies 59/59: "%% FoomaticRIPOptionSetting: Copies=59" +*Copies 60/60: "%% FoomaticRIPOptionSetting: Copies=60" +*Copies 61/61: "%% FoomaticRIPOptionSetting: Copies=61" +*Copies 62/62: "%% FoomaticRIPOptionSetting: Copies=62" +*Copies 63/63: "%% FoomaticRIPOptionSetting: Copies=63" +*Copies 64/64: "%% FoomaticRIPOptionSetting: Copies=64" +*Copies 65/65: "%% FoomaticRIPOptionSetting: Copies=65" +*Copies 66/66: "%% FoomaticRIPOptionSetting: Copies=66" +*Copies 67/67: "%% FoomaticRIPOptionSetting: Copies=67" +*Copies 68/68: "%% FoomaticRIPOptionSetting: Copies=68" +*Copies 69/69: "%% FoomaticRIPOptionSetting: Copies=69" +*Copies 70/70: "%% FoomaticRIPOptionSetting: Copies=70" +*Copies 71/71: "%% FoomaticRIPOptionSetting: Copies=71" +*Copies 72/72: "%% FoomaticRIPOptionSetting: Copies=72" +*Copies 73/73: "%% FoomaticRIPOptionSetting: Copies=73" +*Copies 74/74: "%% FoomaticRIPOptionSetting: Copies=74" +*Copies 75/75: "%% FoomaticRIPOptionSetting: Copies=75" +*Copies 76/76: "%% FoomaticRIPOptionSetting: Copies=76" +*Copies 77/77: "%% FoomaticRIPOptionSetting: Copies=77" +*Copies 78/78: "%% FoomaticRIPOptionSetting: Copies=78" +*Copies 79/79: "%% FoomaticRIPOptionSetting: Copies=79" +*Copies 80/80: "%% FoomaticRIPOptionSetting: Copies=80" +*Copies 81/81: "%% FoomaticRIPOptionSetting: Copies=81" +*Copies 82/82: "%% FoomaticRIPOptionSetting: Copies=82" +*Copies 83/83: "%% FoomaticRIPOptionSetting: Copies=83" +*Copies 84/84: "%% FoomaticRIPOptionSetting: Copies=84" +*Copies 85/85: "%% FoomaticRIPOptionSetting: Copies=85" +*Copies 86/86: "%% FoomaticRIPOptionSetting: Copies=86" +*Copies 87/87: "%% FoomaticRIPOptionSetting: Copies=87" +*Copies 88/88: "%% FoomaticRIPOptionSetting: Copies=88" +*Copies 89/89: "%% FoomaticRIPOptionSetting: Copies=89" +*Copies 90/90: "%% FoomaticRIPOptionSetting: Copies=90" +*Copies 91/91: "%% FoomaticRIPOptionSetting: Copies=91" +*Copies 92/92: "%% FoomaticRIPOptionSetting: Copies=92" +*Copies 93/93: "%% FoomaticRIPOptionSetting: Copies=93" +*Copies 94/94: "%% FoomaticRIPOptionSetting: Copies=94" +*Copies 95/95: "%% FoomaticRIPOptionSetting: Copies=95" +*Copies 96/96: "%% FoomaticRIPOptionSetting: Copies=96" +*Copies 97/97: "%% FoomaticRIPOptionSetting: Copies=97" +*Copies 98/98: "%% FoomaticRIPOptionSetting: Copies=98" +*Copies 99/99: "%% FoomaticRIPOptionSetting: Copies=99" +*Copies 100/100: "%% FoomaticRIPOptionSetting: Copies=100" +*CloseUI: *Copies + +*CloseGroup: General + +*OpenGroup: Adjustment/Adjustment + +*OpenUI *halftone/Halftone Algorithm: PickOne +*FoomaticRIPOption halftone: enum CmdLine A +*OrderDependency: 110 AnySetup *halftone +*Defaulthalftone: default +*halftone default/Default: "%% FoomaticRIPOptionSetting: halftone=default" +*FoomaticRIPOptionSetting halftone=default: " " +*halftone as/Accurate Screens (better): "%% FoomaticRIPOptionSetting: halftone=as" +*FoomaticRIPOptionSetting halftone=as: " -qas " +*halftone standard/Standard: "%% FoomaticRIPOptionSetting: halftone=standard" +*FoomaticRIPOptionSetting halftone=standard: " -q1 " +*halftone wts/Well Tempered Screens (best): "%% FoomaticRIPOptionSetting: halftone=wts" +*FoomaticRIPOptionSetting halftone=wts: " -qwts " +*CloseUI: *halftone + +*CloseGroup: Adjustment + +*OpenGroup: Miscellaneous/Miscellaneous + +*OpenUI *NupOrient/N-up Orientation: PickOne +*FoomaticRIPOption NupOrient: enum CmdLine A +*OrderDependency: 200 AnySetup *NupOrient +*DefaultNupOrient: port +*NupOrient land/Landscape: "%% FoomaticRIPOptionSetting: NupOrient=land" +*FoomaticRIPOptionSetting NupOrient=land: "-ol " +*NupOrient port/Portrait: "%% FoomaticRIPOptionSetting: NupOrient=port" +*FoomaticRIPOptionSetting NupOrient=port: " " +*NupOrient sea/Seascape: "%% FoomaticRIPOptionSetting: NupOrient=sea" +*FoomaticRIPOptionSetting NupOrient=sea: "-os " +*CloseUI: *NupOrient + +*OpenUI *NupPages/N-up Printing: PickOne +*FoomaticRIPOption NupPages: enum CmdLine A +*OrderDependency: 200 AnySetup *NupPages +*DefaultNupPages: 1up +*NupPages 1up/1-up: "%% FoomaticRIPOptionSetting: NupPages=1up" +*FoomaticRIPOptionSetting NupPages=1up: " " +*NupPages 2up/2-up: "%% FoomaticRIPOptionSetting: NupPages=2up" +*FoomaticRIPOptionSetting NupPages=2up: "-2 " +*NupPages 3up/3-up: "%% FoomaticRIPOptionSetting: NupPages=3up" +*FoomaticRIPOptionSetting NupPages=3up: "-3 " +*NupPages 4up/4-up: "%% FoomaticRIPOptionSetting: NupPages=4up" +*FoomaticRIPOptionSetting NupPages=4up: "-4 " +*NupPages 6up/6-up: "%% FoomaticRIPOptionSetting: NupPages=6up" +*FoomaticRIPOptionSetting NupPages=6up: "-6 " +*NupPages 8up/8-up: "%% FoomaticRIPOptionSetting: NupPages=8up" +*FoomaticRIPOptionSetting NupPages=8up: "-8 " +*NupPages 10up/10-up: "%% FoomaticRIPOptionSetting: NupPages=10up" +*FoomaticRIPOptionSetting NupPages=10up: "-10 " +*NupPages 12up/12-up: "%% FoomaticRIPOptionSetting: NupPages=12up" +*FoomaticRIPOptionSetting NupPages=12up: "-12 " +*NupPages 14up/14-up: "%% FoomaticRIPOptionSetting: NupPages=14up" +*FoomaticRIPOptionSetting NupPages=14up: "-14 " +*NupPages 15up/15-up: "%% FoomaticRIPOptionSetting: NupPages=15up" +*FoomaticRIPOptionSetting NupPages=15up: "-15 " +*NupPages 16up/16-up: "%% FoomaticRIPOptionSetting: NupPages=16up" +*FoomaticRIPOptionSetting NupPages=16up: "-16 " +*NupPages 18up/18-up: "%% FoomaticRIPOptionSetting: NupPages=18up" +*FoomaticRIPOptionSetting NupPages=18up: "-18 " +*CloseUI: *NupPages + +*CloseGroup: Miscellaneous + + +*% Generic boilerplate PPD stuff as standard PostScript fonts and so on + +*DefaultFont: Courier +*Font AvantGarde-Book: Standard "(001.006S)" Standard ROM +*Font AvantGarde-BookOblique: Standard "(001.006S)" Standard ROM +*Font AvantGarde-Demi: Standard "(001.007S)" Standard ROM +*Font AvantGarde-DemiOblique: Standard "(001.007S)" Standard ROM +*Font Bookman-Demi: Standard "(001.004S)" Standard ROM +*Font Bookman-DemiItalic: Standard "(001.004S)" Standard ROM +*Font Bookman-Light: Standard "(001.004S)" Standard ROM +*Font Bookman-LightItalic: Standard "(001.004S)" Standard ROM +*Font Courier: Standard "(002.004S)" Standard ROM +*Font Courier-Bold: Standard "(002.004S)" Standard ROM +*Font Courier-BoldOblique: Standard "(002.004S)" Standard ROM +*Font Courier-Oblique: Standard "(002.004S)" Standard ROM +*Font Helvetica: Standard "(001.006S)" Standard ROM +*Font Helvetica-Bold: Standard "(001.007S)" Standard ROM +*Font Helvetica-BoldOblique: Standard "(001.007S)" Standard ROM +*Font Helvetica-Narrow: Standard "(001.006S)" Standard ROM +*Font Helvetica-Narrow-Bold: Standard "(001.007S)" Standard ROM +*Font Helvetica-Narrow-BoldOblique: Standard "(001.007S)" Standard ROM +*Font Helvetica-Narrow-Oblique: Standard "(001.006S)" Standard ROM +*Font Helvetica-Oblique: Standard "(001.006S)" Standard ROM +*Font NewCenturySchlbk-Bold: Standard "(001.009S)" Standard ROM +*Font NewCenturySchlbk-BoldItalic: Standard "(001.007S)" Standard ROM +*Font NewCenturySchlbk-Italic: Standard "(001.006S)" Standard ROM +*Font NewCenturySchlbk-Roman: Standard "(001.007S)" Standard ROM +*Font Palatino-Bold: Standard "(001.005S)" Standard ROM +*Font Palatino-BoldItalic: Standard "(001.005S)" Standard ROM +*Font Palatino-Italic: Standard "(001.005S)" Standard ROM +*Font Palatino-Roman: Standard "(001.005S)" Standard ROM +*Font Symbol: Special "(001.007S)" Special ROM +*Font Times-Bold: Standard "(001.007S)" Standard ROM +*Font Times-BoldItalic: Standard "(001.009S)" Standard ROM +*Font Times-Italic: Standard "(001.007S)" Standard ROM +*Font Times-Roman: Standard "(001.007S)" Standard ROM +*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM +*Font ZapfDingbats: Special "(001.004S)" Standard ROM + diff -Nru foo2zjs-20160313dfsg0/README foo2zjs-20160902dfsg0/README --- foo2zjs-20160313dfsg0/README 2016-04-25 19:28:24.000000000 +0000 +++ foo2zjs-20160902dfsg0/README 2016-10-04 09:39:59.000000000 +0000 @@ -144,6 +144,8 @@ - Fuji Xerox DocuPrint CM215 Multifunction Color Printer - Fuji Xerox DocuPrint M215 - Fuji Xerox DocuPrint P205 + - Xerox Phaser 3010 + - Xerox Phaser 3040 - Xerox WorkCentre 3045 Multifunction Monochrome Printer - Xerox WorkCentre 6015 Multifunction Color Printer diff -Nru foo2zjs-20160313dfsg0/README.in foo2zjs-20160902dfsg0/README.in --- foo2zjs-20160313dfsg0/README.in 2016-04-25 19:28:24.000000000 +0000 +++ foo2zjs-20160902dfsg0/README.in 2016-10-04 09:39:59.000000000 +0000 @@ -144,6 +144,8 @@ - Fuji Xerox DocuPrint CM215 Multifunction Color Printer - Fuji Xerox DocuPrint M215 - Fuji Xerox DocuPrint P205 + - Xerox Phaser 3010 + - Xerox Phaser 3040 - Xerox WorkCentre 3045 Multifunction Monochrome Printer - Xerox WorkCentre 6015 Multifunction Color Printer