diff -Nru foo2zjs-20140519dfsg0/ChangeLog foo2zjs-20140925dfsg0/ChangeLog
--- foo2zjs-20140519dfsg0/ChangeLog	2014-06-05 09:14:28.000000000 +0000
+++ foo2zjs-20140925dfsg0/ChangeLog	2014-09-30 07:35:30.000000000 +0000
@@ -1,3 +1,10 @@
+2014-09-25	Rick Richardson <rick.richardson@comcast.net>
+	* foo2hblp2, foo2hblp2-wrapper, foomatic et al:
+	    Add paper size A5.
+	* foo2hblp2 foomatic db entries:
+	    Changed resolution to 600x600, 1200x600, and 1200x1200.
+	    Note: need to recreate the printers if you want more choices!
+
 2014-05-19	Rick Richardson <rick.richardson@comcast.net>
 	* HP CLJ CP1215:  Adjust margins: *HWMargins: 18 14.40 18 14
 
diff -Nru foo2zjs-20140519dfsg0/debian/changelog foo2zjs-20140925dfsg0/debian/changelog
--- foo2zjs-20140519dfsg0/debian/changelog	2014-08-07 21:28:04.000000000 +0000
+++ foo2zjs-20140925dfsg0/debian/changelog	2014-10-02 20:52:07.000000000 +0000
@@ -1,13 +1,38 @@
-foo2zjs (20140519dfsg0-2ubuntu1) utopic; urgency=medium
+foo2zjs (20140925dfsg0-3) unstable; urgency=medium
 
