diff options
| author | Didier Raboud <odyx@debian.org> | 2020-01-18 12:19:22 +0100 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2020-01-18 12:19:22 +0100 |
| commit | ff60faca777dfbc5dcf1167a2a1536af0be5fa89 (patch) | |
| tree | 6e0be53f26bd4f606dbb7b0712e26d8ac09516b5 | |
| parent | 06734e996ccb2f0322fe14edc91a499eb6a76bf7 (diff) | |
git-debrebase convert-from-dgit-view: drop upstream changes from breakwater
Drop upstream changes, and delete debian/patches, as part of converting
to git-debrebase format. Upstream changes will appear as commits.
[git-debrebase convert-from-dgit-view drop-patches]
73 files changed, 413 insertions, 4102 deletions
@@ -17,7 +17,9 @@ SYSNAME := $(shell uname -n) VERSION=0.0 # Installation prefix... +PREFIX=/usr/local PREFIX=/usr +PREFIX=$(DESTDIR)/usr # Pathnames for this package... BIN=$(PREFIX)/bin @@ -37,7 +39,7 @@ INSTALL=install ROOT=root # Pathnames for referenced packages... -FOODB=$(DESTDIR)/share/foomatic/db/source +FOODB=$(DESTDIR)/usr/share/foomatic/db/source # User ID's LPuid=-oroot @@ -80,8 +82,6 @@ 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 @@ -128,6 +128,10 @@ FILES = \ Makefile \ foo2zjs.c \ foo2zjs.1in \ + jbig.c \ + jbig.h \ + jbig_ar.c \ + jbig_ar.h \ zjsdecode.c \ zjsdecode.1in \ zjs.h \ @@ -194,6 +198,13 @@ 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 \ @@ -284,7 +295,7 @@ MANPAGES+= foo2ddst-wrapper.1 foo2ddst.1 ddstdecode.1 MANPAGES+= gipddecode.1 MANPAGES+= foo2zjs-pstops.1 arm2hpdl.1 usb_printerid.1 MANPAGES+= printer-profile.1 -LIBJBG = -ljbig +LIBJBG = jbig.o jbig_ar.o BINPROGS= ifeq ($(UNAME),Linux) @@ -384,7 +395,7 @@ JBGOPTS=-m 16 -d 0 -p 92 # Equivalent options for pbmtojbg # The usual build rules # all: all-test $(PROGS) $(BINPROGS) $(SHELLS) getweb \ - all-osx-hotplug man doc \ + all-icc2ps all-osx-hotplug man doc \ all-done all-test: @@ -399,6 +410,15 @@ all-test: echo " ***"; \ exit 1; \ fi + @if ! test -f /usr/include/stdio.h; then \ + echo " ***"; \ + echo " *** Error: /usr/include/stdio.h is not installed!"; \ + echo " ***"; \ + echo " *** Install Software Development (gcc) package"; \ + echo " *** for Ubuntu: sudo apt-get install build-essential"; \ + echo " ***"; \ + exit 1; \ + fi @if ! type gs >/dev/null 2>&1; then \ echo " ***"; \ echo " *** Error: gs is not installed!"; \ @@ -448,34 +468,34 @@ all-done: foo2ddst: foo2ddst.o $(LIBJBG) - $(CC) $(CFLAGS) -o $@ foo2ddst.o $(LIBJBG) $(LDFLAGS) + $(CC) $(CFLAGS) -o $@ foo2ddst.o $(LIBJBG) foo2hbpl2: foo2hbpl2.o $(LIBJBG) - $(CC) $(CFLAGS) -o $@ foo2hbpl2.o $(LIBJBG) $(LDFLAGS) + $(CC) $(CFLAGS) -o $@ foo2hbpl2.o $(LIBJBG) foo2hp: foo2hp.o $(LIBJBG) - $(CC) $(CFLAGS) -o $@ foo2hp.o $(LIBJBG) $(LDFLAGS) + $(CC) $(CFLAGS) -o $@ foo2hp.o $(LIBJBG) foo2hiperc: foo2hiperc.o $(LIBJBG) - $(CC) $(CFLAGS) -o $@ foo2hiperc.o $(LIBJBG) $(LDFLAGS) + $(CC) $(CFLAGS) -o $@ foo2hiperc.o $(LIBJBG) foo2lava: foo2lava.o $(LIBJBG) - $(CC) $(CFLAGS) -o $@ foo2lava.o $(LIBJBG) $(LDFLAGS) + $(CC) $(CFLAGS) -o $@ foo2lava.o $(LIBJBG) foo2oak: foo2oak.o $(LIBJBG) - $(CC) $(CFLAGS) -o $@ foo2oak.o $(LIBJBG) $(LDFLAGS) + $(CC) $(CFLAGS) -o $@ foo2oak.o $(LIBJBG) foo2qpdl: foo2qpdl.o $(LIBJBG) - $(CC) $(CFLAGS) -o $@ foo2qpdl.o $(LIBJBG) $(LDFLAGS) + $(CC) $(CFLAGS) -o $@ foo2qpdl.o $(LIBJBG) foo2slx: foo2slx.o $(LIBJBG) - $(CC) $(CFLAGS) -o $@ foo2slx.o $(LIBJBG) $(LDFLAGS) + $(CC) $(CFLAGS) -o $@ foo2slx.o $(LIBJBG) foo2xqx: foo2xqx.o $(LIBJBG) - $(CC) $(CFLAGS) -o $@ foo2xqx.o $(LIBJBG) $(LDFLAGS) + $(CC) $(CFLAGS) -o $@ foo2xqx.o $(LIBJBG) foo2zjs: foo2zjs.o $(LIBJBG) - $(CC) $(CFLAGS) -o $@ foo2zjs.o $(LIBJBG) $(LDFLAGS) + $(CC) $(CFLAGS) -o $@ foo2zjs.o $(LIBJBG) foo2ddst-wrapper: foo2ddst-wrapper.in Makefile @@ -561,54 +581,54 @@ ifeq ($(UNAME),Darwin) endif ok: ok.o $(LIBJBG) - $(CC) $(CFLAGS) ok.o $(LIBJBG) -o $@ $(LDFLAGS) + $(CC) $(CFLAGS) ok.o $(LIBJBG) -o $@ ddstdecode: ddstdecode.o $(LIBJBG) - $(CC) $(CFLAGS) ddstdecode.o $(LIBJBG) -o $@ $(LDFLAGS) + $(CC) $(CFLAGS) ddstdecode.o $(LIBJBG) -o $@ gipddecode: gipddecode.o $(LIBJBG) - $(CC) $(CFLAGS) gipddecode.o $(LIBJBG) -o $@ $(LDFLAGS) + $(CC) $(CFLAGS) gipddecode.o $(LIBJBG) -o $@ hbpldecode: hbpldecode.o $(LIBJBG) - $(CC) $(CFLAGS) hbpldecode.o $(LIBJBG) -o $@ $(LDFLAGS) + $(CC) $(CFLAGS) hbpldecode.o $(LIBJBG) -o $@ hipercdecode: hipercdecode.o $(LIBJBG) - $(CC) $(CFLAGS) hipercdecode.o $(LIBJBG) -o $@ $(LDFLAGS) + $(CC) $(CFLAGS) hipercdecode.o $(LIBJBG) -o $@ lavadecode: lavadecode.o $(LIBJBG) - $(CC) $(CFLAGS) lavadecode.o $(LIBJBG) -o $@ $(LDFLAGS) + $(CC) $(CFLAGS) lavadecode.o $(LIBJBG) -o $@ oakdecode: oakdecode.o $(LIBJBG) - $(CC) $(CFLAGS) -g oakdecode.o $(LIBJBG) -o $@ $(LDFLAGS) + $(CC) $(CFLAGS) -g oakdecode.o $(LIBJBG) -o $@ opldecode: opldecode.o $(LIBJBG) - $(CC) $(CFLAGS) -g opldecode.o $(LIBJBG) -o $@ $(LDFLAGS) + $(CC) $(CFLAGS) -g opldecode.o $(LIBJBG) -o $@ qpdldecode: qpdldecode.o $(LIBJBG) - $(CC) $(CFLAGS) qpdldecode.o $(LIBJBG) -o $@ $(LDFLAGS) + $(CC) $(CFLAGS) qpdldecode.o $(LIBJBG) -o $@ splcdecode: splcdecode.o $(LIBJBG) - $(CC) $(CFLAGS) splcdecode.o $(LIBJBG) -lz -o $@ $(LDFLAGS) + $(CC) $(CFLAGS) splcdecode.o $(LIBJBG) -lz -o $@ slxdecode: slxdecode.o $(LIBJBG) - $(CC) $(CFLAGS) slxdecode.o $(LIBJBG) -o $@ $(LDFLAGS) + $(CC) $(CFLAGS) slxdecode.o $(LIBJBG) -o $@ xqxdecode: xqxdecode.o $(LIBJBG) - $(CC) $(CFLAGS) xqxdecode.o $(LIBJBG) -o $@ $(LDFLAGS) + $(CC) $(CFLAGS) xqxdecode.o $(LIBJBG) -o $@ zjsdecode: zjsdecode.o $(LIBJBG) - $(CC) $(CFLAGS) zjsdecode.o $(LIBJBG) -o $@ $(LDFLAGS) + $(CC) $(CFLAGS) zjsdecode.o $(LIBJBG) -o $@ command2foo2lava-pjl: command2foo2lava-pjl.o - $(CC) $(CFLAGS) -L/usr/local/lib command2foo2lava-pjl.o -lcups -o $@ $(LDFLAGS) + $(CC) $(CFLAGS) -L/usr/local/lib command2foo2lava-pjl.o -lcups -o $@ command2foo2lava-pjl.o: command2foo2lava-pjl.c - $(CC) $(CPPFLAGS) $(CFLAGS) -I/usr/local/include -c command2foo2lava-pjl.c + $(CC) $(CFLAGS) -I/usr/local/include -c command2foo2lava-pjl.c # # Installation rules # -install: all install-test install-prog install-osx-hotplug \ +install: all install-test install-prog install-icc2ps install-osx-hotplug \ install-extra install-crd install-foo install-ppd \ install-gui install-desktop install-filter \ install-man install-doc @@ -649,6 +669,8 @@ install-test: # +UDEVBIN=$(DESTDIR)/bin/ + install-prog: # # Install driver, wrapper, and development tools @@ -657,7 +679,7 @@ install-prog: $(INSTALL) -c $(PROGS) $(SHELLS) $(BIN)/ if [ "$(BINPROGS)" != "" ]; then \ $(INSTALL) -d $(UDEVBIN); \ - $(INSTALL) -c $(BINPROGS) $(BIN); \ + $(INSTALL) -c $(BINPROGS) $(UDEVBIN); \ fi # # Install gamma correction files. These are just templates, @@ -851,7 +873,7 @@ install-extra: done MODEL=$(PREFIX)/share/cups/model -LOCALMODEL=$(DESTDIR)/local/share/cups/model +LOCALMODEL=$(DESTDIR)/usr/local/share/cups/model MACMODEL=/Library/Printers/PPDs/Contents/Resources PPD=$(PREFIX)/share/ppd VARPPD=/var/lp/ppd @@ -912,9 +934,9 @@ install-ppd: done; \ fi -APPL=$(DESTDIR)/share/applications -OLDAPPL=$(DESTDIR)/share/gnome/apps/System -PIXMAPS=$(DESTDIR)/share/pixmaps +APPL=$(DESTDIR)/usr/share/applications +OLDAPPL=$(DESTDIR)/usr/share/gnome/apps/System +PIXMAPS=$(DESTDIR)/usr/share/pixmaps install-desktop: # @@ -1048,9 +1070,7 @@ install-hotplug-prog: $(USBDIR)/hplj1000 install-usblp install-hotplug-osx: -ifeq ($(UNAME),Darwin) cd osx-hotplug; $(MAKE) PREFIX=$(PREFIX) install-hotplug -endif install-filter: if [ "$(CUPS_SERVERBIN)" != "" ]; then \ @@ -1161,6 +1181,7 @@ uninstall: -rm -f $(MANDIR)/man1/foo2ddst*.1 $(MANDIR)/man1/ddstdecode.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/ @@ -1187,6 +1208,7 @@ uninstall: -rm -f /usr/bin/gipddecode -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 @@ -1231,6 +1253,7 @@ 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) $@ # @@ -1384,7 +1407,7 @@ pprtest-3.oak: FRC # # icc2ps regression tests # -ICC2PS=/usr/bin/psicc +ICC2PS=./icc2ps/foo2zjs-icc2ps icctest: for g in *.icm; do \ for i in 0 1 2 3; do \ @@ -1471,9 +1494,10 @@ ppd: *) driver=foo2zjs;; \ esac; \ echo $$driver - $$printer; \ + ENGINE=../foomatic/foomatic-db-engine; \ PERL5LIB=$$ENGINE/lib \ FOOMATICDB=foomatic-db \ - /usr/bin/foomatic-ppdfile \ + $$ENGINE/foomatic-ppdfile \ -d $$driver -p $$printer \ > PPD/$$printer.ppd; \ done @@ -1486,7 +1510,7 @@ oldppd: # Manpage generation. No, I am not interested in "info" files or # HTML documentation. # -man: $(MANPAGES) man-osx-hotplug +man: $(MANPAGES) man-icc2ps man-osx-hotplug $(MANPAGES): macros.man includer-man @@ -1494,9 +1518,7 @@ man-icc2ps: cd icc2ps; $(MAKE) man man-osx-hotplug: -ifeq ($(UNAME),Darwin) cd osx-hotplug; $(MAKE) man -endif .1in.1: -rm -f $*.1 @@ -1559,6 +1581,7 @@ 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 @@ -1578,12 +1601,13 @@ install-doc: doc $(INSTALL) -c -m 644 ChangeLog $(DOCDIR) GROFF=/usr/local/test/bin/groff -GROFF=LC_ALL=C.UTF-8 TZ=UTC groff -manual.pdf: $(MANPAGES) osx-hotplug/osx-hplj-hotplug.1 +GROFF=groff +manual.pdf: $(MANPAGES) icc2ps/foo2zjs-icc2ps.1 osx-hotplug/osx-hplj-hotplug.1 -$(GROFF) -t -man \ `ls $(MANPAGES) \ + icc2ps/foo2zjs-icc2ps.1 \ osx-hotplug/osx-hplj-hotplug.1 \ - | LC_ALL=C.UTF-8 sort` \ + | sort` \ | ps2pdf - $@ README: README.in @@ -1931,7 +1955,7 @@ FRC: misc: pksm2bitcmyk phorum-logo.gif pksm2bitcmyk: pksm2bitcmyk.c - $(CC) $(CFLAGS) pksm2bitcmyk.c -lnetpbm -o $@ $(LDFLAGS) + $(CC) $(CFLAGS) pksm2bitcmyk.c -lnetpbm -o $@ phorum-logo.gif: archhp.fig fig2dev -L gif -m.25 archhp.fig | giftrans -t "#ffffff" -o $@ diff --git a/arm2hpdl.1in b/arm2hpdl.1in index 33e6ccd..213d21b 100644 --- a/arm2hpdl.1in +++ b/arm2hpdl.1in @@ -31,7 +31,7 @@ $ arm2hpdl sihp1005.img > sihp1005.dl .SH FILES .BR /usr/bin/arm2hpdl, -.BR /lib/firmware/hp/* +.BR /usr/share/foo2*/firmware/ .SH SEE ALSO .BR foo2zjs (1) .SH "AUTHOR" diff --git a/debian/patches/0001-Update-makefiles-to-Debian-best-practices.patch b/debian/patches/0001-Update-makefiles-to-Debian-best-practices.patch deleted file mode 100644 index 13af2e8..0000000 --- a/debian/patches/0001-Update-makefiles-to-Debian-best-practices.patch +++ /dev/null @@ -1,228 +0,0 @@ -From 5f8b9d683bfa27efc8abda4a184edf85437830eb Mon Sep 17 00:00:00 2001 -From: Steffen Joeris <white@debian.org> -Date: Tue, 4 Oct 2016 11:43:43 +0200 -Subject: Update makefiles to Debian best-practices - -Author: Luca Capello <luca@pca.it> -Author: Didier Raboud <odyx@debian.org> ---- - Makefile | 71 +++++++++++++++++++++++-------------------------- - icc2ps/Makefile | 4 +-- - 2 files changed, 35 insertions(+), 40 deletions(-) - -diff --git a/Makefile b/Makefile -index 608147d..2f010b1 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 -@@ -39,7 +37,7 @@ INSTALL=install - ROOT=root - - # Pathnames for referenced packages... --FOODB=$(DESTDIR)/usr/share/foomatic/db/source -+FOODB=$(DESTDIR)/share/foomatic/db/source - - # User ID's - LPuid=-oroot -@@ -468,34 +466,34 @@ all-done: - - - foo2ddst: foo2ddst.o $(LIBJBG) -- $(CC) $(CFLAGS) -o $@ foo2ddst.o $(LIBJBG) -+ $(CC) $(CFLAGS) -o $@ foo2ddst.o $(LIBJBG) $(LDFLAGS) - - foo2hbpl2: foo2hbpl2.o $(LIBJBG) -- $(CC) $(CFLAGS) -o $@ foo2hbpl2.o $(LIBJBG) -+ $(CC) $(CFLAGS) -o $@ foo2hbpl2.o $(LIBJBG) $(LDFLAGS) - - foo2hp: foo2hp.o $(LIBJBG) -- $(CC) $(CFLAGS) -o $@ foo2hp.o $(LIBJBG) -+ $(CC) $(CFLAGS) -o $@ foo2hp.o $(LIBJBG) $(LDFLAGS) - - foo2hiperc: foo2hiperc.o $(LIBJBG) -- $(CC) $(CFLAGS) -o $@ foo2hiperc.o $(LIBJBG) -+ $(CC) $(CFLAGS) -o $@ foo2hiperc.o $(LIBJBG) $(LDFLAGS) - - foo2lava: foo2lava.o $(LIBJBG) -- $(CC) $(CFLAGS) -o $@ foo2lava.o $(LIBJBG) -+ $(CC) $(CFLAGS) -o $@ foo2lava.o $(LIBJBG) $(LDFLAGS) - - foo2oak: foo2oak.o $(LIBJBG) -- $(CC) $(CFLAGS) -o $@ foo2oak.o $(LIBJBG) -+ $(CC) $(CFLAGS) -o $@ foo2oak.o $(LIBJBG) $(LDFLAGS) - - foo2qpdl: foo2qpdl.o $(LIBJBG) -- $(CC) $(CFLAGS) -o $@ foo2qpdl.o $(LIBJBG) -+ $(CC) $(CFLAGS) -o $@ foo2qpdl.o $(LIBJBG) $(LDFLAGS) - - foo2slx: foo2slx.o $(LIBJBG) -- $(CC) $(CFLAGS) -o $@ foo2slx.o $(LIBJBG) -+ $(CC) $(CFLAGS) -o $@ foo2slx.o $(LIBJBG) $(LDFLAGS) - - foo2xqx: foo2xqx.o $(LIBJBG) -- $(CC) $(CFLAGS) -o $@ foo2xqx.o $(LIBJBG) -+ $(CC) $(CFLAGS) -o $@ foo2xqx.o $(LIBJBG) $(LDFLAGS) - - foo2zjs: foo2zjs.o $(LIBJBG) -- $(CC) $(CFLAGS) -o $@ foo2zjs.o $(LIBJBG) -+ $(CC) $(CFLAGS) -o $@ foo2zjs.o $(LIBJBG) $(LDFLAGS) - - - foo2ddst-wrapper: foo2ddst-wrapper.in Makefile -@@ -581,49 +579,49 @@ ifeq ($(UNAME),Darwin) - endif - - ok: ok.o $(LIBJBG) -- $(CC) $(CFLAGS) ok.o $(LIBJBG) -o $@ -+ $(CC) $(CFLAGS) ok.o $(LIBJBG) -o $@ $(LDFLAGS) - - ddstdecode: ddstdecode.o $(LIBJBG) -- $(CC) $(CFLAGS) ddstdecode.o $(LIBJBG) -o $@ -+ $(CC) $(CFLAGS) ddstdecode.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 -@@ -669,8 +667,6 @@ install-test: - # - - --UDEVBIN=$(DESTDIR)/bin/ -- - install-prog: - # - # Install driver, wrapper, and development tools -@@ -679,7 +675,7 @@ install-prog: - $(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, -@@ -873,7 +869,7 @@ install-extra: - done - - MODEL=$(PREFIX)/share/cups/model --LOCALMODEL=$(DESTDIR)/usr/local/share/cups/model -+LOCALMODEL=$(DESTDIR)/local/share/cups/model - MACMODEL=/Library/Printers/PPDs/Contents/Resources - PPD=$(PREFIX)/share/ppd - VARPPD=/var/lp/ppd -@@ -934,9 +930,9 @@ install-ppd: - done; \ - fi - --APPL=$(DESTDIR)/usr/share/applications --OLDAPPL=$(DESTDIR)/usr/share/gnome/apps/System --PIXMAPS=$(DESTDIR)/usr/share/pixmaps -+APPL=$(DESTDIR)/share/applications -+OLDAPPL=$(DESTDIR)/share/gnome/apps/System -+PIXMAPS=$(DESTDIR)/share/pixmaps - - install-desktop: - # -@@ -1494,10 +1490,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 -@@ -1955,7 +1950,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 f3abb99..215105b 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 --git a/debian/patches/0002-Fix-icc2ps-build.patch b/debian/patches/0002-Fix-icc2ps-build.patch deleted file mode 100644 index 355371b..0000000 --- a/debian/patches/0002-Fix-icc2ps-build.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a2293218f2b4470dd623aeba0aa777742358f32c Mon Sep 17 00:00:00 2001 -From: Didier Raboud <odyx@debian.org> -Date: Tue, 4 Oct 2016 11:43:44 +0200 -Subject: Fix icc2ps build - -Include unistd.h to make sure the swab function is not implicitly 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 215105b..0aa49ba 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 <unistd.h> - #define xswab swab - #endif - diff --git a/debian/patches/0003-Don-t-build-icc2ps-but-use-psicc-from-liblcms2-utils.patch b/debian/patches/0003-Don-t-build-icc2ps-but-use-psicc-from-liblcms2-utils.patch deleted file mode 100644 index 8b2e2a2..0000000 --- a/debian/patches/0003-Don-t-build-icc2ps-but-use-psicc-from-liblcms2-utils.patch +++ /dev/null @@ -1,107 +0,0 @@ -From e8be229196f653ac519684681d1251fb51c8b4a1 Mon Sep 17 00:00:00 2001 -From: Michael Gilbert <mgilbert@debian.org> -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 2f010b1..ceaf89e 100644 ---- a/Makefile -+++ b/Makefile -@@ -196,13 +196,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 \ -@@ -393,7 +386,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: -@@ -626,7 +619,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 -@@ -1177,7 +1170,6 @@ uninstall: - -rm -f $(MANDIR)/man1/foo2ddst*.1 $(MANDIR)/man1/ddstdecode.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/ -@@ -1204,7 +1196,6 @@ uninstall: - -rm -f /usr/bin/gipddecode - -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 -@@ -1249,7 +1240,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) $@ - - # -@@ -1403,7 +1393,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 \ -@@ -1505,7 +1495,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 - -@@ -1576,7 +1566,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 -@@ -1597,10 +1586,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 --git a/debian/patches/0004-Use-the-Debian-provided-libjbig.patch b/debian/patches/0004-Use-the-Debian-provided-libjbig.patch deleted file mode 100644 index 4c5d24e..0000000 --- a/debian/patches/0004-Use-the-Debian-provided-libjbig.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3887d6aa6f2c9993b22f83dc54624db0f95e1568 Mon Sep 17 00:00:00 2001 -From: Didier Raboud <odyx@debian.org> -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 ceaf89e..97e6990 100644 ---- a/Makefile -+++ b/Makefile -@@ -126,10 +126,6 @@ FILES = \ - Makefile \ - foo2zjs.c \ - foo2zjs.1in \ -- jbig.c \ -- jbig.h \ -- jbig_ar.c \ -- jbig_ar.h \ - zjsdecode.c \ - zjsdecode.1in \ - zjs.h \ -@@ -286,7 +282,7 @@ MANPAGES+= foo2ddst-wrapper.1 foo2ddst.1 ddstdecode.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 --git a/debian/patches/0005-Link-against-system-liblcms1.patch b/debian/patches/0005-Link-against-system-liblcms1.patch deleted file mode 100644 index be41bcf..0000000 --- a/debian/patches/0005-Link-against-system-liblcms1.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 15e925873bbe16b606a57028bf01f936a6fe9f43 Mon Sep 17 00:00:00 2001 -From: Didier Raboud <odyx@debian.org> -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 0aa49ba..87f57b5 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 --git a/debian/patches/0006-Correct-the-udev-rules.patch b/debian/patches/0006-Correct-the-udev-rules.patch deleted file mode 100644 index 3076d06..0000000 --- a/debian/patches/0006-Correct-the-udev-rules.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 2047c86bd8b3c9415da8f9586c2d93ab8b2cce24 Mon Sep 17 00:00:00 2001 -From: Luca Capello <luca@pca.it> -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 <odyx@debian.org> -Author: Peter De Wachter <pdewacht@gmail.com> ---- - 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 --git a/debian/patches/0007-Remove-Encoding-from-.desktop-file.patch b/debian/patches/0007-Remove-Encoding-from-.desktop-file.patch deleted file mode 100644 index c860625..0000000 --- a/debian/patches/0007-Remove-Encoding-from-.desktop-file.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 393f2faf8114df860fe238f78abecb5c0e3c069d Mon Sep 17 00:00:00 2001 -From: Didier Raboud <odyx@debian.org> -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 --git a/debian/patches/0008-Do-not-display-the-icon-by-default.patch b/debian/patches/0008-Do-not-display-the-icon-by-default.patch deleted file mode 100644 index 1e271a9..0000000 --- a/debian/patches/0008-Do-not-display-the-icon-by-default.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 690556c910f26229ad2b9a6def71a8347e43ce76 Mon Sep 17 00:00:00 2001 -From: Didier Raboud <odyx@debian.org> -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 --git a/debian/patches/0009-Launch-the-_gui.tcl-directly-instead-of-launching-wi.patch b/debian/patches/0009-Launch-the-_gui.tcl-directly-instead-of-launching-wi.patch deleted file mode 100644 index dd0dd4b..0000000 --- a/debian/patches/0009-Launch-the-_gui.tcl-directly-instead-of-launching-wi.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 28527559ed334fc00f7a3ce84c798975cb0b396f Mon Sep 17 00:00:00 2001 -From: Didier Raboud <odyx@debian.org> -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 --git a/debian/patches/0010-Correct-the-path-for-the-usb_printerid-program.patch b/debian/patches/0010-Correct-the-path-for-the-usb_printerid-program.patch deleted file mode 100644 index f1caa3c..0000000 --- a/debian/patches/0010-Correct-the-path-for-the-usb_printerid-program.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 6d99b72af0fdef9c0c7cdf986489254b54baf7d4 Mon Sep 17 00:00:00 2001 -From: Didier Raboud <odyx@debian.org> -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 --git a/debian/patches/0011-Improve-getweb-also-for-installing-the-firmware.patch b/debian/patches/0011-Improve-getweb-also-for-installing-the-firmware.patch deleted file mode 100644 index 9e81791..0000000 --- a/debian/patches/0011-Improve-getweb-also-for-installing-the-firmware.patch +++ /dev/null @@ -1,317 +0,0 @@ -From a49fd6b68ecb8d27909d448465ece35c9e99ecd4 Mon Sep 17 00:00:00 2001 -From: Didier Raboud <odyx@debian.org> -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 <<EOF -@@ -79,7 +88,7 @@ Usage: - - $ ./getweb 1000 # Get HP LJ 1000 firmware file - $ ./getweb 1005 # Get HP LJ 1005 firmware file -- $ ./getweb 1018 # Get HP LJ 1005 firmware file -+ $ ./getweb 1018 # Get HP LJ 1018 firmware file - $ ./getweb 1020 # Get HP LJ 1020 firmware file - - $ ./getweb p1005 # Get HP LJ P1005 firmware file -@@ -91,8 +100,6 @@ Usage: - $ ./getweb all # Get everything above - - $ ./getweb 2300dl_fw # Get Minolta 2300DL v2.55 firmware (experts only) -- -- $ ./getweb update # Get latest version of this software. - EOF - exit 1 - } -@@ -107,7 +114,7 @@ error() { - } - - SYSTEM=`uname -s` --WGET=`type wget 2>/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 --git a/debian/patches/0012-Use-the-same-firmware-folder-for-all-HP-LJ-printers.patch b/debian/patches/0012-Use-the-same-firmware-folder-for-all-HP-LJ-printers.patch deleted file mode 100644 index 9a99d54..0000000 --- a/debian/patches/0012-Use-the-same-firmware-folder-for-all-HP-LJ-printers.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 95ea3a0dc675cf3e6334c37176d1f2d4a04b1de0 Mon Sep 17 00:00:00 2001 -From: Didier Raboud <odyx@debian.org> -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 --git a/debian/patches/0013-Firmware-directory-is-lib-firmware-hp-Closes-517957.patch b/debian/patches/0013-Firmware-directory-is-lib-firmware-hp-Closes-517957.patch deleted file mode 100644 index 15b657f..0000000 --- a/debian/patches/0013-Firmware-directory-is-lib-firmware-hp-Closes-517957.patch +++ /dev/null @@ -1,73 +0,0 @@ -From de3051017b351d415f44c67a688592577b053d01 Mon Sep 17 00:00:00 2001 -From: Didier Raboud <odyx@debian.org> -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 --git a/debian/patches/0014-Don-t-delete-printer-profile-in-clean-target.patch b/debian/patches/0014-Don-t-delete-printer-profile-in-clean-target.patch deleted file mode 100644 index 07e5d9a..0000000 --- a/debian/patches/0014-Don-t-delete-printer-profile-in-clean-target.patch +++ /dev/null @@ -1,312 +0,0 @@ -From 6ec076bfd1569db587276d34ee3c67f1b4bfe1fc Mon Sep 17 00:00:00 2001 -From: Didier Raboud <odyx@debian.org> -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 <<EOF -+NAME -+ `basename $PROGNAME` - printer-profile using X-Rite ColorMunki and Argyll CMS -+ -+SYNOPSIS -+ `basename $PROGNAME` [options] manuf model [rgb|cmyk] [patches] [ink-limit] -+ -+DESCRIPTION -+ Prints a test chart, uses the ColorMunki instrument to scan it in, then -+ computes an ICM profile using the Argyll Color Management System. -+ -+ Manuf is "sam". Model is "clp-300" or "clp-315". -+ Manuf is "hp". Model is "2600" or "cp1215". -+ Manuf is "km". Model is "1600" or "2300" or "2530". -+ -+ "rgb" is the usual setting. "patches" is a multiple 196 per page. -+ -+ Edit the script for additional models. -+ -+OPTIONS -+ -b 1|2 Bits per pixel ($BPP) -+ -r XRESxYRES Resolution. Default=''. ($RES) -+ -P rem-print Remote print (64-bit) machine, or none ($REMPRINT) -+ -S rem-scan Remote scan (ColorMunki) machine, or none ($REMSCAN) -+ -D lvl Debug level -+ -+EXAMPLE -+ $ printer-profile sam 315 rgb 196 -+ -+BUGS -+ gs 8.64 and before has problems with 32-bit machines and color profile -+ data. Don't use! -+ -+ You need two copies of Argyll: must be 1.0.3 and 1.1.0beta. Otherwise, -+ targen and colprof core dumps. -+ -+SEE ALSO -+ http://www.xritephoto.com/html/colormunkisplash.htm -+ from Amazon, \$390 shipped -+ http://www.argyllcms.com/ -+ free! -+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 -+} -+ -+# -+# 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 --git a/debian/patches/0015-Fixes-errors-and-hyphen-as-minus-in-manpages.patch b/debian/patches/0015-Fixes-errors-and-hyphen-as-minus-in-manpages.patch deleted file mode 100644 index b5fd20a..0000000 --- a/debian/patches/0015-Fixes-errors-and-hyphen-as-minus-in-manpages.patch +++ /dev/null @@ -1,1552 +0,0 @@ -From 14d3a86ca9ded2de9e671c35154b6642daf6a3be Mon Sep 17 00:00:00 2001 -From: Didier Raboud <odyx@debian.org> -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 <rick.richardson@comcast.net> - .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 <color> - set the current color (ignores request with old groff) -+'\" color <color> \- set the current color (ignores request with old groff) - '\" - .de color - .if mred \m[\\$1]\c - .. - '\" --'\" colorword <color> <word> - colorize a word (ignored by old groff) -+'\" colorword <color> <word> \- colorize a word (ignored by old groff) - '\" - .de colorword - .ie m\\$1 \m[\\$1]\\$2\mP\c - .el \\$2\c - .. - '\" --'\" colbox <fg> <bg> <word> - colorize a word in a filled box -+'\" colbox <fg> <bg> <word> \- 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 326d066..cd27b0e 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 --git a/debian/patches/0016-Fix-various-spelling-errors.patch b/debian/patches/0016-Fix-various-spelling-errors.patch deleted file mode 100644 index d2b9d81..0000000 --- a/debian/patches/0016-Fix-various-spelling-errors.patch +++ /dev/null @@ -1,129 +0,0 @@ -From 9c283be3f023258e342d8e375585283ee24daa51 Mon Sep 17 00:00:00 2001 -From: Didier Raboud <odyx@debian.org> -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<gridpoints> - 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<gridpoints> - 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 --git a/debian/patches/0017-Delay-firmware-transfer-for-UDEV-automatic-printer-s.patch b/debian/patches/0017-Delay-firmware-transfer-for-UDEV-automatic-printer-s.patch deleted file mode 100644 index 732313f..0000000 --- a/debian/patches/0017-Delay-firmware-transfer-for-UDEV-automatic-printer-s.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b3083995041b6b83bfa840465b59a6b40da41081 Mon Sep 17 00:00:00 2001 -From: Didier Raboud <odyx@debian.org> -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 -@@ -32,6 +32,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 --git a/debian/patches/0018-Removed-the-lines-in-the-UDEV-script-for-the-automat.patch b/debian/patches/0018-Removed-the-lines-in-the-UDEV-script-for-the-automat.patch deleted file mode 100644 index 501c2e9..0000000 --- a/debian/patches/0018-Removed-the-lines-in-the-UDEV-script-for-the-automat.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b00f7c6505a24c1a20a23380cedbb106e85a42da Mon Sep 17 00:00:00 2001 -From: Till Kamppeter <till.kamppeter@gmail.com> -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 -@@ -151,16 +151,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 --git a/debian/patches/0019-The-firmware-upload-script-tried-to-upload-the-firmw.patch b/debian/patches/0019-The-firmware-upload-script-tried-to-upload-the-firmw.patch deleted file mode 100644 index 6613779..0000000 --- a/debian/patches/0019-The-firmware-upload-script-tried-to-upload-the-firmw.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 793483305be8ca82acaa091d65047d48f8da3643 Mon Sep 17 00:00:00 2001 -From: Till Kamppeter <till.kamppeter@gmail.com> -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 --git a/debian/patches/0020-Prevent-an-infinite-loop-when-loading-the-firmware.patch b/debian/patches/0020-Prevent-an-infinite-loop-when-loading-the-firmware.patch deleted file mode 100644 index a26628a..0000000 --- a/debian/patches/0020-Prevent-an-infinite-loop-when-loading-the-firmware.patch +++ /dev/null @@ -1,58 +0,0 @@ -From dbdee6ffa5f1f3d158066497d8b390683db5be70 Mon Sep 17 00:00:00 2001 -From: Didier Raboud <odyx@debian.org> -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 <pdewacht@gmail.com> ---- - 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<N> --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 --git a/debian/patches/0021-Build-manpages-reproducibly-through-reading-the-MODT.patch b/debian/patches/0021-Build-manpages-reproducibly-through-reading-the-MODT.patch deleted file mode 100644 index cf015cd..0000000 --- a/debian/patches/0021-Build-manpages-reproducibly-through-reading-the-MODT.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 3d6b26ceeec84fdea364208f82329230ca63cf0d Mon Sep 17 00:00:00 2001 -From: Didier Raboud <odyx@debian.org> -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 97e6990..f04acf2 100644 ---- a/Makefile -+++ b/Makefile -@@ -80,6 +80,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 -@@ -1581,12 +1583,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 --git a/debian/patches/0022-Don-t-try-to-install-hotplug-osx-on-all-UNAME-s.patch b/debian/patches/0022-Don-t-try-to-install-hotplug-osx-on-all-UNAME-s.patch deleted file mode 100644 index 27e8f34..0000000 --- a/debian/patches/0022-Don-t-try-to-install-hotplug-osx-on-all-UNAME-s.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6659cfab510e4d4d3af30998a9d0aa0da510e33f Mon Sep 17 00:00:00 2001 -From: Didier Raboud <odyx@debian.org> -Date: Tue, 8 May 2018 09:40:27 +0200 -Subject: Don't try to install-hotplug-osx on all UNAME's - ---- - Makefile | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/Makefile b/Makefile -index f04acf2..cfc5d9a 100644 ---- a/Makefile -+++ b/Makefile -@@ -1057,7 +1057,9 @@ install-hotplug-prog: - $(USBDIR)/hplj1000 install-usblp - - install-hotplug-osx: -+ifeq ($(UNAME),Darwin) - cd osx-hotplug; $(MAKE) PREFIX=$(PREFIX) install-hotplug -+endif - - install-filter: - if [ "$(CUPS_SERVERBIN)" != "" ]; then \ -@@ -1501,7 +1503,9 @@ man-icc2ps: - cd icc2ps; $(MAKE) man - - man-osx-hotplug: -+ifeq ($(UNAME),Darwin) - cd osx-hotplug; $(MAKE) man -+endif - - .1in.1: - -rm -f $*.1 diff --git a/debian/patches/0023-Don-t-test-for-stdio.h-in-fullpath.patch b/debian/patches/0023-Don-t-test-for-stdio.h-in-fullpath.patch deleted file mode 100644 index feea4d5..0000000 --- a/debian/patches/0023-Don-t-test-for-stdio.h-in-fullpath.patch +++ /dev/null @@ -1,30 +0,0 @@ -From def34908383ca355f85cbb847e6befc3c41ebc9f Mon Sep 17 00:00:00 2001 -From: Helmut Grohne <helmut@subdivi.de> -Date: Fri, 5 Oct 2018 16:33:27 +0200 -Subject: Don't test for stdio.h in fullpath - -Closes: #910322 ---- - Makefile | 9 --------- - 1 file changed, 9 deletions(-) - -diff --git a/Makefile b/Makefile -index cfc5d9a..2aba8d2 100644 ---- a/Makefile -+++ b/Makefile -@@ -399,15 +399,6 @@ all-test: - echo " ***"; \ - exit 1; \ - fi -- @if ! test -f /usr/include/stdio.h; then \ -- echo " ***"; \ -- echo " *** Error: /usr/include/stdio.h is not installed!"; \ -- echo " ***"; \ -- echo " *** Install Software Development (gcc) package"; \ -- echo " *** for Ubuntu: sudo apt-get install build-essential"; \ -- echo " ***"; \ -- exit 1; \ -- fi - @if ! type gs >/dev/null 2>&1; then \ - echo " ***"; \ - echo " *** Error: gs is not installed!"; \ diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 2b64f0b..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,23 +0,0 @@ -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 -0022-Don-t-try-to-install-hotplug-osx-on-all-UNAME-s.patch -0023-Don-t-test-for-stdio.h-in-fullpath.patch diff --git a/foo2hbpl2-wrapper.1in b/foo2hbpl2-wrapper.1in index ba55b5c..0fd1570 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 86e4de7..0d9590a 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 0dca96b..3601f56 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 dca0143..6496984 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 @@ -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 26b69ae..a71617d 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 60629ea..f02d899 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 0b88544..2328ae5 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 bbf1d23..435dae3 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 94b3ed6..1a1c863 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 4524372..7e476c1 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 780ee0d..bdc209d 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 81326a1..966ec6f 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 8eab873..5a431e0 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 382a17a..bef7ba5 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 da521fb..6c60c89 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 16998b1..1648bf7 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,11 +100,9 @@ env Monarch 37 37 37 37 postcard (japan) na 260 43 43 B5iso na 259 na na A6 na 262 70 70 -double postcard na 261 82 82 - rotated \^ \^ \^ \^ +double postcard rotated na 261 82 82 16k 197x273 na 257 257 257 -fanfold german na 258 258 258 - legal \^ \^ \^ \^ +fanfold german legal na 258 258 258 16k 184x260 na na 263 263 16k 195x270 na na 264 264 photo 4x6 na na na 268 @@ -139,9 +137,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 @@ -160,13 +158,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. @@ -202,7 +200,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 @@ -247,7 +245,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 @@ -255,7 +253,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 feb973b..a26113c 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,11 +95,9 @@ env Monarch 37 37 37 37 postcard (japan) na 260 43 43 B5iso na 259 na na A6 na 262 70 70 -double postcard na 261 82 82 - rotated \^ \^ \^ \^ +double postcard rotated na 261 82 82 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 @@ -145,7 +143,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 @@ -203,10 +201,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 @@ -214,10 +212,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 @@ -1,10 +1,8 @@ #!/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 @@ -14,13 +12,6 @@ set -e 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 <<EOF @@ -88,7 +79,7 @@ Usage: $ ./getweb 1000 # Get HP LJ 1000 firmware file $ ./getweb 1005 # Get HP LJ 1005 firmware file - $ ./getweb 1018 # Get HP LJ 1018 firmware file + $ ./getweb 1018 # Get HP LJ 1005 firmware file $ ./getweb 1020 # Get HP LJ 1020 firmware file $ ./getweb p1005 # Get HP LJ P1005 firmware file @@ -100,6 +91,8 @@ Usage: $ ./getweb all # Get everything above $ ./getweb 2300dl_fw # Get Minolta 2300DL v2.55 firmware (experts only) + + $ ./getweb update # Get latest version of this software. EOF exit 1 } @@ -114,7 +107,7 @@ error() { } SYSTEM=`uname -s` -WGET=`which wget` +WGET=`type wget 2>/dev/null` if [ "$SYSTEM" = Darwin -a "$WGET" = "" ] then WGETOPTS= @@ -124,20 +117,6 @@ then } fi -putfw() { - inputname=$1 - outputname=$2 - $ARM2HPDL $inputname > /lib/firmware/hp/$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 @@ -184,7 +163,6 @@ getone() { #lj1488en.exe \ #sihp1000.img copyright "(c) Copyright Hewlett-Packard 2001" - putfw sihp1000.img sihp1000.dl ;; lj1005|1005) gettgz \ @@ -200,14 +178,12 @@ 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 @@ -215,28 +191,24 @@ 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 @@ -249,7 +221,6 @@ getone() { "*.icm" fi copyright "(c) Copyright Minolta-QMS 1999" - puticm foo2zjs ;; 2300dl|2300) if true; then @@ -265,7 +236,6 @@ 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 @@ -294,14 +264,12 @@ 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 \ @@ -313,7 +281,6 @@ getone() { http://foo2lava.rkkda.com/icm km-1600.tar.gz \ "" copyright "(c) Copyright Rick Richardson 2009. All Rights Reserved" - puticm foo2lava ;; 1500) gettgz \ @@ -325,14 +292,12 @@ 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 \ @@ -347,7 +312,6 @@ 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 \ @@ -358,7 +322,6 @@ getone() { http://foo2qpdl.rkkda.com/icm samclp315.tar.gz \ "" copyright "(c) Copyright Rick Richardson 2008. All Rights Reserved" - puticm foo2qpdl ;; 600|610) ;; @@ -368,7 +331,6 @@ getone() { http://foo2slx.rkkda.com/icm lexc500.tar.gz \ "" copyright "(c) Copyright Lexmark 2006" - puticm foo2slx ;; oki) @@ -384,56 +346,48 @@ 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) @@ -489,6 +443,23 @@ 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 ;; @@ -503,10 +474,6 @@ if [ $# = 0 ]; then usage fi -OLDPWD=`pwd` -NEWPWD=`mktemp --tmpdir --directory foo2zjs.XXXXXX` -cd "$NEWPWD" - for i in $* do case "$1" in @@ -551,6 +518,3 @@ do ;; esac done - -cd "$OLDPWD" -rmdir "$NEWPWD" diff --git a/gipddecode.1in b/gipddecode.1in index 2b4ff71..b802275 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 61e294b..52d0ee7 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 10267cb..f8dec45 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 @@ -24,16 +24,13 @@ # Mike Morgan (2004) # -PROGNAME="$0" +# udev calls us twice on FC4! Just want /dev/usb/lp<N> +case "$DEVNAME" in +/dev/usb/usb*) exit;; # Bug: FC4 +/dev/bus/usb/*) exit;; # Bug: Ubuntu 14 +esac -# -# 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 +PROGNAME="$0" # # Set $DEV to, e.g. /dev/usb/lp0, to force the device you want @@ -51,7 +48,7 @@ USB_BACKEND=/usr/lib/cups/backend/usb # # Directory to find downloadable HP firmware files sihpMMMM.dl # -FWDIR=/lib/firmware/hp +FWDIR=/usr/share/foo2zjs/firmware # # Program used to determine USB printer id information @@ -63,7 +60,7 @@ FWDIR=/lib/firmware/hp # [snip] # # Mount all other filesystems (except for NFS and /proc, which is already # -PRINTERID=`which usb_printerid` +PRINTERID=/bin/usb_printerid # # Figure out how to log our messages @@ -93,31 +90,37 @@ 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 @@ -146,6 +149,16 @@ 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 # @@ -255,21 +268,12 @@ if [ "$DEV" != "" ]; then # # force downloading to a specific device # - if [ "$SUBSYSTEM" != "usbmisc" ]; then exit; fi load_usblp "$DEV" -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 - # - if [ "$SUBSYSTEM" != "usb" ]; then exit; fi - load_cups -elif [ -x $PRINTERID ]; then +elif [ -x $PRINTERID -o -x $USB_BACKEND ]; then + if [ -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"` @@ -285,6 +289,20 @@ elif [ -x $PRINTERID ]; 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 --git a/hplj1020.desktop b/hplj1020.desktop index 6dd0b3f..121ab2b 100644 --- a/hplj1020.desktop +++ b/hplj1020.desktop @@ -1,12 +1,12 @@ [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 -Exec=/usr/share/foo2zjs/hplj10xx_gui.tcl +Exec=wish /usr/share/foo2zjs/hplj10xx_gui.tcl Terminal=false Type=Application Icon=/usr/share/pixmaps/hplj1020_icon.png StartupNotify=true Categories=System; X-Desktop-File-Install-Version=0.10 -NoDisplay=true diff --git a/hplj10xx.conf b/hplj10xx.conf index fe32eea..a2083bb 100644 --- a/hplj10xx.conf +++ b/hplj10xx.conf @@ -15,35 +15,35 @@ attach 100 { match "vendor" "0x03f0"; match "product" "0x3d17"; - action "cat /lib/firmware/hp/sihpP1005.dl > /dev/$device-name"; + action "cat /usr/share/foo2xqx/firmware/sihpP1005.dl > /dev/$device-name"; }; # Firmware download HP LaserJet P1006 printer attach 100 { match "vendor" "0x03f0"; match "product" "0x3e17"; - action "cat /lib/firmware/hp/sihpP1006.dl > /dev/$device-name"; + action "cat /usr/share/foo2xqx/firmware/sihpP1006.dl > /dev/$device-name"; }; # Firmware download HP LaserJet P1007 printer attach 100 { match "vendor" "0x03f0"; match "product" "0x4817"; - action "cat /lib/firmware/hp/sihpP1005.dl > /dev/$device-name"; + action "cat /usr/share/foo2xqx/firmware/sihpP1005.dl > /dev/$device-name"; }; # Firmware download HP LaserJet P1008 printer attach 100 { match "vendor" "0x03f0"; match "product" "0x4917"; - action "cat /lib/firmware/hp/sihpP1006.dl > /dev/$device-name"; + action "cat /usr/share/foo2xqx/firmware/sihpP1006.dl > /dev/$device-name"; }; # Firmware download HP LaserJet P1505 printer attach 100 { match "vendor" "0x03f0"; match "product" "0x3f17"; - action "cat /lib/firmware/hp/sihpP1505.dl > /dev/$device-name"; + action "cat /usr/share/foo2xqx/firmware/sihpP1505.dl > /dev/$device-name"; }; # Firmware download HP LaserJet 1000 printer diff --git a/hplj10xx.rules b/hplj10xx.rules index 3d69ca3..ee0295d 100644 --- a/hplj10xx.rules +++ b/hplj10xx.rules @@ -2,42 +2,38 @@ # hplj10xx.rules.old: udev equal or after 1.30 # #Own udev rule for HP Laserjet 1000 -ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ - ATTRS{product}=="hp LaserJet 1000", \ - SYMLINK+="hplj1000-%n", RUN+="hplj1000" +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" #Own udev rule for HP Laserjet 1005 -ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ - ATTRS{product}=="hp LaserJet 1005 series", \ - SYMLINK+="hplj1005-%n", RUN+="hplj1005" +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" #Own udev rule for HP Laserjet 1018 -ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ - ATTRS{product}=="HP LaserJet 1018", \ - SYMLINK+="hplj1018-%n", RUN+="hplj1018" +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" #Own udev rule for HP Laserjet 1020 -ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ - ATTRS{product}=="HP LaserJet 1020", \ - SYMLINK+="hplj1020-%n", RUN+="hplj1020" +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" #Own udev rule for HP Laserjet P1005 -ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ - ATTRS{product}=="HP LaserJet P1005", \ - SYMLINK+="hpljP1005-%n", RUN+="hpljP1005" +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" #Own udev rule for HP Laserjet P1006 -ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ - ATTRS{product}=="HP LaserJet P1006", \ - SYMLINK+="hpljP1006-%n", RUN+="hpljP1006" +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" #Own udev rule for HP Laserjet P1007 -ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ - ATTRS{product}=="HP LaserJet P1007", \ - SYMLINK+="hpljP1007-%n", RUN+="hpljP1007" +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" #Own udev rule for HP Laserjet P1008 -ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \ - ATTRS{product}=="HP LaserJet P1008", \ - SYMLINK+="hpljP1008-%n", RUN+="hpljP1008" +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" #Own udev rule for HP Laserjet P1505 -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" +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" diff --git a/icc2ps/Makefile b/icc2ps/Makefile index 87f57b5..f3abb99 100644 --- a/icc2ps/Makefile +++ b/icc2ps/Makefile @@ -6,12 +6,10 @@ BIN= $(PREFIX)/bin MANDIR=$(PREFIX)/share/man SRC= icc2ps.c xgetopt.c -LIB= -llcms -CFLAGS+= -O3 - -# _XOPEN_SOURCE is required for swab() but undefines strcasecmp(), so add _GNU_SOURCE as well: -CFLAGS+= -D_XOPEN_SOURCE -D_GNU_SOURCE - +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 INSTALL=install ifeq ($(UNAME),SunOS) INSTALL=/usr/ucb/install @@ -23,7 +21,7 @@ endif all: foo2zjs-icc2ps man foo2zjs-icc2ps: $(SRC) $(LIB) - $(CC) $(CPPFLAGS) $(CFLAGS) $(SRC) $(LIB) -lm -o $@ $(LDFLAGS) + $(CC) $(CFLAGS) $(SRC) $(LIB) -lm -o $@ install: all $(INSTALL) -c foo2zjs-icc2ps $(BIN) @@ -53,7 +51,7 @@ install-man: man clean: rm -f *.o foo2zjs-icc2ps *.1 -foo2zjs-icc2ps: icc34.h +foo2zjs-icc2ps: icc34.h lcms.h regress: all @./foo2zjs-icc2ps a b 2>&1 | grep "little cms P" diff --git a/icc2ps/cmscgats.c b/icc2ps/cmscgats.c index db4ab3f..042429f 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; // precision + int prec = 0; // precission NextCh(it8); // Eats dec. point diff --git a/icc2ps/cmsio1.c b/icc2ps/cmsio1.c index 1bd4e23..1f02720 100644 --- a/icc2ps/cmsio1.c +++ b/icc2ps/cmsio1.c @@ -71,7 +71,6 @@ void xswab(const void *from, void *to, size_t len) #undef STEP } #else -#include <unistd.h> #define xswab swab #endif @@ -1162,7 +1161,7 @@ LCMSBOOL ReadCLUT(LPLCMSICCPROFILE Icc, size_t Offset, LPLUT NewLUT) AdjustEndianessArray16(NewLUT ->T, NewLUT->Tsize / sizeof(WORD)); } else { - cmsSignalError(LCMS_ERRC_ABORTED, "Unknow precision of '%d'", CLUT.prec); + cmsSignalError(LCMS_ERRC_ABORTED, "Unknow precission of '%d'", CLUT.prec); return FALSE; } diff --git a/icc2ps/cmsmatsh.c b/icc2ps/cmsmatsh.c index 971f931..634c9f3 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 suppress table interpolation (this + // If is all linear, then supress 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 suppress table interpolation (this + // If is all linear, then supress table interpolation (this // will speed greately some trivial operations if (AllLinear != 3) diff --git a/icc2ps/cmsps2.c b/icc2ps/cmsps2.c index 31592e7..6c352a7 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 precision, code chooses between three ways to implement + In order to obtain precission, 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 precision. + // in order to preserve precission. RelativeEncodingIntent = Intent; if (RelativeEncodingIntent == INTENT_ABSOLUTE_COLORIMETRIC) diff --git a/icc2ps/foo2zjs-icc2ps.1in b/icc2ps/foo2zjs-icc2ps.1in index 054bbdf..bbccb50 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,6 +27,7 @@ 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> @@ -37,14 +38,17 @@ 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 <rick.richardson@comcast.net> .br http://foo2zjs.rkkda.com/ +'/" +'/" +'/" .em pdf_outline diff --git a/icc2ps/icc2ps.c b/icc2ps/icc2ps.c index 8f78a55..7c7df2b 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> - Precision (0=LowRes, 1=Normal (default), 2=Hi-res) (CRD only)\n", SW); - fprintf(stderr, "%cn<gridpoints> - Alternate way to set precision, number of CLUT points (CRD only)\n", SW); + fprintf(stderr, "%cc<0,1,2> - Precission (0=LowRes, 1=Normal (default), 2=Hi-res) (CRD only)\n", SW); + fprintf(stderr, "%cn<gridpoints> - Alternate way to set precission, 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/lavadecode.1in b/lavadecode.1in index 36e3cff..3a4901e 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 @@ -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 <color> \- set the current color (ignores request with old groff) +'\" color <color> - set the current color (ignores request with old groff) '\" .de color .if mred \m[\\$1]\c .. '\" -'\" colorword <color> <word> \- colorize a word (ignored by old groff) +'\" colorword <color> <word> - colorize a word (ignored by old groff) '\" .de colorword .ie m\\$1 \m[\\$1]\\$2\mP\c .el \\$2\c .. '\" -'\" colbox <fg> <bg> <word> \- colorize a word in a filled box +'\" colbox <fg> <bg> <word> - 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 4e421a8..e248af7 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/oakdecode.c b/oakdecode.c index 2ec1b1e..0653954 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 Suppress display of image records\n" +" -i Supress display of image records\n" " -o Print file offsets\n" " -D lvl Set Debug level [%d]\n" , Debug diff --git a/opldecode.1in b/opldecode.1in index 45d0544..9706bb0 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 cd27b0e..326d066 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 9328db4..0f52054 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/printer-profile.in b/printer-profile.in deleted file mode 100644 index 5363847..0000000 --- a/printer-profile.in +++ /dev/null @@ -1,296 +0,0 @@ -#!/bin/sh - -PROGNAME="$0" - -usage() { - cat <<EOF -NAME - `basename $PROGNAME` - printer-profile using X-Rite ColorMunki and Argyll CMS - -SYNOPSIS - `basename $PROGNAME` [options] manuf model [rgb|cmyk] [patches] [ink-limit] - -DESCRIPTION - Prints a test chart, uses the ColorMunki instrument to scan it in, then - computes an ICM profile using the Argyll Color Management System. - - Manuf is "sam". Model is "clp-300" or "clp-315". - Manuf is "hp". Model is "2600" or "cp1215". - Manuf is "km". Model is "1600" or "2300" or "2530". - - "rgb" is the usual setting. "patches" is a multiple 196 per page. - - Edit the script for additional models. - -OPTIONS - -b 1|2 Bits per pixel ($BPP) - -r XRESxYRES Resolution. Default=''. ($RES) - -P rem-print Remote print (64-bit) machine, or none ($REMPRINT) - -S rem-scan Remote scan (ColorMunki) machine, or none ($REMSCAN) - -D lvl Debug level - -EXAMPLE - $ printer-profile sam 315 rgb 196 - -BUGS - gs 8.64 and before has problems with 32-bit machines and color profile - data. Don't use! - - You need two copies of Argyll: must be 1.0.3 and 1.1.0beta. Otherwise, - targen and colprof core dumps. - -SEE ALSO - http://www.xritephoto.com/html/colormunkisplash.htm - from Amazon, \$390 shipped - http://www.argyllcms.com/ - free! -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 -} - -# -# 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 --git a/qpdldecode.1in b/qpdldecode.1in index 7f9804b..d8b2f35 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/qpdldecode.c b/qpdldecode.c index 633ba97..d6336df 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 language (QPDL) is the printer language" +" A Quick Page Description Langauge (QPDL) is the printer language" " used by some Samsung printers, such as the CLP-600n.\n" "\n" " Also known as SPLC." diff --git a/slxdecode.1in b/slxdecode.1in index 30f24bc..7f9ebc5 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/usb_printerid.1in b/usb_printerid.1in index 34817e4..0454ef6 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 /lib/firmware/hp/sihp1020.dl /dev/usb/lp0 +# cp /usr/share/foo2zjs/firmware/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 /lib/firmware/hp/* +.BR /usr/share/foo2*/firmware/* .SH SEE ALSO .BR arm2hpdl (1) .SH "AUTHOR" diff --git a/xqxdecode.1in b/xqxdecode.1in index fc32d76..488d192 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 567f840..ea6c443 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 |