-  [ Till Kamppeter ]
-  * Reverted the changes to use the system-provided liblcms1 as under Ubuntu
-    this obsolete library is not available any more in Main.
+  [ Peter De Wachter ]
+  * Fix laserjet1018 appearance and disappearance loop: (Closes: #663868)
+    - update the 30-udev-rules.patch to add an 'ACTION="add"' to avoid running
+      the firmware upload script on unplug,
+    - add patch 97-hplj1000-fix-firmware-upload-infite-loop.patch to ignore the
+      irrelevant events and thus cut the loop short.
 
-  [ Matthias Klose ]
-  * printer-driver-foo2zjs-common: Suggest tix instead of recommending it.
+ -- Didier Raboud <odyx@debian.org>  Thu, 02 Oct 2014 22:51:47 +0200
 
- -- Till Kamppeter <till.kamppeter@gmail.com>  Thu,  7 Aug 2014 23:25:59 +0200
+foo2zjs (20140925dfsg0-2) unstable; urgency=medium
+
+  * Put tix to Recommends on Debian and to Suggests on Ubuntu and derivatives
+
+ -- Didier Raboud <odyx@debian.org>  Tue, 30 Sep 2014 18:03:18 +0200
+
+foo2zjs (20140925dfsg0-1) unstable; urgency=medium
+
+  * New 20140925 upstream release.
+
+  * DFSG repack (no changes from previous releases).
+    - remove binary file c5200mono.prn
+    - remove crd/qpdl/CLP* , because copyright is unclear
+  * Refresh patches
+  * Push the system-lcms patch from Michael up the pile
+
+ -- Didier Raboud <odyx@debian.org>  Tue, 30 Sep 2014 09:58:06 +0200
+
+foo2zjs (20140519dfsg0-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Use psicc from lcms2 (closes: #757384).
+
+ -- Michael Gilbert <mgilbert@debian.org>  Sun, 28 Sep 2014 21:34:38 +0000
 
 foo2zjs (20140519dfsg0-2) unstable; urgency=medium
 
diff -Nru foo2zjs-20140519dfsg0/debian/control foo2zjs-20140925dfsg0/debian/control
--- foo2zjs-20140519dfsg0/debian/control	2014-08-07 21:26:38.000000000 +0000
+++ foo2zjs-20140925dfsg0/debian/control	2014-09-30 14:38:04.000000000 +0000
@@ -8,6 +8,7 @@
  foomatic-filters,
  foomatic-db-engine,
  libcups2-dev,
+ liblcms2-utils,
  dc,
  time,
  pyppd (>= 1.0.2-1~),
@@ -20,7 +21,7 @@
 
 Package: printer-driver-foo2zjs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${ubuntu:mscompress}, foomatic-filters, dc, printer-driver-foo2zjs-common (>= ${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${ubuntu:mscompress}, foomatic-filters, dc, printer-driver-foo2zjs-common (>= ${source:Version}), liblcms2-utils
 Recommends: wget, unzip, ${debian:mscompress}, cups, cups-client
 Suggests: psutils, hannah-foo2zjs
 Breaks: udev (<< 136-1), cups (<< 1.5.0-3~), foo2zjs (<< 20111023dfsg0-1~)
@@ -40,8 +41,8 @@
 Package: printer-driver-foo2zjs-common
 Architecture: all
 Depends: ${misc:Depends}
-Recommends: tk, printer-driver-foo2zjs (>= ${source:Version})
-Suggests: tix
+Recommends: ${debian:tix}, tk, printer-driver-foo2zjs (>= ${source:Version})
+Suggests: ${ubuntu:tix}
 Enhances: printer-driver-foo2zjs (>= ${source:Version})
 Breaks: udev (<< 136-1), cups (<< 1.5.0-3~), foo2zjs (<< 20111023dfsg0-1~), printer-driver-foo2zjs (<< 20131225dfsg0-5~)
 Replaces: foo2zjs (<< 20111023dfsg0-1~), printer-driver-foo2zjs (<< 20131225dfsg0-5~)
diff -Nru foo2zjs-20140519dfsg0/debian/patches/20-system-lcms.patch foo2zjs-20140925dfsg0/debian/patches/20-system-lcms.patch
--- foo2zjs-20140519dfsg0/debian/patches/20-system-lcms.patch	1970-01-01 00:00:00.000000000 +0000
+++ foo2zjs-20140925dfsg0/debian/patches/20-system-lcms.patch	2014-09-30 07:42:31.000000000 +0000
@@ -0,0 +1,99 @@
+Description: don't build icc2ps (instead use psicc from liblcms2-utils)
+Author: Michael Gilbert <mgilbert@debian.org>
+
+--- a/Makefile
++++ b/Makefile
+@@ -188,13 +188,6 @@
+ 		foomatic-db/*/*.xml \
+ 		foomatic-test \
+ 		getweb.in \
+-		icc2ps/*.[ch] \
+-		icc2ps/*.1in \
+-		icc2ps/Makefile \
+-		icc2ps/AUTHORS \
+-		icc2ps/COPYING \
+-		icc2ps/README \
+-		icc2ps/README.foo2zjs \
+ 		osx-hotplug/Makefile \
+ 		osx-hotplug/*.m \
+ 		osx-hotplug/*.1in \
+@@ -375,7 +368,7 @@
+ # The usual build rules
+ #
+ all:	all-test $(PROGS) $(BINPROGS) $(SHELLS) getweb \
+-	all-icc2ps all-osx-hotplug man doc \
++	all-osx-hotplug man doc \
+ 	all-done
+ 
+ all-test:
+@@ -597,7 +590,7 @@
+ #
+ # Installation rules
+ #
+-install: all install-test install-prog install-icc2ps install-osx-hotplug \
++install: all install-test install-prog install-osx-hotplug \
+ 	    install-extra install-crd install-foo install-ppd \
+ 	    install-gui install-desktop install-filter \
+ 	    install-man install-doc
+@@ -1113,7 +1106,6 @@
+ 	-rm -f $(MANDIR)/man1/foo2hbpl*.1 $(MANDIR)/man1/hbpldecode.1
+ 	-rm -f $(MANDIR)/man1/gipddecode.1
+ 	-rm -f $(MANDIR)/man1/arm2hpdl.1 $(MANDIR)/man1/usb_printerid.1
+-	-rm -f $(MANDIR)/man1/foo2zjs-icc2ps.1
+ 	-rm -rf /usr/share/foo2zjs/
+ 	-rm -rf /usr/share/foo2hp/
+ 	-rm -rf /usr/share/foo2oak/
+@@ -1138,7 +1130,6 @@
+ 	-rm -f /usr/bin/hbpldecode
+ 	-rm -f /usr/bin/opldecode
+ 	-rm -f /usr/bin/rodecode
+-	-rm -f /usr/bin/foo2zjs-icc2ps
+ 	-rm -f /usr/bin/foo2zjs-pstops
+ 	-rm -f /usr/bin/command2foo2lava-pjl
+ 	-rm -f /usr/lib/cups/filter/command2foo2lava-pjl
+@@ -1181,7 +1172,6 @@
+ 	-rm -f *.zjs *.zm *.zc *.zc? *.zc?? *.oak *.pbm *.pksm *.cmyk
+ 	-rm -f pksm2bitcmyk
+ 	-rm -f *.icm.*.ps
+-	cd icc2ps; $(MAKE) $@
+ 	cd osx-hotplug; $(MAKE) $@
+ 
+ #
+@@ -1331,7 +1321,7 @@
+ #
+ #	icc2ps regression tests
+ #
+-ICC2PS=./icc2ps/foo2zjs-icc2ps
++ICC2PS=/usr/bin/psicc
+ icctest:
+ 	for g in *.icm; do \
+ 	    for i in 0 1 2 3; do \
+@@ -1428,7 +1418,7 @@
+ # Manpage generation.  No, I am not interested in "info" files or
+ # HTML documentation.
+ #
+-man: $(MANPAGES) man-icc2ps man-osx-hotplug
++man: $(MANPAGES) man-osx-hotplug
+ 
+ $(MANPAGES): macros.man includer-man
+ 
+@@ -1495,7 +1485,6 @@
+ 	$(INSTALL) -c -m 644 arm2hpdl.1 $(MANDIR)/man1/
+ 	$(INSTALL) -c -m 644 usb_printerid.1 $(MANDIR)/man1/
+ 	$(INSTALL) -c -m 644 printer-profile.1 $(MANDIR)/man1/
+-	cd icc2ps; $(MAKE) install-man
+ ifeq ($(UNAME),Darwin)
+ 	cd osx-hotplug; $(MAKE) install-man
+ endif
+@@ -1516,10 +1505,9 @@
+ 
+ GROFF=/usr/local/test/bin/groff
+ GROFF=groff
+-manual.pdf: $(MANPAGES) icc2ps/foo2zjs-icc2ps.1 osx-hotplug/osx-hplj-hotplug.1
++manual.pdf: $(MANPAGES) osx-hotplug/osx-hplj-hotplug.1
+ 	-$(GROFF) -t -man \
+ 	    `ls $(MANPAGES) \
+-		icc2ps/foo2zjs-icc2ps.1 \
+ 		osx-hotplug/osx-hplj-hotplug.1 \
+ 		| sort` \
+ 	    | ps2pdf - $@
diff -Nru foo2zjs-20140519dfsg0/debian/patches/20-system-libjbig.patch foo2zjs-20140925dfsg0/debian/patches/20-system-libjbig.patch
--- foo2zjs-20140519dfsg0/debian/patches/20-system-libjbig.patch	2014-06-05 09:16:26.000000000 +0000
+++ foo2zjs-20140925dfsg0/debian/patches/20-system-libjbig.patch	2014-09-30 07:42:31.000000000 +0000
@@ -15,7 +15,7 @@
  		zjsdecode.c \
  		zjsdecode.1in \
  		zjs.h \
-@@ -280,7 +276,7 @@
+@@ -273,7 +269,7 @@
  MANPAGES+=	gipddecode.1
  MANPAGES+=	foo2zjs-pstops.1 arm2hpdl.1 usb_printerid.1
  MANPAGES+=	printer-profile.1
diff -Nru foo2zjs-20140519dfsg0/debian/patches/20-system-liblcms.patch foo2zjs-20140925dfsg0/debian/patches/20-system-liblcms.patch
--- foo2zjs-20140519dfsg0/debian/patches/20-system-liblcms.patch	1970-01-01 00:00:00.000000000 +0000
+++ foo2zjs-20140925dfsg0/debian/patches/20-system-liblcms.patch	2014-09-30 07:42:31.000000000 +0000
@@ -0,0 +1,25 @@
+Description: Link against system liblcms1
+Author: Didier Raboud <odyx@debian.org>
+Last-Update: 2014-08-01
+--- a/icc2ps/Makefile
++++ b/icc2ps/Makefile
+@@ -6,9 +6,7 @@
+ MANDIR=$(PREFIX)/share/man
+ 
+ SRC=	icc2ps.c xgetopt.c
+-LIB=	cmscam97.c cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \
+-	cmslut.c cmsmatsh.c cmsmtrx.c cmsnamed.c cmspack.c cmspcs.c cmsps2.c \
+-	cmssamp.c cmswtpnt.c cmsxform.c cmsio0.c cmsvirt.c
++LIB=	-llcms
+ CFLAGS+=	-O3
+ 
+ # _XOPEN_SOURCE is required for swab() but undefines strcasecmp(), so add _GNU_SOURCE as well:
+@@ -55,7 +53,7 @@
+ clean:
+ 	rm -f *.o foo2zjs-icc2ps *.1
+ 
+-foo2zjs-icc2ps: icc34.h lcms.h
++foo2zjs-icc2ps: icc34.h
+ 
+ regress: all
+ 	@./foo2zjs-icc2ps a b 2>&1 | grep "little cms P"
diff -Nru foo2zjs-20140519dfsg0/debian/patches/30-udev-rules.patch foo2zjs-20140925dfsg0/debian/patches/30-udev-rules.patch
--- foo2zjs-20140519dfsg0/debian/patches/30-udev-rules.patch	2014-06-05 09:16:26.000000000 +0000
+++ foo2zjs-20140925dfsg0/debian/patches/30-udev-rules.patch	2014-10-02 20:28:01.000000000 +0000
@@ -2,9 +2,11 @@
  a) remove KERNEL=="lp*", as usblp is now blacklisted by CUPS (it will work without CUPS too).
  b) Replace paths: /etc/hotplug/usb/ by no path, as the binaries are shipped in /lib/udev/
  c) Drop the MODE specification
+ d) Add ACTION=="ADD", otherwise the firmware script runs after unplugging as well
 Author: Luca Capello <luca@pca.it>
 Author: Didier Raboud <odyx@debian.org>
-Last-Update: 2014-01-07
+Author: Peter De Wachter <pdewacht@gmail.com>
+Last-Update: 2014-01-02
 --- a/hplj10xx.rules
 +++ b/hplj10xx.rules
 @@ -2,38 +2,42 @@
@@ -14,66 +16,66 @@
 -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" 
-+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
++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" 
-+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
++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" 
-+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
++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" 
-+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
++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" 
-+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
++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" 
-+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
++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" 
-+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
++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" 
-+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
++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" 
-+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
++ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
 +	ATTRS{product}=="HP LaserJet P1505", \
 +	SYMLINK+="hpljP1505-%n", RUN+="hpljP1505" 
 +#Own udev rule for HP Laserjet P1505n
-+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
++ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03f0", \
 +	ATTRS{product}=="HP LaserJet P1505n", \
 +	SYMLINK+="hpljP1505n-%n", RUN+="hpljP1505n" 
diff -Nru foo2zjs-20140519dfsg0/debian/patches/60-getweb.in.patch foo2zjs-20140925dfsg0/debian/patches/60-getweb.in.patch
--- foo2zjs-20140519dfsg0/debian/patches/60-getweb.in.patch	2014-06-05 09:16:26.000000000 +0000
+++ foo2zjs-20140925dfsg0/debian/patches/60-getweb.in.patch	2014-09-30 07:39:18.000000000 +0000
@@ -14,7 +14,7 @@
  #
  # PLEASE don't remove the copyright statements.  They should 
 @@ -12,6 +14,13 @@
- VERSION='$Id: getweb.in,v 1.112 2013/12/25 21:00:11 rick Exp $'
+ VERSION='$Id: getweb.in,v 1.113 2014/09/14 18:32:51 rick Exp $'
  
  WGETOPTS="--passive-ftp -q"
 +ARM2HPDL="/usr/bin/arm2hpdl"
@@ -27,7 +27,7 @@
  
  usage() {
  cat <<EOF
-@@ -77,7 +86,7 @@
+@@ -78,7 +87,7 @@
  
      $ ./getweb 1000	# Get HP LJ 1000 firmware file
      $ ./getweb 1005	# Get HP LJ 1005 firmware file
@@ -36,7 +36,7 @@
      $ ./getweb 1020	# Get HP LJ 1020 firmware file
  
      $ ./getweb p1005	# Get HP LJ P1005 firmware file
-@@ -89,8 +98,6 @@
+@@ -90,8 +99,6 @@
      $ ./getweb all	# Get everything above
  
      $ ./getweb 2300dl_fw # Get Minolta 2300DL v2.55 firmware (experts only)
@@ -45,7 +45,7 @@
  EOF
      exit 1
  }
-@@ -105,7 +112,7 @@
+@@ -106,7 +113,7 @@
  }
  
  SYSTEM=`uname -s`
@@ -54,7 +54,7 @@
  if [ "$SYSTEM" = Darwin -a "$WGET" = "" ]
  then
      WGETOPTS=
-@@ -115,6 +122,18 @@
+@@ -116,6 +123,18 @@
      }
  fi
  
@@ -73,7 +73,7 @@
  #
  #	Download a .EXE file from the web, unzip it, and extract the
  #	files we want
-@@ -161,6 +180,7 @@
+@@ -162,6 +181,7 @@
  	    #lj1488en.exe \
  	    #sihp1000.img
  	copyright "(c) Copyright Hewlett-Packard 2001"
@@ -81,7 +81,7 @@
  	;;
      lj1005|1005)
  	gettgz \
-@@ -176,12 +196,14 @@
+@@ -177,12 +197,14 @@
  	    http://foo2zjs.rkkda.com/firmware sihpP1005.tar.gz \
  	    ""
  	copyright "(c) Copyright Hewlett-Packard 2009"
@@ -96,7 +96,7 @@
  	;;
      lj1020|1020)
  	# http://ftp.hp.com/pub/softlib/software8/COL14041/lj-39322-2/hp_LJ_1020-1022_Full_Solution.exe
-@@ -189,24 +211,28 @@
+@@ -190,24 +212,28 @@
  	    http://foo2zjs.rkkda.com/firmware sihp1020.tar.gz \
  	    ""
  	copyright "(c) Copyright Hewlett-Packard 2005"
@@ -125,7 +125,7 @@
  	;;
      2200dl|2200)
  	if true; then
-@@ -219,6 +245,7 @@
+@@ -220,6 +246,7 @@
  		"*.icm"
  	fi
  	copyright "(c) Copyright Minolta-QMS 1999"
@@ -133,7 +133,7 @@
  	;;
      2300dl|2300)
  	if true; then
-@@ -234,6 +261,7 @@
+@@ -235,6 +262,7 @@
  	    http://foo2zjs.rkkda.com/icm km2430.tar.gz \
  	    ""
  	copyright "(c) Copyright Minolta-QMS 2001"
@@ -141,7 +141,7 @@
  	;;
      2300dl_fw)
  	# 2300DL firmware upgrade to v2.55
-@@ -262,12 +290,14 @@
+@@ -263,12 +291,14 @@
  	    done
  	fi
  	copyright "(c) Copyright Minolta-QMS 1998"
@@ -156,7 +156,7 @@
  	;;
      2530|2490|6115|2480|1600w|1680|1690|4690|110|6121)
  	gettgz \
-@@ -279,6 +309,7 @@
+@@ -280,6 +310,7 @@
  	    http://foo2lava.rkkda.com/icm km-1600.tar.gz \
  	    ""
  	copyright "(c) Copyright Rick Richardson 2009.  All Rights Reserved"
@@ -164,7 +164,7 @@
  	;;
      1500)
  	gettgz \
-@@ -290,12 +321,14 @@
+@@ -291,12 +322,14 @@
  	    ""
  	copyright "(c) Copyright Hewlett-Packard 2003"
  	copyright "(c) Copyright Rick Richardson 2006.  All Rights Reserved"
@@ -179,15 +179,15 @@
  	;;
      1215|1600|2600*)
  	gettgz \
-@@ -310,6 +343,7 @@
+@@ -311,6 +344,7 @@
  	    http://foo2hp.rkkda.com/icm hp1215.tar.gz \
  	    ""
  	copyright "(c) Copyright Rick Richardson 2008.  All Rights Reserved"
 +	puticm foo2hp
  	;;
-     300|310|315|325|365|2160|3160|3175|3185|6110)
+     300|310|315|325|360|365|2160|3160|3175|3185|6110)
  	gettgz \
-@@ -320,6 +354,7 @@
+@@ -321,6 +355,7 @@
  	    http://foo2qpdl.rkkda.com/icm samclp315.tar.gz \
  	    ""
  	copyright "(c) Copyright Rick Richardson 2008.  All Rights Reserved"
@@ -195,7 +195,7 @@
  	;;
      600|610)
  	;;
-@@ -329,6 +364,7 @@
+@@ -330,6 +365,7 @@
  	    http://foo2slx.rkkda.com/icm lexc500.tar.gz \
  	    ""
  	copyright "(c) Copyright Lexmark 2006"
@@ -203,7 +203,7 @@
  	;;
  
      oki)
-@@ -344,42 +380,49 @@
+@@ -345,42 +381,49 @@
  	    mv "$base.ICM" "$base.icm"
  	done
  	copyright "(c) Copyright Okidata 2005, 2006"
@@ -253,7 +253,7 @@
  	;;
  
      xPPD)
-@@ -435,23 +478,6 @@
+@@ -436,23 +479,6 @@
  		# | sed -e 's/\(^\*NickName.*\)"/\1 (foo2zjs recommended)"/'
  	done
  	;;
@@ -277,7 +277,7 @@
      "")
  	usage
  	;;
-@@ -466,6 +492,10 @@
+@@ -467,6 +493,10 @@
      usage
  fi
  
@@ -288,7 +288,7 @@
  for i in $*
  do
      case "$1" in
-@@ -509,3 +539,6 @@
+@@ -510,3 +540,6 @@
  	;;
      esac
  done
diff -Nru foo2zjs-20140519dfsg0/debian/patches/70-lib-firwmare-hp.patch foo2zjs-20140925dfsg0/debian/patches/70-lib-firwmare-hp.patch
--- foo2zjs-20140519dfsg0/debian/patches/70-lib-firwmare-hp.patch	2014-06-05 09:16:26.000000000 +0000
+++ foo2zjs-20140925dfsg0/debian/patches/70-lib-firwmare-hp.patch	2014-09-30 07:39:19.000000000 +0000
@@ -1,7 +1,7 @@
 Firmware directory is /lib/firmware/hp/ (Closes: #517957)
 --- a/getweb.in
 +++ b/getweb.in
-@@ -125,7 +125,7 @@
+@@ -126,7 +126,7 @@
  putfw() {
      inputname=$1
      outputname=$2
diff -Nru foo2zjs-20140519dfsg0/debian/patches/90-manpages.patch foo2zjs-20140925dfsg0/debian/patches/90-manpages.patch
--- foo2zjs-20140519dfsg0/debian/patches/90-manpages.patch	2014-06-05 12:57:27.000000000 +0000
+++ foo2zjs-20140925dfsg0/debian/patches/90-manpages.patch	2014-09-30 07:39:19.000000000 +0000
@@ -389,7 +389,7 @@
  .TE
  .TP
  .BI \-d\0 duplex
-@@ -119,9 +119,9 @@
+@@ -120,9 +120,9 @@
  Orientation used for N-up.
  .TS
  l l l.
@@ -402,7 +402,7 @@
  .TE
  .SS Printer Tweaking Options
  These are the options used to customize the operation of \fBfoo2hbpl2\fP
-@@ -140,13 +140,13 @@
+@@ -141,13 +141,13 @@
  been tested on any other printers.
  .TP
  .BI \-L\0 mask
@@ -418,7 +418,7 @@
  good in most cases.
  .TS
  l l.
-@@ -172,7 +172,7 @@
+@@ -173,7 +173,7 @@
  Color correction is currently a WORK IN PROGRESS.
  .TP
  .BI \-g\0 gsopts
@@ -427,7 +427,7 @@
  etc.  This option may appear more than once.
  .TP
  .BI \-G\0 profile.icm
-@@ -217,7 +217,7 @@
+@@ -218,7 +218,7 @@
  .nf
  foo2hbpl2-wrapper testpage.ps > testpage.prn
  hbpl2decode < testpage.prn
@@ -436,7 +436,7 @@
  .fi
  .RE
  .P
-@@ -225,7 +225,7 @@
+@@ -226,7 +226,7 @@
  
  .RS
  .nf
@@ -447,7 +447,7 @@
  
 --- a/foo2hbpl2.1in
 +++ b/foo2hbpl2.1in
-@@ -126,7 +126,7 @@
+@@ -127,7 +127,7 @@
  lower right corner, in pixels [0x0].
  .TP
  .BI \-L\0 mask
@@ -456,7 +456,7 @@
  .TS
  l l.
  0	don't send any logical clipping amounts
-@@ -174,10 +174,10 @@
+@@ -175,10 +175,10 @@
  
  .RS
  .nf
@@ -471,7 +471,7 @@
  .fi
  .RE
  .P
-@@ -185,10 +185,10 @@
+@@ -186,10 +186,10 @@
  
  .RS
  .nf
diff -Nru foo2zjs-20140519dfsg0/debian/patches/97-hplj1000-fix-firmware-upload-infite-loop.patch foo2zjs-20140925dfsg0/debian/patches/97-hplj1000-fix-firmware-upload-infite-loop.patch
--- foo2zjs-20140519dfsg0/debian/patches/97-hplj1000-fix-firmware-upload-infite-loop.patch	1970-01-01 00:00:00.000000000 +0000
+++ foo2zjs-20140925dfsg0/debian/patches/97-hplj1000-fix-firmware-upload-infite-loop.patch	2014-10-02 20:28:33.000000000 +0000
@@ -0,0 +1,48 @@
+Description: Prevent an infinite loop when loading the firmware.
+ When using the load_cups method, the CUPS backend will internally
+ unload and reload the usblp module. This will generate
+ SUBSYSTEM=usbmisc events that need to be ignored in the CUPS code
+ path, or this script will be rerun in an infite loop.
+   
+ But when using the load_usblp method, the usblp module is obviously
+ needed. So in this situation we need to ignore the SUBSYSTEM=usb
+ events.
+Bug-Debian: http://bugs.debian.org/663868
+Author: Peter De Wachter <pdewacht@gmail.com>
+Last-Update: 2014-10-02
+--- a/hplj1000
++++ b/hplj1000
+@@ -24,11 +24,6 @@
+ #		Mike Morgan (2004)
+ #
+ 
+-# udev calls us twice on FC4! Just want /dev/usb/lp<N>
+-case "$DEVNAME" in
+-/dev/usb/usb*)	exit;;
+-esac
+-
+ PROGNAME="$0"
+ 
+ #
+@@ -260,6 +255,7 @@
+     #
+     # force downloading to a specific device
+     #
++    if [ "$SUBSYSTEM" != "usbmisc" ]; then exit; fi
+     load_usblp "$DEV"
+ elif [ -x $USB_BACKEND ]; then
+         #
+@@ -267,11 +263,13 @@
+         # not need to care whether the system uses the usblp kernel module or
+         # libusb 
+         #
++        if [ "$SUBSYSTEM" != "usb" ]; then exit; fi
+         load_cups
+ elif [ -x $PRINTERID ]; then
+ 	#
+ 	# Sniff around for printers that need a firmware download
+ 	#
++	if [ "$SUBSYSTEM" != "usbmisc" ]; then exit; fi
+ 	usblps=`find /dev/usb -type c -name 'lp*'`" "`find /dev -type c -name 'usblp*'`
+ 	for dev in $usblps; do
+ 	    status=`$PRINTERID $dev 2>/dev/null | grep -y "hp LaserJet $MODEL"`
diff -Nru foo2zjs-20140519dfsg0/debian/patches/series foo2zjs-20140925dfsg0/debian/patches/series
--- foo2zjs-20140519dfsg0/debian/patches/series	2014-08-07 20:10:23.000000000 +0000
+++ foo2zjs-20140925dfsg0/debian/patches/series	2014-10-02 20:28:17.000000000 +0000
@@ -1,6 +1,8 @@
 10-makefile.patch
 12-fix-implicit-declaration.patch
+20-system-lcms.patch
 20-system-libjbig.patch
+20-system-liblcms.patch
 # in debian/rules: 20-honour-papersize.patch
 # in debian/rules: 20-PDF-input-data-in-PPDs.patch
 30-udev-rules.patch
@@ -17,3 +19,4 @@
 92-udev-firmware-script-fixes.patch
 95-udev-firmware-script-no-hplip-rules-removal.patch
 96-hplj1000-fix-cups-usb-backend-firmware-upload.patch
+97-hplj1000-fix-firmware-upload-infite-loop.patch
diff -Nru foo2zjs-20140519dfsg0/debian/printer-driver-foo2zjs-common.install foo2zjs-20140925dfsg0/debian/printer-driver-foo2zjs-common.install
--- foo2zjs-20140519dfsg0/debian/printer-driver-foo2zjs-common.install	2014-06-05 09:16:27.000000000 +0000
+++ foo2zjs-20140925dfsg0/debian/printer-driver-foo2zjs-common.install	2014-09-30 07:35:47.000000000 +0000
@@ -49,7 +49,6 @@
 usr/share/man/man1/foo2xqx.1
 usr/share/man/man1/foo2xqx-wrapper.1
 usr/share/man/man1/foo2zjs.1
-usr/share/man/man1/foo2zjs-icc2ps.1
 usr/share/man/man1/foo2zjs-pstops.1
 usr/share/man/man1/foo2zjs-wrapper.1
 usr/share/man/man1/gipddecode.1
diff -Nru foo2zjs-20140519dfsg0/debian/printer-driver-foo2zjs.install foo2zjs-20140925dfsg0/debian/printer-driver-foo2zjs.install
--- foo2zjs-20140519dfsg0/debian/printer-driver-foo2zjs.install	2014-06-05 09:16:27.000000000 +0000
+++ foo2zjs-20140925dfsg0/debian/printer-driver-foo2zjs.install	2014-09-30 07:35:47.000000000 +0000
@@ -8,7 +8,6 @@
 usr/bin/foo2slx
 usr/bin/foo2xqx
 usr/bin/foo2zjs
-usr/bin/foo2zjs-icc2ps
 usr/bin/gipddecode
 usr/bin/hbpldecode
 usr/bin/hipercdecode
diff -Nru foo2zjs-20140519dfsg0/debian/printer-driver-foo2zjs.links foo2zjs-20140925dfsg0/debian/printer-driver-foo2zjs.links
--- foo2zjs-20140519dfsg0/debian/printer-driver-foo2zjs.links	2014-06-05 09:16:27.000000000 +0000
+++ foo2zjs-20140925dfsg0/debian/printer-driver-foo2zjs.links	2014-09-30 07:35:47.000000000 +0000
@@ -7,3 +7,5 @@
 lib/udev/hplj1000 lib/udev/hpljP1008
 lib/udev/hplj1000 lib/udev/hpljP1505
 lib/udev/hplj1000 lib/udev/hpljP1505n
+
+usr/bin/psicc usr/bin/foo2zjs-icc2ps
diff -Nru foo2zjs-20140519dfsg0/debian/rules foo2zjs-20140925dfsg0/debian/rules
--- foo2zjs-20140519dfsg0/debian/rules	2014-06-05 09:16:27.000000000 +0000
+++ foo2zjs-20140925dfsg0/debian/rules	2014-09-30 14:39:17.000000000 +0000
@@ -76,6 +76,13 @@
 	# Debian considers mscompress to be a Recommends of printer-driver-foo2zjs
 	echo "debian:mscompress=mscompress" >> debian/printer-driver-foo2zjs.substvars
 endif
+ifeq ($(derives_from_ubuntu),yes)
+	# Ubuntu considers tix to be a Suggest of printer-driver-foo2zjs
+	echo "ubuntu:tix=tix" >> debian/printer-driver-foo2zjs.substvars
+else
+	# Debian considers tix to be a Depends of printer-driver-foo2zjs
+	echo "debian:tix=tix" >> debian/printer-driver-foo2zjs.substvars
+endif
 	dh_gencontrol
 
 override_dh_auto_clean:
diff -Nru foo2zjs-20140519dfsg0/foo2hbpl2.1in foo2zjs-20140925dfsg0/foo2hbpl2.1in
--- foo2zjs-20140519dfsg0/foo2hbpl2.1in	2014-06-05 09:14:28.000000000 +0000
+++ foo2zjs-20140925dfsg0/foo2hbpl2.1in	2014-09-30 07:35:30.000000000 +0000
@@ -80,6 +80,7 @@
 _
 A4	1
 B5jis	2
+A5	3
 letter	4
 executive	5
 fanfold german legal	6
diff -Nru foo2zjs-20140519dfsg0/foo2hbpl2.c foo2zjs-20140925dfsg0/foo2hbpl2.c
--- foo2zjs-20140519dfsg0/foo2hbpl2.c	2014-06-05 09:14:28.000000000 +0000
+++ foo2zjs-20140925dfsg0/foo2hbpl2.c	2014-09-30 07:35:30.000000000 +0000
@@ -56,7 +56,7 @@
 
 */
 
-static char Version[] = "$Id: foo2hbpl2.c,v 1.32 2014/04/17 17:09:30 rick Exp $";
+static char Version[] = "$Id: foo2hbpl2.c,v 1.33 2014/09/25 14:36:32 rick Exp $";
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -184,7 +184,7 @@
 "                    6=envelope, 7=recycled, 8=plain2, 9=bond2,\n"
 "                    10=lwcard2, 11=lwgcard2, 12=recycled2\n"
 "-p paper          Paper code to send to printer [%d]\n"
-"                    1=A4, 2=B5, 4=letter, 5=executive,\n"
+"                    1=A4, 2=B5, 3=A5, 4=letter, 5=executive,\n"
 "                    6=fanfoldgermanlegal/folio, 7=legal, 9=env#10,\n"
 "                    10=envMonarch, 11=envC5, 12=envDL\n"
 "-n copies         Number of copies [%d]\n"
diff -Nru foo2zjs-20140519dfsg0/foo2hbpl2-wrapper.1in foo2zjs-20140925dfsg0/foo2hbpl2-wrapper.1in
--- foo2zjs-20140519dfsg0/foo2hbpl2-wrapper.1in	2014-06-05 09:14:28.000000000 +0000
+++ foo2zjs-20140925dfsg0/foo2hbpl2-wrapper.1in	2014-09-30 07:35:30.000000000 +0000
@@ -81,6 +81,7 @@
 _
 A4	1
 B5jis	2
+A5	3
 letter	4
 executive	5
 fanfold german legal	6
diff -Nru foo2zjs-20140519dfsg0/foo2hbpl2-wrapper.in foo2zjs-20140925dfsg0/foo2hbpl2-wrapper.in
--- foo2zjs-20140519dfsg0/foo2hbpl2-wrapper.in	2014-06-05 09:14:28.000000000 +0000
+++ foo2zjs-20140925dfsg0/foo2hbpl2-wrapper.in	2014-09-30 07:35:30.000000000 +0000
@@ -18,7 +18,7 @@
 #*
 #* Authors: Rick Richardson <rick.richardson@comcast.net>
 
-VERSION='$Id: foo2hbpl2-wrapper.in,v 1.9 2014/05/04 21:45:12 rick Exp $'
+VERSION='$Id: foo2hbpl2-wrapper.in,v 1.10 2014/09/25 14:36:32 rick Exp $'
 
 #
 # Printer Notes:
@@ -67,7 +67,7 @@
 		    6=envelope, 7=recycled, 8=plain2, 9=bond2,
 		    10=lwcard2, 11=lwgcard2, 12=recycled2
 -p paper          Paper code [$PAPER]
-		    1=A4, 2=B5, 4=letter, 5=executive,
+		    1=A4, 2=B5, 3=A5, 4=letter, 5=executive,
 		    6=fanfoldgermanlegal/folio, 7=legal, 9=env#10,
 		    10=envMonarch, 11=envC5, 12=envDL
 -n copies         Number of copies [$COPIES]
@@ -433,6 +433,9 @@
 2|b5jis|B5jis)	PAPER=2;	paper=b5;        XDIM="8598";  YDIM="6070"
 		set_clipping 138 100	138 100		# modulo 256
 		;;
+3|a5|A5)	PAPER=3;	paper=a5;        XDIM="6992";  YDIM="4960"
+		set_clipping 168 100	168 100		# modulo 256
+		;;
 4|letter)	PAPER=4;	paper=letter;    XDIM="10200"; YDIM="6600"
 		set_clipping 150 100	150 100
 		;;
@@ -458,9 +461,6 @@
 12|envDL)	PAPER=12;	paper=envDL;     XDIM="5200";  YDIM="5200"
 		set_clipping 168 100	168 100		# modulo 256
 		;;
-#16|a5|A5)	PAPER=16;	paper=a5;        XDIM="6992";  YDIM="4960"
-#		set_clipping 168 100	168 100		# modulo 256
-#		;;
 #24|folio)	PAPER=24;	paper=folio;     XDIM="9922"; YDIM="7796"
 #		set_clipping 150 100	150 100
 #		;;
diff -Nru foo2zjs-20140519dfsg0/foo2lava.c foo2zjs-20140925dfsg0/foo2lava.c
--- foo2zjs-20140519dfsg0/foo2lava.c	2014-06-05 09:14:28.000000000 +0000
+++ foo2zjs-20140925dfsg0/foo2lava.c	2014-09-30 07:35:30.000000000 +0000
@@ -21,6 +21,7 @@
      - Konica Minolta magicolor 1690MF		B/W and color
      - Konica Minolta magicolor 4690MF		B/W and color
      - Oki C110					B/W and color
+     - Xerox Phaser 6121MFP			B/W and color
 
 AUTHORS
 It also uses Markus Kuhn's jbig-kit compression library (included, but
@@ -57,7 +58,7 @@
 
 */
 
-static char Version[] = "$Id: foo2lava.c,v 1.39 2011/06/09 13:33:01 rick Exp $";
+static char Version[] = "$Id: foo2lava.c,v 1.40 2014/06/27 14:34:46 rick Exp $";
 
 #include <stdio.h>
 #include <stdlib.h>
diff -Nru foo2zjs-20140519dfsg0/foo2lava-wrapper.in foo2zjs-20140925dfsg0/foo2lava-wrapper.in
--- foo2zjs-20140519dfsg0/foo2lava-wrapper.in	2014-06-05 09:14:28.000000000 +0000
+++ foo2zjs-20140925dfsg0/foo2lava-wrapper.in	2014-09-30 07:35:30.000000000 +0000
@@ -18,7 +18,7 @@
 #*
 #* Authors: Rick Richardson <rick.richardson@comcast.net>
 
-VERSION='$Id: foo2lava-wrapper.in,v 1.47 2011/01/14 23:21:39 rick Exp $'
+VERSION='$Id: foo2lava-wrapper.in,v 1.48 2014/06/27 14:34:46 rick Exp $'
 
 #
 # Printer Notes:
@@ -31,6 +31,7 @@
 #	Konica Minolta magicolor 1680MF -	-z2
 #	Konica Minolta magicolor 1690MF -	-z2
 #	Oki C110 -				-z2
+#	Xerox Phaser 6121MFP -			-z2
 #
 # OPL:
 #	Konica Minolta 2480 MF -		-z1
diff -Nru foo2zjs-20140519dfsg0/foomatic-db/opt/foo2hbpl2-PageSize.xml foo2zjs-20140925dfsg0/foomatic-db/opt/foo2hbpl2-PageSize.xml
--- foo2zjs-20140519dfsg0/foomatic-db/opt/foo2hbpl2-PageSize.xml	2014-06-05 09:14:28.000000000 +0000
+++ foo2zjs-20140925dfsg0/foomatic-db/opt/foo2hbpl2-PageSize.xml	2014-09-30 07:35:30.000000000 +0000
@@ -26,6 +26,11 @@
 	    <ev_shortname> <en>B5jis</en> </ev_shortname>
 	    <ev_driverval>2</ev_driverval>
 	</enum_val>
+	<enum_val id="ev/foo2hbpl2-PageSize-3">
+	    <ev_longname> <en>A5</en> </ev_longname>
+	    <ev_shortname> <en>A5</en> </ev_shortname>
+	    <ev_driverval>3</ev_driverval>
+	</enum_val>
 	<enum_val id="ev/foo2hbpl2-PageSize-4">
 	    <ev_longname> <en>Letter</en> </ev_longname>
 	    <ev_shortname> <en>Letter</en> </ev_shortname>
diff -Nru foo2zjs-20140519dfsg0/foomatic-db/opt/foo2hbpl2-Resolution.xml foo2zjs-20140925dfsg0/foomatic-db/opt/foo2hbpl2-Resolution.xml
--- foo2zjs-20140519dfsg0/foomatic-db/opt/foo2hbpl2-Resolution.xml	2014-06-05 09:14:28.000000000 +0000
+++ foo2zjs-20140925dfsg0/foomatic-db/opt/foo2hbpl2-Resolution.xml	2014-09-30 07:35:30.000000000 +0000
@@ -52,6 +52,12 @@
 		    <make>Epson</make> <model>AcuLaser M1400</model>
 	        </constraint>
 	        <constraint sense="true">
+		    <make>Fuji Xerox</make> <model>DocuPrint CM205</model>
+	        </constraint>
+	        <constraint sense="true">
+		    <make>Fuji Xerox</make> <model>DocuPrint CM215</model>
+	        </constraint>
+	        <constraint sense="true">
 		    <make>Fuji Xerox</make> <model>DocuPrint M215</model>
 	        </constraint>
 	        <constraint sense="true">
@@ -97,6 +103,12 @@
 		    <make>Epson</make> <model>AcuLaser M1400</model>
 	        </constraint>
 	        <constraint sense="true">
+		    <make>Fuji Xerox</make> <model>DocuPrint CM205</model>
+	        </constraint>
+	        <constraint sense="true">
+		    <make>Fuji Xerox</make> <model>DocuPrint CM215</model>
+	        </constraint>
+	        <constraint sense="true">
 		    <make>Fuji Xerox</make> <model>DocuPrint M215</model>
 	        </constraint>
 	        <constraint sense="true">
diff -Nru foo2zjs-20140519dfsg0/getweb.in foo2zjs-20140925dfsg0/getweb.in
--- foo2zjs-20140519dfsg0/getweb.in	2014-06-05 09:14:28.000000000 +0000
+++ foo2zjs-20140925dfsg0/getweb.in	2014-09-30 07:35:30.000000000 +0000
@@ -9,7 +9,7 @@
 # be displayed to the human that is running this.
 #
 
-VERSION='$Id: getweb.in,v 1.112 2013/12/25 21:00:11 rick Exp $'
+VERSION='$Id: getweb.in,v 1.113 2014/09/14 18:32:51 rick Exp $'
 
 WGETOPTS="--passive-ftp -q"
 
@@ -48,6 +48,7 @@
     $ ./getweb 310	# Get Samsung CLP-310 .ICM files
     $ ./getweb 315	# Get Samsung CLP-315 .ICM files
     $ ./getweb 325	# Get Samsung CLP-325 .ICM files
+    $ ./getweb 360	# Get Samsung CLP-360 .ICM files
     $ ./getweb 365	# Get Samsung CLP-365 .ICM files
     $ ./getweb 600	# Get Samsung CLP-600 .ICM files
     $ ./getweb 610	# Get Samsung CLP-610 .ICM files
@@ -311,7 +312,7 @@
 	    ""
 	copyright "(c) Copyright Rick Richardson 2008.  All Rights Reserved"
 	;;
-    300|310|315|325|365|2160|3160|3175|3185|6110)
+    300|310|315|325|360|365|2160|3160|3175|3185|6110)
 	gettgz \
 	    http://foo2qpdl.rkkda.com/icm samclp300.tar.gz \
 	    ""
diff -Nru foo2zjs-20140519dfsg0/hbpldecode.c foo2zjs-20140925dfsg0/hbpldecode.c
--- foo2zjs-20140519dfsg0/hbpldecode.c	2014-06-05 09:14:28.000000000 +0000
+++ foo2zjs-20140925dfsg0/hbpldecode.c	2014-09-30 07:35:30.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * $Id: hbpldecode.c,v 1.64 2014/05/04 21:45:12 rick Exp $
+ * $Id: hbpldecode.c,v 1.66 2014/09/25 14:28:15 rick Exp $
  */
 
 /*b
@@ -288,7 +288,7 @@
 	((X) >= 0 && (X) < sizeof(A)/sizeof(A[0])) \
 	? A[X] : "UNK"
     char *strsize[] = {
-	/*00*/	"Custom", "A4", "B5", "unk", "Letter",
+	/*00*/	"Custom", "A4", "B5", "A5", "Letter",
 	/*05*/	"Executive", "FanFoldGermanLegal", "Legal", "unk", "env#10",
 	/*10*/	"envMonarch", "envC5", "envDL", "unk", "unk",
 	};
@@ -299,6 +299,7 @@
 	/*10*/	"LwCard-side2", "LwGCard-side2", "Recycled-side2",
 	};
 
+    proff(curOff); printf("[hbpldecode2]\n");
     for (;;)
     {
 	len = 4;
@@ -738,6 +739,7 @@
 	    strsize[i] = "Custom";
     strsize[205] = "folio";	// 8.5x13
 
+    proff(*curOff); printf("[hbpldecode1]\n");
     while ((proff(*curOff), (*curOff)++, rectype = fgetc(fp)) != EOF)
     {
 	printf("RECTYPE '%c' [0x%x]:\n", rectype, rectype);
diff -Nru foo2zjs-20140519dfsg0/INSTALL foo2zjs-20140925dfsg0/INSTALL
--- foo2zjs-20140519dfsg0/INSTALL	2014-06-05 09:14:28.000000000 +0000
+++ foo2zjs-20140925dfsg0/INSTALL	2014-09-30 07:35:30.000000000 +0000
@@ -68,6 +68,7 @@
     $ ./getweb 300      # Get Samsung CLP-300 .ICM files
     $ ./getweb 315      # Get Samsung CLP-315 .ICM files
     $ ./getweb 325      # Get Samsung CLP-325 .ICM files
+    $ ./getweb 360      # Get Samsung CLP-360 .ICM files
     $ ./getweb 365      # Get Samsung CLP-365 .ICM files
     $ ./getweb 600      # Get Samsung CLP-600 .ICM files
     $ ./getweb 610      # Get Samsung CLP-610 .ICM files
@@ -831,7 +832,7 @@
 	Dell 1355 or Xerox 6015		default resolution
 	Samsung CLP-315			default resolution
 	Samsung CLP-325			default resolution
-	Samsung CLP-365			default resolution
+	Samsung CLP-360 or 365		default resolution
 	Samsung CLP-600			default resolution
 	Samsung CLP-610			default resolution
 	Samsung CLP-620			default resolution
diff -Nru foo2zjs-20140519dfsg0/INSTALL.in foo2zjs-20140925dfsg0/INSTALL.in
--- foo2zjs-20140519dfsg0/INSTALL.in	2014-06-05 09:14:28.000000000 +0000
+++ foo2zjs-20140925dfsg0/INSTALL.in	2014-09-30 07:35:30.000000000 +0000
@@ -39,6 +39,7 @@
     $ ./getweb 300      # Get Samsung CLP-300 .ICM files
     $ ./getweb 315      # Get Samsung CLP-315 .ICM files
     $ ./getweb 325      # Get Samsung CLP-325 .ICM files
+    $ ./getweb 360      # Get Samsung CLP-360 .ICM files
     $ ./getweb 365      # Get Samsung CLP-365 .ICM files
     $ ./getweb 600      # Get Samsung CLP-600 .ICM files
     $ ./getweb 610      # Get Samsung CLP-610 .ICM files
@@ -802,7 +803,7 @@
 	Dell 1355 or Xerox 6015		default resolution
 	Samsung CLP-315			default resolution
 	Samsung CLP-325			default resolution
-	Samsung CLP-365			default resolution
+	Samsung CLP-360 or 365		default resolution
 	Samsung CLP-600			default resolution
 	Samsung CLP-610			default resolution
 	Samsung CLP-620			default resolution
diff -Nru foo2zjs-20140519dfsg0/INSTALL.osx foo2zjs-20140925dfsg0/INSTALL.osx
--- foo2zjs-20140519dfsg0/INSTALL.osx	2014-06-05 09:14:28.000000000 +0000
+++ foo2zjs-20140925dfsg0/INSTALL.osx	2014-09-30 07:35:30.000000000 +0000
@@ -55,6 +55,7 @@
     $ sudo port install coreutils
     $ sudo port install gsed
     $ sudo port install wget
+    $ sudo port install a2ps
     $ sudo port install ghostscript
 
 	NOTE: Use ghostscript 8.63 or before OR 8.64_2 or after if you want
diff -Nru foo2zjs-20140519dfsg0/lavadecode.c foo2zjs-20140925dfsg0/lavadecode.c
--- foo2zjs-20140519dfsg0/lavadecode.c	2014-06-05 09:14:28.000000000 +0000
+++ foo2zjs-20140925dfsg0/lavadecode.c	2014-09-30 07:35:30.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * $Id: lavadecode.c,v 1.35 2014/01/24 19:25:47 rick Exp $
+ * $Id: lavadecode.c,v 1.36 2014/06/27 14:41:37 rick Exp $
  */
 
 /*b
@@ -250,7 +250,7 @@
 		    else
 		    {
 			proff(curOff-1);
-			printf("ch=0x%x\n", c);
+			printf("ch=0x%x (%s)\n", c, c==0x0c ? "form feed" : "");
 		    }
 		    break;
 		case '\033':
diff -Nru foo2zjs-20140519dfsg0/PPD/Dell-1355.ppd foo2zjs-20140925dfsg0/PPD/Dell-1355.ppd
--- foo2zjs-20140519dfsg0/PPD/Dell-1355.ppd	2014-06-05 09:14:28.000000000 +0000
+++ foo2zjs-20140925dfsg0/PPD/Dell-1355.ppd	2014-09-30 07:35:30.000000000 +0000
@@ -113,6 +113,8 @@
 *FoomaticRIPOptionSetting PageSize=Letter: "-p4 "
 *PageSize A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4"
 *FoomaticRIPOptionSetting PageSize=A4: "-p1 "
+*PageSize A5/A5: "%% FoomaticRIPOptionSetting: PageSize=A5"
+*FoomaticRIPOptionSetting PageSize=A5: "-p3 "
 *PageSize B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis"
 *FoomaticRIPOptionSetting PageSize=B5jis: "-p2 "
 *PageSize Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10"
@@ -138,6 +140,7 @@
 *DefaultPageRegion: Letter
 *PageRegion Letter/Letter: "%% FoomaticRIPOptionSetting: PageSize=Letter"
 *PageRegion A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4"
+*PageRegion A5/A5: "%% FoomaticRIPOptionSetting: PageSize=A5"
 *PageRegion B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis"
 *PageRegion Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10"
 *PageRegion EnvC5/Env C5: "%% FoomaticRIPOptionSetting: PageSize=EnvC5"
@@ -152,6 +155,7 @@
 *DefaultImageableArea: Letter
 *ImageableArea Letter/Letter: "9 12.00 603 780.00"
 *ImageableArea A4/A4: "9 12.00 586 830.00"
+*ImageableArea A5/A5: "9 12.00 411 583.00"
 *ImageableArea B5jis/B5 (JIS): "9 12.00 509 715.00"
 *ImageableArea Env10/Env #10: "9 12.00 288 672.00"
 *ImageableArea EnvC5/Env C5: "9 12.00 450 637.00"
@@ -165,6 +169,7 @@
 *DefaultPaperDimension: Letter
 *PaperDimension Letter/Letter: "612 792"
 *PaperDimension A4/A4: "595 842"
+*PaperDimension A5/A5: "420 595"
 *PaperDimension B5jis/B5 (JIS): "518 727"
 *PaperDimension Env10/Env #10: "297 684"
 *PaperDimension EnvC5/Env C5: "459 649"
diff -Nru foo2zjs-20140519dfsg0/PPD/Dell-C1765.ppd foo2zjs-20140925dfsg0/PPD/Dell-C1765.ppd
--- foo2zjs-20140519dfsg0/PPD/Dell-C1765.ppd	2014-06-05 09:14:28.000000000 +0000
+++ foo2zjs-20140925dfsg0/PPD/Dell-C1765.ppd	2014-09-30 07:35:30.000000000 +0000
@@ -113,6 +113,8 @@
 *FoomaticRIPOptionSetting PageSize=Letter: "-p4 "
 *PageSize A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4"
 *FoomaticRIPOptionSetting PageSize=A4: "-p1 "
+*PageSize A5/A5: "%% FoomaticRIPOptionSetting: PageSize=A5"
+*FoomaticRIPOptionSetting PageSize=A5: "-p3 "
 *PageSize B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis"
 *FoomaticRIPOptionSetting PageSize=B5jis: "-p2 "
 *PageSize Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10"
@@ -138,6 +140,7 @@
 *DefaultPageRegion: Letter
 *PageRegion Letter/Letter: "%% FoomaticRIPOptionSetting: PageSize=Letter"
 *PageRegion A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4"
+*PageRegion A5/A5: "%% FoomaticRIPOptionSetting: PageSize=A5"
 *PageRegion B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis"
 *PageRegion Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10"
 *PageRegion EnvC5/Env C5: "%% FoomaticRIPOptionSetting: PageSize=EnvC5"
@@ -152,6 +155,7 @@
 *DefaultImageableArea: Letter
 *ImageableArea Letter/Letter: "9 12.00 603 780.00"
 *ImageableArea A4/A4: "9 12.00 586 830.00"
+*ImageableArea A5/A5: "9 12.00 411 583.00"
 *ImageableArea B5jis/B5 (JIS): "9 12.00 509 715.00"
 *ImageableArea Env10/Env #10: "9 12.00 288 672.00"
 *ImageableArea EnvC5/Env C5: "9 12.00 450 637.00"
@@ -165,6 +169,7 @@
 *DefaultPaperDimension: Letter
 *PaperDimension Letter/Letter: "612 792"
 *PaperDimension A4/A4: "595 842"
+*PaperDimension A5/A5: "420 595"
 *PaperDimension B5jis/B5 (JIS): "518 727"
 *PaperDimension Env10/Env #10: "297 684"
 *PaperDimension EnvC5/Env C5: "459 649"
diff -Nru foo2zjs-20140519dfsg0/PPD/Epson-AcuLaser_M1400.ppd foo2zjs-20140925dfsg0/PPD/Epson-AcuLaser_M1400.ppd
--- foo2zjs-20140519dfsg0/PPD/Epson-AcuLaser_M1400.ppd	2014-06-05 09:14:28.000000000 +0000
+++ foo2zjs-20140925dfsg0/PPD/Epson-AcuLaser_M1400.ppd	2014-09-30 07:35:30.000000000 +0000
@@ -113,6 +113,8 @@
 *FoomaticRIPOptionSetting PageSize=Letter: "-p4 "
 *PageSize A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4"
 *FoomaticRIPOptionSetting PageSize=A4: "-p1 "
+*PageSize A5/A5: "%% FoomaticRIPOptionSetting: PageSize=A5"
+*FoomaticRIPOptionSetting PageSize=A5: "-p3 "
 *PageSize B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis"
 *FoomaticRIPOptionSetting PageSize=B5jis: "-p2 "
 *PageSize Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10"
@@ -138,6 +140,7 @@
 *DefaultPageRegion: Letter
 *PageRegion Letter/Letter: "%% FoomaticRIPOptionSetting: PageSize=Letter"
 *PageRegion A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4"
+*PageRegion A5/A5: "%% FoomaticRIPOptionSetting: PageSize=A5"
 *PageRegion B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis"
 *PageRegion Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10"
 *PageRegion EnvC5/Env C5: "%% FoomaticRIPOptionSetting: PageSize=EnvC5"
@@ -152,6 +155,7 @@
 *DefaultImageableArea: Letter
 *ImageableArea Letter/Letter: "9 12.00 603 780.00"
 *ImageableArea A4/A4: "9 12.00 586 830.00"
+*ImageableArea A5/A5: "9 12.00 411 583.00"
 *ImageableArea B5jis/B5 (JIS): "9 12.00 509 715.00"
 *ImageableArea Env10/Env #10: "9 12.00 288 672.00"
 *ImageableArea EnvC5/Env C5: "9 12.00 450 637.00"
@@ -165,6 +169,7 @@
 *DefaultPaperDimension: Letter
 *PaperDimension Letter/Letter: "612 792"
 *PaperDimension A4/A4: "595 842"
+*PaperDimension A5/A5: "420 595"
 *PaperDimension B5jis/B5 (JIS): "518 727"
 *PaperDimension Env10/Env #10: "297 684"
 *PaperDimension EnvC5/Env C5: "459 649"
diff -Nru foo2zjs-20140519dfsg0/PPD/Fuji_Xerox-DocuPrint_CM205.ppd foo2zjs-20140925dfsg0/PPD/Fuji_Xerox-DocuPrint_CM205.ppd
--- foo2zjs-20140519dfsg0/PPD/Fuji_Xerox-DocuPrint_CM205.ppd	2014-06-05 09:14:28.000000000 +0000
+++ foo2zjs-20140925dfsg0/PPD/Fuji_Xerox-DocuPrint_CM205.ppd	2014-09-30 07:35:30.000000000 +0000
@@ -102,8 +102,17 @@
 *FoomaticRIPOptionSetting ColorMode=Monochrome: " "
 *CloseUI: *ColorMode
 
-*FoomaticRIPOption Resolution: enum CmdLine A 130
+*OpenUI *Resolution/Resolution: PickOne
+*FoomaticRIPOption Resolution: enum CmdLine A
+*OrderDependency: 130 AnySetup *Resolution
+*DefaultResolution: 1200x600dpi
+*Resolution 600x600dpi/600x600 dpi: "%% FoomaticRIPOptionSetting: Resolution=600x600dpi"
+*FoomaticRIPOptionSetting Resolution=600x600dpi: "-r600x600 "
+*Resolution 1200x600dpi/1200x600 dpi: "%% FoomaticRIPOptionSetting: Resolution=1200x600dpi"
 *FoomaticRIPOptionSetting Resolution=1200x600dpi: "-r1200x600 "
+*Resolution 1200x1200dpi/1200x1200 dpi: "%% FoomaticRIPOptionSetting: Resolution=1200x1200dpi"
+*FoomaticRIPOptionSetting Resolution=1200x1200dpi: "-r1200x1200 "
+*CloseUI: *Resolution
 
 *OpenUI *PageSize/Page Size: PickOne
 *FoomaticRIPOption PageSize: enum CmdLine A
@@ -113,6 +122,8 @@
 *FoomaticRIPOptionSetting PageSize=Letter: "-p4 "
 *PageSize A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4"
 *FoomaticRIPOptionSetting PageSize=A4: "-p1 "
+*PageSize A5/A5: "%% FoomaticRIPOptionSetting: PageSize=A5"
+*FoomaticRIPOptionSetting PageSize=A5: "-p3 "
 *PageSize B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis"
 *FoomaticRIPOptionSetting PageSize=B5jis: "-p2 "
 *PageSize Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10"
@@ -138,6 +149,7 @@
 *DefaultPageRegion: Letter
 *PageRegion Letter/Letter: "%% FoomaticRIPOptionSetting: PageSize=Letter"
 *PageRegion A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4"
+*PageRegion A5/A5: "%% FoomaticRIPOptionSetting: PageSize=A5"
 *PageRegion B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis"
 *PageRegion Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10"
 *PageRegion EnvC5/Env C5: "%% FoomaticRIPOptionSetting: PageSize=EnvC5"
@@ -152,6 +164,7 @@
 *DefaultImageableArea: Letter
 *ImageableArea Letter/Letter: "9 12.00 603 780.00"
 *ImageableArea A4/A4: "9 12.00 586 830.00"
+*ImageableArea A5/A5: "9 12.00 411 583.00"
 *ImageableArea B5jis/B5 (JIS): "9 12.00 509 715.00"
 *ImageableArea Env10/Env #10: "9 12.00 288 672.00"
 *ImageableArea EnvC5/Env C5: "9 12.00 450 637.00"
@@ -165,6 +178,7 @@
 *DefaultPaperDimension: Letter
 *PaperDimension Letter/Letter: "612 792"
 *PaperDimension A4/A4: "595 842"
+*PaperDimension A5/A5: "420 595"
 *PaperDimension B5jis/B5 (JIS): "518 727"
 *PaperDimension Env10/Env #10: "297 684"
 *PaperDimension EnvC5/Env C5: "459 649"
diff -Nru foo2zjs-20140519dfsg0/PPD/Fuji_Xerox-DocuPrint_CM215.ppd foo2zjs-20140925dfsg0/PPD/Fuji_Xerox-DocuPrint_CM215.ppd
--- foo2zjs-20140519dfsg0/PPD/Fuji_Xerox-DocuPrint_CM215.ppd	2014-06-05 09:14:28.000000000 +0000
+++ foo2zjs-20140925dfsg0/PPD/Fuji_Xerox-DocuPrint_CM215.ppd	2014-09-30 07:35:30.000000000 +0000
@@ -102,8 +102,17 @@
 *FoomaticRIPOptionSetting ColorMode=Monochrome: " "
 *CloseUI: *ColorMode
 
-*FoomaticRIPOption Resolution: enum CmdLine A 130
+*OpenUI *Resolution/Resolution: PickOne
+*FoomaticRIPOption Resolution: enum CmdLine A
+*OrderDependency: 130 AnySetup *Resolution
+*DefaultResolution: 1200x600dpi
+*Resolution 600x600dpi/600x600 dpi: "%% FoomaticRIPOptionSetting: Resolution=600x600dpi"
+*FoomaticRIPOptionSetting Resolution=600x600dpi: "-r600x600 "
+*Resolution 1200x600dpi/1200x600 dpi: "%% FoomaticRIPOptionSetting: Resolution=1200x600dpi"
 *FoomaticRIPOptionSetting Resolution=1200x600dpi: "-r1200x600 "
+*Resolution 1200x1200dpi/1200x1200 dpi: "%% FoomaticRIPOptionSetting: Resolution=1200x1200dpi"
+*FoomaticRIPOptionSetting Resolution=1200x1200dpi: "-r1200x1200 "
+*CloseUI: *Resolution
 
 *OpenUI *PageSize/Page Size: PickOne
 *FoomaticRIPOption PageSize: enum CmdLine A
@@ -113,6 +122,8 @@
 *FoomaticRIPOptionSetting PageSize=Letter: "-p4 "
 *PageSize A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4"
 *FoomaticRIPOptionSetting PageSize=A4: "-p1 "
+*PageSize A5/A5: "%% FoomaticRIPOptionSetting: PageSize=A5"
+*FoomaticRIPOptionSetting PageSize=A5: "-p3 "
 *PageSize B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis"
 *FoomaticRIPOptionSetting PageSize=B5jis: "-p2 "
 *PageSize Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10"
@@ -138,6 +149,7 @@
 *DefaultPageRegion: Letter
 *PageRegion Letter/Letter: "%% FoomaticRIPOptionSetting: PageSize=Letter"
 *PageRegion A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4"
+*PageRegion A5/A5: "%% FoomaticRIPOptionSetting: PageSize=A5"
 *PageRegion B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis"
 *PageRegion Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10"
 *PageRegion EnvC5/Env C5: "%% FoomaticRIPOptionSetting: PageSize=EnvC5"
@@ -152,6 +164,7 @@
 *DefaultImageableArea: Letter
 *ImageableArea Letter/Letter: "9 12.00 603 780.00"
 *ImageableArea A4/A4: "9 12.00 586 830.00"
+*ImageableArea A5/A5: "9 12.00 411 583.00"
 *ImageableArea B5jis/B5 (JIS): "9 12.00 509 715.00"
 *ImageableArea Env10/Env #10: "9 12.00 288 672.00"
 *ImageableArea EnvC5/Env C5: "9 12.00 450 637.00"
@@ -165,6 +178,7 @@
 *DefaultPaperDimension: Letter
 *PaperDimension Letter/Letter: "612 792"
 *PaperDimension A4/A4: "595 842"
+*PaperDimension A5/A5: "420 595"
 *PaperDimension B5jis/B5 (JIS): "518 727"
 *PaperDimension Env10/Env #10: "297 684"
 *PaperDimension EnvC5/Env C5: "459 649"
diff -Nru foo2zjs-20140519dfsg0/PPD/Fuji_Xerox-DocuPrint_M215.ppd foo2zjs-20140925dfsg0/PPD/Fuji_Xerox-DocuPrint_M215.ppd
--- foo2zjs-20140519dfsg0/PPD/Fuji_Xerox-DocuPrint_M215.ppd	2014-06-05 09:14:28.000000000 +0000
+++ foo2zjs-20140925dfsg0/PPD/Fuji_Xerox-DocuPrint_M215.ppd	2014-09-30 07:35:30.000000000 +0000
@@ -113,6 +113,8 @@
 *FoomaticRIPOptionSetting PageSize=Letter: "-p4 "
 *PageSize A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4"
 *FoomaticRIPOptionSetting PageSize=A4: "-p1 "
+*PageSize A5/A5: "%% FoomaticRIPOptionSetting: PageSize=A5"
+*FoomaticRIPOptionSetting PageSize=A5: "-p3 "
 *PageSize B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis"
 *FoomaticRIPOptionSetting PageSize=B5jis: "-p2 "
 *PageSize Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10"
@@ -138,6 +140,7 @@
 *DefaultPageRegion: Letter
 *PageRegion Letter/Letter: "%% FoomaticRIPOptionSetting: PageSize=Letter"
 *PageRegion A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4"
+*PageRegion A5/A5: "%% FoomaticRIPOptionSetting: PageSize=A5"
 *PageRegion B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis"
 *PageRegion Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10"
 *PageRegion EnvC5/Env C5: "%% FoomaticRIPOptionSetting: PageSize=EnvC5"
@@ -152,6 +155,7 @@
 *DefaultImageableArea: Letter
 *ImageableArea Letter/Letter: "9 12.00 603 780.00"
 *ImageableArea A4/A4: "9 12.00 586 830.00"
+*ImageableArea A5/A5: "9 12.00 411 583.00"
 *ImageableArea B5jis/B5 (JIS): "9 12.00 509 715.00"
 *ImageableArea Env10/Env #10: "9 12.00 288 672.00"
 *ImageableArea EnvC5/Env C5: "9 12.00 450 637.00"
@@ -165,6 +169,7 @@
 *DefaultPaperDimension: Letter
 *PaperDimension Letter/Letter: "612 792"
 *PaperDimension A4/A4: "595 842"
+*PaperDimension A5/A5: "420 595"
 *PaperDimension B5jis/B5 (JIS): "518 727"
 *PaperDimension Env10/Env #10: "297 684"
 *PaperDimension EnvC5/Env C5: "459 649"
diff -Nru foo2zjs-20140519dfsg0/PPD/Fuji_Xerox-DocuPrint_P205.ppd foo2zjs-20140925dfsg0/PPD/Fuji_Xerox-DocuPrint_P205.ppd
--- foo2zjs-20140519dfsg0/PPD/Fuji_Xerox-DocuPrint_P205.ppd	2014-06-05 09:14:28.000000000 +0000
+++ foo2zjs-20140925dfsg0/PPD/Fuji_Xerox-DocuPrint_P205.ppd	2014-09-30 07:35:30.000000000 +0000
@@ -113,6 +113,8 @@
 *FoomaticRIPOptionSetting PageSize=Letter: "-p4 "
 *PageSize A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4"
 *FoomaticRIPOptionSetting PageSize=A4: "-p1 "
+*PageSize A5/A5: "%% FoomaticRIPOptionSetting: PageSize=A5"
+*FoomaticRIPOptionSetting PageSize=A5: "-p3 "
 *PageSize B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis"
 *FoomaticRIPOptionSetting PageSize=B5jis: "-p2 "
 *PageSize Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10"
@@ -138,6 +140,7 @@
 *DefaultPageRegion: Letter
 *PageRegion Letter/Letter: "%% FoomaticRIPOptionSetting: PageSize=Letter"
 *PageRegion A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4"
+*PageRegion A5/A5: "%% FoomaticRIPOptionSetting: PageSize=A5"
 *PageRegion B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis"
 *PageRegion Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10"
 *PageRegion EnvC5/Env C5: "%% FoomaticRIPOptionSetting: PageSize=EnvC5"
@@ -152,6 +155,7 @@
 *DefaultImageableArea: Letter
 *ImageableArea Letter/Letter: "9 12.00 603 780.00"
 *ImageableArea A4/A4: "9 12.00 586 830.00"
+*ImageableArea A5/A5: "9 12.00 411 583.00"
 *ImageableArea B5jis/B5 (JIS): "9 12.00 509 715.00"
 *ImageableArea Env10/Env #10: "9 12.00 288 672.00"
 *ImageableArea EnvC5/Env C5: "9 12.00 450 637.00"
@@ -165,6 +169,7 @@
 *DefaultPaperDimension: Letter
 *PaperDimension Letter/Letter: "612 792"
 *PaperDimension A4/A4: "595 842"
+*PaperDimension A5/A5: "420 595"
 *PaperDimension B5jis/B5 (JIS): "518 727"
 *PaperDimension Env10/Env #10: "297 684"
 *PaperDimension EnvC5/Env C5: "459 649"
diff -Nru foo2zjs-20140519dfsg0/PPD/Xerox-WorkCentre_3045.ppd foo2zjs-20140925dfsg0/PPD/Xerox-WorkCentre_3045.ppd
--- foo2zjs-20140519dfsg0/PPD/Xerox-WorkCentre_3045.ppd	2014-06-05 09:14:28.000000000 +0000
+++ foo2zjs-20140925dfsg0/PPD/Xerox-WorkCentre_3045.ppd	2014-09-30 07:35:30.000000000 +0000
@@ -113,6 +113,8 @@
 *FoomaticRIPOptionSetting PageSize=Letter: "-p4 "
 *PageSize A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4"
 *FoomaticRIPOptionSetting PageSize=A4: "-p1 "
+*PageSize A5/A5: "%% FoomaticRIPOptionSetting: PageSize=A5"
+*FoomaticRIPOptionSetting PageSize=A5: "-p3 "
 *PageSize B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis"
 *FoomaticRIPOptionSetting PageSize=B5jis: "-p2 "
 *PageSize Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10"
@@ -138,6 +140,7 @@
 *DefaultPageRegion: Letter
 *PageRegion Letter/Letter: "%% FoomaticRIPOptionSetting: PageSize=Letter"
 *PageRegion A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4"
+*PageRegion A5/A5: "%% FoomaticRIPOptionSetting: PageSize=A5"
 *PageRegion B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis"
 *PageRegion Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10"
 *PageRegion EnvC5/Env C5: "%% FoomaticRIPOptionSetting: PageSize=EnvC5"
@@ -152,6 +155,7 @@
 *DefaultImageableArea: Letter
 *ImageableArea Letter/Letter: "9 12.00 603 780.00"
 *ImageableArea A4/A4: "9 12.00 586 830.00"
+*ImageableArea A5/A5: "9 12.00 411 583.00"
 *ImageableArea B5jis/B5 (JIS): "9 12.00 509 715.00"
 *ImageableArea Env10/Env #10: "9 12.00 288 672.00"
 *ImageableArea EnvC5/Env C5: "9 12.00 450 637.00"
@@ -165,6 +169,7 @@
 *DefaultPaperDimension: Letter
 *PaperDimension Letter/Letter: "612 792"
 *PaperDimension A4/A4: "595 842"
+*PaperDimension A5/A5: "420 595"
 *PaperDimension B5jis/B5 (JIS): "518 727"
 *PaperDimension Env10/Env #10: "297 684"
 *PaperDimension EnvC5/Env C5: "459 649"
diff -Nru foo2zjs-20140519dfsg0/PPD/Xerox-WorkCentre_6015.ppd foo2zjs-20140925dfsg0/PPD/Xerox-WorkCentre_6015.ppd
--- foo2zjs-20140519dfsg0/PPD/Xerox-WorkCentre_6015.ppd	2014-06-05 09:14:28.000000000 +0000
+++ foo2zjs-20140925dfsg0/PPD/Xerox-WorkCentre_6015.ppd	2014-09-30 07:35:30.000000000 +0000
@@ -113,6 +113,8 @@
 *FoomaticRIPOptionSetting PageSize=Letter: "-p4 "
 *PageSize A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4"
 *FoomaticRIPOptionSetting PageSize=A4: "-p1 "
+*PageSize A5/A5: "%% FoomaticRIPOptionSetting: PageSize=A5"
+*FoomaticRIPOptionSetting PageSize=A5: "-p3 "
 *PageSize B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis"
 *FoomaticRIPOptionSetting PageSize=B5jis: "-p2 "
 *PageSize Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10"
@@ -138,6 +140,7 @@
 *DefaultPageRegion: Letter
 *PageRegion Letter/Letter: "%% FoomaticRIPOptionSetting: PageSize=Letter"
 *PageRegion A4/A4: "%% FoomaticRIPOptionSetting: PageSize=A4"
+*PageRegion A5/A5: "%% FoomaticRIPOptionSetting: PageSize=A5"
 *PageRegion B5jis/B5 (JIS): "%% FoomaticRIPOptionSetting: PageSize=B5jis"
 *PageRegion Env10/Env #10: "%% FoomaticRIPOptionSetting: PageSize=Env10"
 *PageRegion EnvC5/Env C5: "%% FoomaticRIPOptionSetting: PageSize=EnvC5"
@@ -152,6 +155,7 @@
 *DefaultImageableArea: Letter
 *ImageableArea Letter/Letter: "9 12.00 603 780.00"
 *ImageableArea A4/A4: "9 12.00 586 830.00"
+*ImageableArea A5/A5: "9 12.00 411 583.00"
 *ImageableArea B5jis/B5 (JIS): "9 12.00 509 715.00"
 *ImageableArea Env10/Env #10: "9 12.00 288 672.00"
 *ImageableArea EnvC5/Env C5: "9 12.00 450 637.00"
@@ -165,6 +169,7 @@
 *DefaultPaperDimension: Letter
 *PaperDimension Letter/Letter: "612 792"
 *PaperDimension A4/A4: "595 842"
+*PaperDimension A5/A5: "420 595"
 *PaperDimension B5jis/B5 (JIS): "518 727"
 *PaperDimension Env10/Env #10: "297 684"
 *PaperDimension EnvC5/Env C5: "459 649"
diff -Nru foo2zjs-20140519dfsg0/regress.txt foo2zjs-20140925dfsg0/regress.txt
--- foo2zjs-20140519dfsg0/regress.txt	2014-06-05 09:14:28.000000000 +0000
+++ foo2zjs-20140925dfsg0/regress.txt	2014-09-30 07:35:30.000000000 +0000
@@ -3,6 +3,7 @@
 57e9101eb2b95db9ce519d108d06c2ec  testpage.zm	8.60	x86_64
 3365dcef45a03b3686c00da0f5f711c3  testpage.zm	8.61	i386
 b0fe6c289308ebc086328c2944ce915c  testpage.zm	9.07	x86_64 f19
+fd5e020d0c009f1733e51e7303820235  testpage.zm	9.14	x86_64 f19
 
 #
 94b77586bab210ad54eaf7b652817a4c  testpage.zc10	7.05
@@ -13,6 +14,7 @@
 e2b8cd9191afe74bf684e7655f48f372  testpage.zc10 8.71
 bcf8f73383eebb4da0d6a0fd03732c90  testpage.zc10 8.71	f16
 23546ba41a46973bc70664030a65cb6c  testpage.zc10 9.07	x86_64 f19
+6f697e3c66bd22e19a8c25056beb5949  testpage.zc10	9.14	x86_64 f19
 
 #
 29788ba74874c9be35ab1f8bcc5719b6  testpage.zc1  7.05
@@ -40,6 +42,7 @@
 89bb9a6748b9010d763e47ed5923460c  lj1000.zm	8.61
 46d4a9157a2282a64a9b37e361b0059c  lj1000.zm	8.62amd
 98bda2da23dfd94c40f96ef7be1533b3  lj1000.zm	9.07	x86_64 f19
+3e1a545894d571061fca0ba443daa465  lj1000.zm	9.14	x86_64 f19
 
 #
 afed329ee495b7575b908680a2512c30  lj1020.zm	7.05
@@ -49,6 +52,7 @@
 d8f28750c1dacc2066eee1e0a050e60c  lj1020.zm	8.71
 518482229bed6d3cb23f66b7f7f9a685  lj1020.zm	8.71	f16
 59c71a09255fe1d84e22c372d4d6704a  lj1020.zm	9.07	x86_64 f19
+9900771e2963b03b61f163434de84c94  lj1020.zm	9.14	x86_64 f19
 
 #
 b4ccadb72f1b386b1caabeed85c269dd  lj2600.zm1	7.05
@@ -56,6 +60,7 @@
 4551ad72c645ad165ea614f7cdd5b666  lj2600.zm1	8.61
 a768fc2854434276dd8a274896af5d4f  lj2600.zm1	8.62amd
 70b31b8f35702091da0673fb29a3d7c5  lj2600.zm1	9.07	x86_64 f19
+af3cb950122a621700ca71d73ae91d13  lj2600.zm1	9.14	x86_64 f19
 
 #
 500ee54205b85d18407b56cfea5cbb02  lj2600.zc1	7.05