Update to 20050304

- switch to 3.0 stable cvs branch to align with other foomatic ports
- use autoconf 259 instead of 253

PR:		ports/78397
Submitted by:	Pawel Wieleba <P.Wieleba@iem.pw.edu.pl>

2 files changed, 1030 insertions, 590 deletions

diff --git a/print/foomatic-db/Makefile b/print/foomatic-db/Makefile
index 2eaf26ecc775..a42ba9caf756 100644
--- a/print/foomatic-db/Makefile
+++ b/print/foomatic-db/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	foomatic-db
-PORTVERSION=	20040107
-PORTREVISION=	2
+PORTVERSION=	20050309
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 NO_CHECKSUM=	${DISTFILES}
@@ -21,14 +20,16 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_BZIP2=	yes
-USE_AUTOCONF_VER=	253
+WANT_AUTOMAKE_VER=	15
+USE_AUTOCONF_VER=	259
 
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.pre.mk>
 CVS_CMD?=	cvs -z3
 CVS_DATE=	${PORTVERSION}
-CVS_SITES?=	pserver:anonymous@cvs.linuxprinting.org:/usr/local/cvs
+CVS_SITES?=	pserver:anonymous@cvs.linuxprinting.org:/var/lib/cvs
+CVS_BRANCH=	foomatic-3_0-branch	# STABLE
 CVS_MODULE=	foomatic-db
 
 #
@@ -41,7 +42,7 @@ do-fetch:
 		cd ${DISTDIR}/${DISTNAME}; \
 		for CVS_SITE in ${CVS_SITES}; do \
 			${ECHO_MSG} ">> Attempting to check out from $${CVS_SITE}."; \
-			if ${CVS_CMD} -d:$${CVS_SITE} co -D "${CVS_DATE}" ${CVS_MODULE}; \
+			if ${CVS_CMD} -d:$${CVS_SITE} co -D "${CVS_DATE}" -r ${CVS_BRANCH} ${CVS_MODULE}; \
 			    then \
 				cd ${DISTDIR}; \
 				${ECHO_MSG} ">> Creating dist tarball in ${DISTDIR}"; \
@@ -62,6 +63,7 @@ do-fetch:
 	fi
 
 pre-configure:
-	@cd ${WRKSRC} && ./make_configure
+	@cd ${WRKSRC} && ${ACLOCAL} && ${AUTOCONF}
+		
 
 .include <bsd.port.post.mk>
diff --git a/print/foomatic-db/pkg-plist b/print/foomatic-db/pkg-plist
index 9be415059865..22f55e7bd186 100644
--- a/print/foomatic-db/pkg-plist
+++ b/print/foomatic-db/pkg-plist
@@ -1,15 +1,38 @@
 share/foomatic/db/oldprinterids
-share/foomatic/db/source/driver/alc1900.xml
-share/foomatic/db/source/driver/alc2000.xml
-share/foomatic/db/source/driver/alc4000.xml
-share/foomatic/db/source/driver/alc8500.xml
-share/foomatic/db/source/driver/alc8600.xml
-share/foomatic/db/source/driver/appledmp.xml
+share/foomatic/db/source/driver/PM760p.upp.xml
+share/foomatic/db/source/driver/PM760pl.upp.xml
+share/foomatic/db/source/driver/PM820p.upp.xml
+share/foomatic/db/source/driver/PM820pl.upp.xml
+share/foomatic/db/source/driver/Postscript.xml
+share/foomatic/db/source/driver/Stc670p.upp.xml
+share/foomatic/db/source/driver/Stc670pl.upp.xml
+share/foomatic/db/source/driver/Stc680p.upp.xml
+share/foomatic/db/source/driver/Stc680pl.upp.xml
+share/foomatic/db/source/driver/Stc760p.upp.xml
+share/foomatic/db/source/driver/Stc760pl.upp.xml
+share/foomatic/db/source/driver/Stc777p.upp.xml
+share/foomatic/db/source/driver/Stc777pl.upp.xml
+share/foomatic/db/source/driver/Stp720p.upp.xml
+share/foomatic/db/source/driver/Stp720pl.upp.xml
+share/foomatic/db/source/driver/Stp870p.upp.xml
+share/foomatic/db/source/driver/Stp870pl.upp.xml
 share/foomatic/db/source/driver/ap3250.xml
+share/foomatic/db/source/driver/appledmp.xml
+share/foomatic/db/source/driver/bj10.xml
+share/foomatic/db/source/driver/bj10e.xml
+share/foomatic/db/source/driver/bj10v.xml
+share/foomatic/db/source/driver/bj10vh.xml
+share/foomatic/db/source/driver/bj200.xml
+share/foomatic/db/source/driver/bj8gc12f.upp.xml
+share/foomatic/db/source/driver/bj8hg12f.upp.xml
+share/foomatic/db/source/driver/bj8oh06n.upp.xml
+share/foomatic/db/source/driver/bj8pa06n.upp.xml
+share/foomatic/db/source/driver/bj8pp12f.upp.xml
+share/foomatic/db/source/driver/bj8ts06n.upp.xml
 share/foomatic/db/source/driver/bjc250gs.xml
+share/foomatic/db/source/driver/bjc600.xml
 share/foomatic/db/source/driver/bjc6000a1.upp.xml
 share/foomatic/db/source/driver/bjc6000b1.upp.xml
-share/foomatic/db/source/driver/bjc600.xml
 share/foomatic/db/source/driver/bjc610a0.upp.xml
 share/foomatic/db/source/driver/bjc610a1.upp.xml
 share/foomatic/db/source/driver/bjc610a2.upp.xml
@@ -26,20 +49,13 @@ share/foomatic/db/source/driver/bjc610b4.upp.xml
 share/foomatic/db/source/driver/bjc610b6.upp.xml
 share/foomatic/db/source/driver/bjc610b7.upp.xml
 share/foomatic/db/source/driver/bjc610b8.upp.xml
-share/foomatic/db/source/driver/bjc800j.xml
 share/foomatic/db/source/driver/bjc800.xml
+share/foomatic/db/source/driver/bjc800j.xml
 share/foomatic/db/source/driver/bjc880j.xml
-share/foomatic/db/source/driver/bj10e.xml
-share/foomatic/db/source/driver/bj10vh.xml
-share/foomatic/db/source/driver/bj10v.xml
-share/foomatic/db/source/driver/bj10.xml
-share/foomatic/db/source/driver/bj200.xml
-share/foomatic/db/source/driver/bj8gc12f.upp.xml
-share/foomatic/db/source/driver/bj8hg12f.upp.xml
-share/foomatic/db/source/driver/bj8oh06n.upp.xml
-share/foomatic/db/source/driver/bj8pa06n.upp.xml
-share/foomatic/db/source/driver/bj8pp12f.upp.xml
-share/foomatic/db/source/driver/bj8ts06n.upp.xml
+share/foomatic/db/source/driver/c2050.xml
+share/foomatic/db/source/driver/c2070.xml
+share/foomatic/db/source/driver/cZ11.xml
+share/foomatic/db/source/driver/cZ11somsom.xml
 share/foomatic/db/source/driver/cdj1600.xml
 share/foomatic/db/source/driver/cdj500.xml
 share/foomatic/db/source/driver/cdj550.upp.xml
@@ -49,44 +65,39 @@ share/foomatic/db/source/driver/cdj850.xml
 share/foomatic/db/source/driver/cdj880.xml
 share/foomatic/db/source/driver/cdj890.xml
 share/foomatic/db/source/driver/cdj970.xml
+share/foomatic/db/source/driver/chp2200.xml
 share/foomatic/db/source/driver/cjet.xml
-share/foomatic/db/source/driver/cljet5c.xml
 share/foomatic/db/source/driver/cljet5.xml
+share/foomatic/db/source/driver/cljet5c.xml
 share/foomatic/db/source/driver/cp50.xml
-share/foomatic/db/source/driver/cZ11somsom.xml
-share/foomatic/db/source/driver/cZ11.xml
-share/foomatic/db/source/driver/c2050.xml
-share/foomatic/db/source/driver/c2070.xml
 share/foomatic/db/source/driver/declj250.xml
 share/foomatic/db/source/driver/deskjet.xml
-share/foomatic/db/source/driver/djet500.xml
 share/foomatic/db/source/driver/dj505j.xml
+share/foomatic/db/source/driver/djet500.xml
 share/foomatic/db/source/driver/dnj650c.xml
+share/foomatic/db/source/driver/drv_x125.xml
 share/foomatic/db/source/driver/drv_z42.xml
-share/foomatic/db/source/driver/epl2050p.xml
-share/foomatic/db/source/driver/epl2050.xml
-share/foomatic/db/source/driver/epl2120.xml
-share/foomatic/db/source/driver/epl2750.xml
 share/foomatic/db/source/driver/epl5700l.xml
 share/foomatic/db/source/driver/epl5800l.xml
-share/foomatic/db/source/driver/epl5800.xml
 share/foomatic/db/source/driver/epl5900l.xml
-share/foomatic/db/source/driver/epl5900.xml
-share/foomatic/db/source/driver/epl6100.xml
-share/foomatic/db/source/driver/epsonc.xml
-share/foomatic/db/source/driver/epson.xml
+share/foomatic/db/source/driver/epl6100l.xml
+share/foomatic/db/source/driver/epl6200l.xml
+share/foomatic/db/source/driver/eplaser-jp.xml
+share/foomatic/db/source/driver/eplaser.xml
 share/foomatic/db/source/driver/eps9high.xml
 share/foomatic/db/source/driver/eps9mid.xml
+share/foomatic/db/source/driver/epson.xml
+share/foomatic/db/source/driver/epsonc.xml
 share/foomatic/db/source/driver/escpage.xml
 share/foomatic/db/source/driver/fmlbp.xml
 share/foomatic/db/source/driver/fmpr.xml
+share/foomatic/db/source/driver/foo2oak.xml
 share/foomatic/db/source/driver/foo2zjs.xml
 share/foomatic/db/source/driver/gdi.xml
 share/foomatic/db/source/driver/gimp-print.xml
 share/foomatic/db/source/driver/hl1250.xml
 share/foomatic/db/source/driver/hl7x0.xml
 share/foomatic/db/source/driver/hpdj.xml
-share/foomatic/db/source/driver/chp2200.xml
 share/foomatic/db/source/driver/ibmpro.xml
 share/foomatic/db/source/driver/imagen.xml
 share/foomatic/db/source/driver/iwhi.xml
@@ -94,12 +105,12 @@ share/foomatic/db/source/driver/iwlo.xml
 share/foomatic/db/source/driver/iwlq.xml
 share/foomatic/db/source/driver/jetp3852.xml
 share/foomatic/db/source/driver/jj100.xml
-share/foomatic/db/source/driver/laserjet.xml
 share/foomatic/db/source/driver/la50.xml
-share/foomatic/db/source/driver/la70t.xml
 share/foomatic/db/source/driver/la70.xml
-share/foomatic/db/source/driver/la75plus.xml
+share/foomatic/db/source/driver/la70t.xml
 share/foomatic/db/source/driver/la75.xml
+share/foomatic/db/source/driver/la75plus.xml
+share/foomatic/db/source/driver/laserjet.xml
 share/foomatic/db/source/driver/lbp310.xml
 share/foomatic/db/source/driver/lbp320.xml
 share/foomatic/db/source/driver/lbp8.xml
@@ -107,278 +118,134 @@ share/foomatic/db/source/driver/lex5700.xml
 share/foomatic/db/source/driver/lex7000.xml
 share/foomatic/db/source/driver/lips2p.xml
 share/foomatic/db/source/driver/lips3.xml
-share/foomatic/db/source/driver/lips4v.xml
 share/foomatic/db/source/driver/lips4.xml
-share/foomatic/db/source/driver/ljetplus.xml
-share/foomatic/db/source/driver/ljet2p.xml
-share/foomatic/db/source/driver/ljet3d.xml
-share/foomatic/db/source/driver/ljet3.xml
-share/foomatic/db/source/driver/ljet4d.xml
-share/foomatic/db/source/driver/ljet4.xml
+share/foomatic/db/source/driver/lips4v.xml
 share/foomatic/db/source/driver/lj250.xml
-share/foomatic/db/source/driver/lj4dithp.xml
 share/foomatic/db/source/driver/lj4dith.xml
+share/foomatic/db/source/driver/lj4dithp.xml
 share/foomatic/db/source/driver/lj5gray.xml
 share/foomatic/db/source/driver/lj5mono.xml
+share/foomatic/db/source/driver/ljet2p.xml
+share/foomatic/db/source/driver/ljet3.xml
+share/foomatic/db/source/driver/ljet3d.xml
+share/foomatic/db/source/driver/ljet4.xml
+share/foomatic/db/source/driver/ljet4d.xml
+share/foomatic/db/source/driver/ljetplus.xml
 share/foomatic/db/source/driver/lm1100.xml
 share/foomatic/db/source/driver/ln03.xml
-share/foomatic/db/source/driver/lpstyl.xml
 share/foomatic/db/source/driver/lp2000.xml
 share/foomatic/db/source/driver/lp2563.xml
 share/foomatic/db/source/driver/lp8000.xml
+share/foomatic/db/source/driver/lpstyl.xml
 share/foomatic/db/source/driver/lq850.xml
+share/foomatic/db/source/driver/lx5000.xml
+share/foomatic/db/source/driver/lxm3200-tweaked.xml
+share/foomatic/db/source/driver/lxm3200.xml
 share/foomatic/db/source/driver/lxm3200c.xml
 share/foomatic/db/source/driver/lxm3200m.xml
 share/foomatic/db/source/driver/lxm3200p.xml
-share/foomatic/db/source/driver/lxm3200.xml
-share/foomatic/db/source/driver/lxm3200-tweaked.xml
 share/foomatic/db/source/driver/lxm5700m.xml
-share/foomatic/db/source/driver/lx5000.xml
+share/foomatic/db/source/driver/lxx74.xml
 share/foomatic/db/source/driver/lz11.xml
+share/foomatic/db/source/driver/m2300w.xml
+share/foomatic/db/source/driver/m8510.xml
 share/foomatic/db/source/driver/md1xMono.xml
 share/foomatic/db/source/driver/md2k.xml
-share/foomatic/db/source/driver/md5k.xml
 share/foomatic/db/source/driver/md50Eco.xml
 share/foomatic/db/source/driver/md50Mono.xml
+share/foomatic/db/source/driver/md5k.xml
+share/foomatic/db/source/driver/min12xxw.xml
 share/foomatic/db/source/driver/mj500c.xml
 share/foomatic/db/source/driver/mj6000c.xml
 share/foomatic/db/source/driver/mj700v2c.xml
 share/foomatic/db/source/driver/mj8000c.xml
 share/foomatic/db/source/driver/ml600.xml
 share/foomatic/db/source/driver/ml85p.xml
-share/foomatic/db/source/driver/m8510.xml
-share/foomatic/db/source/driver/necp2x6.upp.xml
 share/foomatic/db/source/driver/necp2x.upp.xml
+share/foomatic/db/source/driver/necp2x6.upp.xml
 share/foomatic/db/source/driver/necp6.xml
 share/foomatic/db/source/driver/npdl.xml
 share/foomatic/db/source/driver/nwp533.xml
 share/foomatic/db/source/driver/oce9050.xml
-share/foomatic/db/source/driver/okiibm.xml
 share/foomatic/db/source/driver/oki182.xml
+share/foomatic/db/source/driver/oki4drv.xml
 share/foomatic/db/source/driver/oki4w.xml
+share/foomatic/db/source/driver/okiibm.xml
 share/foomatic/db/source/driver/paintjet.xml
-share/foomatic/db/source/driver/pbmtozjs.xml
-share/foomatic/db/source/driver/pbm2lwxl.xml
 share/foomatic/db/source/driver/pbm2l2030.xml
 share/foomatic/db/source/driver/pbm2l7k.xml
+share/foomatic/db/source/driver/pbm2lwxl.xml
 share/foomatic/db/source/driver/pbm2ppa.xml
+share/foomatic/db/source/driver/pbmtozjs.xml
 share/foomatic/db/source/driver/pcl3.xml
+share/foomatic/db/source/driver/pegg.xml
 share/foomatic/db/source/driver/pentaxpj.xml
 share/foomatic/db/source/driver/picty180.xml
+share/foomatic/db/source/driver/pj.xml
 share/foomatic/db/source/driver/pjetxl.xml
-share/foomatic/db/source/driver/pjxl300.xml
 share/foomatic/db/source/driver/pjxl.xml
-share/foomatic/db/source/driver/pj.xml
-share/foomatic/db/source/driver/PM760pl.upp.xml
-share/foomatic/db/source/driver/PM760p.upp.xml
-share/foomatic/db/source/driver/PM820pl.upp.xml
-share/foomatic/db/source/driver/PM820p.upp.xml
+share/foomatic/db/source/driver/pjxl300.xml
 share/foomatic/db/source/driver/pnm2ppa.xml
-share/foomatic/db/source/driver/Postscript.xml
 share/foomatic/db/source/driver/ppmtocpva.xml
 share/foomatic/db/source/driver/ppmtomd.xml
 share/foomatic/db/source/driver/pr150.xml
 share/foomatic/db/source/driver/pr201.xml
+share/foomatic/db/source/driver/pxl1010.xml
 share/foomatic/db/source/driver/pxlcolor.xml
 share/foomatic/db/source/driver/pxlmono.xml
+share/foomatic/db/source/driver/r4081.xml
 share/foomatic/db/source/driver/ras1.upp.xml
 share/foomatic/db/source/driver/ras24.upp.xml
-share/foomatic/db/source/driver/ras32.upp.xml
 share/foomatic/db/source/driver/ras3.upp.xml
+share/foomatic/db/source/driver/ras32.upp.xml
 share/foomatic/db/source/driver/ras4.upp.xml
 share/foomatic/db/source/driver/ras8m.upp.xml
 share/foomatic/db/source/driver/rpdl.xml
-share/foomatic/db/source/driver/r4081.xml
+share/foomatic/db/source/driver/s400a1.upp.xml
+share/foomatic/db/source/driver/s400b1.upp.xml
 share/foomatic/db/source/driver/sharp.upp.xml
 share/foomatic/db/source/driver/sj48.xml
 share/foomatic/db/source/driver/slap.xml
 share/foomatic/db/source/driver/sparc.xml
-share/foomatic/db/source/driver/stcany.upp.xml
-share/foomatic/db/source/driver/stcolor.xml
+share/foomatic/db/source/driver/st640ih.upp.xml
+share/foomatic/db/source/driver/st640ihg.upp.xml
+share/foomatic/db/source/driver/st640p.upp.xml
+share/foomatic/db/source/driver/st640pg.upp.xml
+share/foomatic/db/source/driver/st640pl.upp.xml
+share/foomatic/db/source/driver/st640plg.upp.xml
+share/foomatic/db/source/driver/st800.xml
+share/foomatic/db/source/driver/stc.upp.xml
 share/foomatic/db/source/driver/stc1520h.upp.xml
-share/foomatic/db/source/driver/stc2s_h.upp.xml
 share/foomatic/db/source/driver/stc2.upp.xml
 share/foomatic/db/source/driver/stc2_h.upp.xml
+share/foomatic/db/source/driver/stc2s_h.upp.xml
+share/foomatic/db/source/driver/stc300.upp.xml
 share/foomatic/db/source/driver/stc300bl.upp.xml
 share/foomatic/db/source/driver/stc300bm.upp.xml
-share/foomatic/db/source/driver/stc300.upp.xml
-share/foomatic/db/source/driver/stc500ph.upp.xml
 share/foomatic/db/source/driver/stc500p.upp.xml
+share/foomatic/db/source/driver/stc500ph.upp.xml
 share/foomatic/db/source/driver/stc600ih.upp.xml
-share/foomatic/db/source/driver/stc600pl.upp.xml
 share/foomatic/db/source/driver/stc600p.upp.xml
+share/foomatic/db/source/driver/stc600pl.upp.xml
 share/foomatic/db/source/driver/stc640p.upp.xml
-share/foomatic/db/source/driver/Stc670pl.upp.xml
-share/foomatic/db/source/driver/Stc670p.upp.xml
-share/foomatic/db/source/driver/Stc680pl.upp.xml
-share/foomatic/db/source/driver/Stc680p.upp.xml
 share/foomatic/db/source/driver/stc740ih.upp.xml
-share/foomatic/db/source/driver/stc740pl.upp.xml
 share/foomatic/db/source/driver/stc740p.upp.xml
-share/foomatic/db/source/driver/Stc760pl.upp.xml
-share/foomatic/db/source/driver/Stc760p.upp.xml
-share/foomatic/db/source/driver/Stc777pl.upp.xml
-share/foomatic/db/source/driver/Stc777p.upp.xml
+share/foomatic/db/source/driver/stc740pl.upp.xml
 share/foomatic/db/source/driver/stc800ih.upp.xml
-share/foomatic/db/source/driver/stc800pl.upp.xml
 share/foomatic/db/source/driver/stc800p.upp.xml
-share/foomatic/db/source/driver/stc.upp.xml
+share/foomatic/db/source/driver/stc800pl.upp.xml
 share/foomatic/db/source/driver/stc_h.upp.xml
 share/foomatic/db/source/driver/stc_l.upp.xml
-share/foomatic/db/source/driver/Stp720pl.upp.xml
-share/foomatic/db/source/driver/Stp720p.upp.xml
-share/foomatic/db/source/driver/Stp870pl.upp.xml
-share/foomatic/db/source/driver/Stp870p.upp.xml
+share/foomatic/db/source/driver/stcany.upp.xml
+share/foomatic/db/source/driver/stcolor.xml
 share/foomatic/db/source/driver/stp.xml
-share/foomatic/db/source/driver/st640ihg.upp.xml
-share/foomatic/db/source/driver/st640ih.upp.xml
-share/foomatic/db/source/driver/st640pg.upp.xml
-share/foomatic/db/source/driver/st640plg.upp.xml
-share/foomatic/db/source/driver/st640pl.upp.xml
-share/foomatic/db/source/driver/st640p.upp.xml
-share/foomatic/db/source/driver/st800.xml
-share/foomatic/db/source/driver/s400a1.upp.xml
-share/foomatic/db/source/driver/s400b1.upp.xml
-share/foomatic/db/source/driver/tek4696.xml
 share/foomatic/db/source/driver/t4693d2.xml
 share/foomatic/db/source/driver/t4693d4.xml
 share/foomatic/db/source/driver/t4693d8.xml
+share/foomatic/db/source/driver/tek4696.xml
 share/foomatic/db/source/driver/xes.xml
-share/foomatic/db/source/opt/bjc250gs-BlueGamma.xml
-share/foomatic/db/source/opt/bjc250gs-ColorMode.xml
-share/foomatic/db/source/opt/bjc250gs-ComposeK.xml
-share/foomatic/db/source/opt/bjc250gs-Compress.xml
-share/foomatic/db/source/opt/bjc250gs-GreenGamma.xml
-share/foomatic/db/source/opt/bjc250gs-Inverse.xml
-share/foomatic/db/source/opt/bjc250gs-LimitCheck.xml
-share/foomatic/db/source/opt/bjc250gs-Manualfeed.xml
-share/foomatic/db/source/opt/bjc250gs-MasterGamma.xml
-share/foomatic/db/source/opt/bjc250gs-MediaType.xml
-share/foomatic/db/source/opt/bjc250gs-Model.xml
-share/foomatic/db/source/opt/bjc250gs-PaperBlue.xml
-share/foomatic/db/source/opt/bjc250gs-PaperGreen.xml
-share/foomatic/db/source/opt/bjc250gs-PaperRed.xml
-share/foomatic/db/source/opt/bjc250gs-PrintColors.xml
-share/foomatic/db/source/opt/bjc250gs-Quality.xml
-share/foomatic/db/source/opt/bjc250gs-Random.xml
-share/foomatic/db/source/opt/bjc250gs-RedGamma.xml
-share/foomatic/db/source/opt/bjc250gs-Smooth.xml
-share/foomatic/db/source/opt/bj8pa06n-Resolution.xml
-share/foomatic/db/source/opt/Brother-MediaType.xml
-share/foomatic/db/source/opt/cdj5XX-BlackCorrect.xml
-share/foomatic/db/source/opt/cdj5XX-Depletion.xml
-share/foomatic/db/source/opt/cljet5-ColorMode.xml
-share/foomatic/db/source/opt/cZ11somsom-Black.xml
-share/foomatic/db/source/opt/cZ11somsom-Cyan.xml
-share/foomatic/db/source/opt/cZ11somsom-DitherPPI.xml
-share/foomatic/db/source/opt/cZ11somsom-InkType.xml
-share/foomatic/db/source/opt/cZ11somsom-Magenta.xml
-share/foomatic/db/source/opt/cZ11somsom-Yellow.xml
-share/foomatic/db/source/opt/drv_z42-Bidirectional.xml
-share/foomatic/db/source/opt/drv_z42-InkType.xml
-share/foomatic/db/source/opt/drv_z42-PageSize.xml
-share/foomatic/db/source/opt/drv_z42-PrintoutMode.xml
-share/foomatic/db/source/opt/drv_z42-Resolution.xml
-share/foomatic/db/source/opt/eplXXXX-Collate.xml
-share/foomatic/db/source/opt/eplXXXX-Duplex.xml
-share/foomatic/db/source/opt/eplXXXX-FaceUp.xml
-share/foomatic/db/source/opt/eplXXXX-InputSlot.xml
-share/foomatic/db/source/opt/eplXXXX-Landscape.xml
-share/foomatic/db/source/opt/eplXXXX-MediaType.xml
-share/foomatic/db/source/opt/eplXXXX-NumCopies.xml
-share/foomatic/db/source/opt/eplXXXX-RITOff.xml
-share/foomatic/db/source/opt/eplXXXX-TonerSaving.xml
-share/foomatic/db/source/opt/epsonepl-Density.xml
-share/foomatic/db/source/opt/epsonepl-Dpi.xml
-share/foomatic/db/source/opt/epsonepl-FlowControl.xml
-share/foomatic/db/source/opt/epsonepl-PageSize.xml
-share/foomatic/db/source/opt/epsonepl-PrintoutMode.xml
-share/foomatic/db/source/opt/epsonepl-Ritech.xml
-share/foomatic/db/source/opt/epsonepl-TonerSave.xml
-share/foomatic/db/source/opt/foo2zjs-ColorMode.xml
-share/foomatic/db/source/opt/foo2zjs-Copies.xml
-share/foomatic/db/source/opt/foo2zjs-Duplex.xml
-share/foomatic/db/source/opt/foo2zjs-ICM.xml
-share/foomatic/db/source/opt/foo2zjs-InputSlot.xml
-share/foomatic/db/source/opt/foo2zjs-Intent.xml
-share/foomatic/db/source/opt/foo2zjs-MediaType.xml
-share/foomatic/db/source/opt/foo2zjs-Nup.xml
-share/foomatic/db/source/opt/foo2zjs-PageSize.xml
-share/foomatic/db/source/opt/foo2zjs-PrinterType.xml
-share/foomatic/db/source/opt/foo2zjs-Resolution.xml
-share/foomatic/db/source/opt/gdi-AllowReprint.xml
-share/foomatic/db/source/opt/gdi-Altitude.xml
-share/foomatic/db/source/opt/gdi-Copies.xml
-share/foomatic/db/source/opt/gdi-Density.xml
-share/foomatic/db/source/opt/gdi-Economode.xml
-share/foomatic/db/source/opt/gdi-JamRecovery.xml
-share/foomatic/db/source/opt/gdi-Manualfeed.xml
-share/foomatic/db/source/opt/gdi-MediaType.xml
-share/foomatic/db/source/opt/gdi-PageSizeJCL.xml
-share/foomatic/db/source/opt/gdi-PageSizePS.xml
-share/foomatic/db/source/opt/gdi-PageSize.xml
-share/foomatic/db/source/opt/gdi-PageTimeout.xml
-share/foomatic/db/source/opt/gdi-PowerSaveTime.xml
-share/foomatic/db/source/opt/gdi-PowerSaving.xml
-share/foomatic/db/source/opt/gdi-RET.xml
-share/foomatic/db/source/opt/jap-PageSize.xml
-share/foomatic/db/source/opt/jap-Resolution.xml
-share/foomatic/db/source/opt/largeformat-PageSize.xml
-share/foomatic/db/source/opt/lm1100-Brightness.xml
-share/foomatic/db/source/opt/lxm3200-tweaked-Model.xml
-share/foomatic/db/source/opt/lxm3200-tweaked-Z31Margin.xml
-share/foomatic/db/source/opt/lz11-InkSaving.xml
-share/foomatic/db/source/opt/lz11-InkType.xml
-share/foomatic/db/source/opt/lz11-PageSize.xml
-share/foomatic/db/source/opt/lz11-ResX.xml
-share/foomatic/db/source/opt/lz11-ResY.xml
-share/foomatic/db/source/opt/Minolta-PCL600.xml
-share/foomatic/db/source/opt/PageSize-A4only.xml
-share/foomatic/db/source/opt/pbmtozjs-PageSize.xml
-share/foomatic/db/source/opt/pcl3-ConfigureEveryPage.xml
-share/foomatic/db/source/opt/PCL-XL-InputSlot.xml
-share/foomatic/db/source/opt/PCL-4-5-InputSlot.xml
-share/foomatic/db/source/opt/pentaxpj-Density.xml
-share/foomatic/db/source/opt/pentaxpj-OutputType.xml
-share/foomatic/db/source/opt/pentaxpj-PageSize.xml
-share/foomatic/db/source/opt/PJL-Duplex.xml
-share/foomatic/db/source/opt/PJL-PJLBinding.xml
-share/foomatic/db/source/opt/PJL-PJLDuplex.xml
-share/foomatic/db/source/opt/pjl-Samsung-ML-1650-AllowReprint.xml
-share/foomatic/db/source/opt/pjl-Samsung-ML-1650-Economode.xml
-share/foomatic/db/source/opt/pjl-Samsung-ML-1650-MediaType.xml
-share/foomatic/db/source/opt/pjl-Samsung-ML-1650-RET.xml
-share/foomatic/db/source/opt/pjxl-Quality.xml
-share/foomatic/db/source/opt/pjxl-RenderType.xml
-share/foomatic/db/source/opt/pnm2ppa-Dither.xml
-share/foomatic/db/source/opt/pnm2ppa-EconoFast.xml
-share/foomatic/db/source/opt/Postscript-PreFilter.xml
-share/foomatic/db/source/opt/Postscript-Resolution.xml
-share/foomatic/db/source/opt/ppmtocpva-solidblack.xml
-share/foomatic/db/source/opt/ppmtomd-ColorMode.xml
-share/foomatic/db/source/opt/ppmtomd-ColourCorrection.xml
-share/foomatic/db/source/opt/ppmtomd-CurlCorrection.xml
-share/foomatic/db/source/opt/ppmtomd-Dither.xml
-share/foomatic/db/source/opt/ppmtomd-GammaCorrection.xml
-share/foomatic/db/source/opt/ppmtomd-GammaSaturation.xml
-share/foomatic/db/source/opt/ppmtomd-Glossy.xml
-share/foomatic/db/source/opt/ppmtomd-JobType.xml
-share/foomatic/db/source/opt/ppmtomd-KeepBlack.xml
-share/foomatic/db/source/opt/ppmtomd-LFAdjust.xml
-share/foomatic/db/source/opt/ppmtomd-Model.xml
-share/foomatic/db/source/opt/ppmtomd-NoReset.xml
-share/foomatic/db/source/opt/ppmtomd-Overlay.xml
-share/foomatic/db/source/opt/ppmtomd-PageSize.xml
-share/foomatic/db/source/opt/ppmtomd-PHAdjust.xml
-share/foomatic/db/source/opt/ppmtomd-PrintColors.xml
-share/foomatic/db/source/opt/ppmtomd-UseMultiColourRibbon.xml
-share/foomatic/db/source/opt/pxlmono-GSResolution.xml
-share/foomatic/db/source/opt/pxlmono-JCLResolution.xml
-share/foomatic/db/source/opt/pxlmono-PrinterResolution.xml
-share/foomatic/db/source/opt/pxlmono-PrintoutMode.xml
-share/foomatic/db/source/opt/stc300.upp-Resolution.xml
-share/foomatic/db/source/opt/st640ih-Resolution.xml
-share/foomatic/db/source/opt/s400a1-Resolution.xml
+share/foomatic/db/source/opt/1.xml
+share/foomatic/db/source/opt/10.xml
 share/foomatic/db/source/opt/100.xml
 share/foomatic/db/source/opt/101.xml
 share/foomatic/db/source/opt/102.xml
@@ -389,7 +256,6 @@ share/foomatic/db/source/opt/106.xml
 share/foomatic/db/source/opt/107.xml
 share/foomatic/db/source/opt/108.xml
 share/foomatic/db/source/opt/109.xml
-share/foomatic/db/source/opt/10.xml
 share/foomatic/db/source/opt/110.xml
 share/foomatic/db/source/opt/111.xml
 share/foomatic/db/source/opt/112.xml
@@ -400,6 +266,7 @@ share/foomatic/db/source/opt/116.xml
 share/foomatic/db/source/opt/117.xml
 share/foomatic/db/source/opt/118.xml
 share/foomatic/db/source/opt/119.xml
+share/foomatic/db/source/opt/12.xml
 share/foomatic/db/source/opt/120.xml
 share/foomatic/db/source/opt/121.xml
 share/foomatic/db/source/opt/122.xml
@@ -410,7 +277,7 @@ share/foomatic/db/source/opt/126.xml
 share/foomatic/db/source/opt/127.xml
 share/foomatic/db/source/opt/128.xml
 share/foomatic/db/source/opt/129.xml
-share/foomatic/db/source/opt/12.xml
+share/foomatic/db/source/opt/13.xml
 share/foomatic/db/source/opt/130.xml
 share/foomatic/db/source/opt/131.xml
 share/foomatic/db/source/opt/132.xml
@@ -421,7 +288,7 @@ share/foomatic/db/source/opt/136.xml
 share/foomatic/db/source/opt/137.xml
 share/foomatic/db/source/opt/138.xml
 share/foomatic/db/source/opt/139.xml
-share/foomatic/db/source/opt/13.xml
+share/foomatic/db/source/opt/14.xml
 share/foomatic/db/source/opt/140.xml
 share/foomatic/db/source/opt/141.xml
 share/foomatic/db/source/opt/142.xml
@@ -432,7 +299,6 @@ share/foomatic/db/source/opt/146.xml
 share/foomatic/db/source/opt/147.xml
 share/foomatic/db/source/opt/148.xml
 share/foomatic/db/source/opt/149.xml
-share/foomatic/db/source/opt/14.xml
 share/foomatic/db/source/opt/150.xml
 share/foomatic/db/source/opt/151.xml
 share/foomatic/db/source/opt/152.xml
@@ -443,6 +309,7 @@ share/foomatic/db/source/opt/156.xml
 share/foomatic/db/source/opt/157.xml
 share/foomatic/db/source/opt/158.xml
 share/foomatic/db/source/opt/159.xml
+share/foomatic/db/source/opt/16.xml
 share/foomatic/db/source/opt/160.xml
 share/foomatic/db/source/opt/161.xml
 share/foomatic/db/source/opt/162.xml
@@ -453,7 +320,6 @@ share/foomatic/db/source/opt/166.xml
 share/foomatic/db/source/opt/167.xml
 share/foomatic/db/source/opt/168.xml
 share/foomatic/db/source/opt/169.xml
-share/foomatic/db/source/opt/16.xml
 share/foomatic/db/source/opt/170.xml
 share/foomatic/db/source/opt/171.xml
 share/foomatic/db/source/opt/172.xml
@@ -463,6 +329,7 @@ share/foomatic/db/source/opt/175.xml
 share/foomatic/db/source/opt/176.xml
 share/foomatic/db/source/opt/177.xml
 share/foomatic/db/source/opt/179.xml
+share/foomatic/db/source/opt/18.xml
 share/foomatic/db/source/opt/180.xml
 share/foomatic/db/source/opt/181.xml
 share/foomatic/db/source/opt/182.xml
@@ -471,7 +338,7 @@ share/foomatic/db/source/opt/186.xml
 share/foomatic/db/source/opt/187.xml
 share/foomatic/db/source/opt/188.xml
 share/foomatic/db/source/opt/189.xml
-share/foomatic/db/source/opt/18.xml
+share/foomatic/db/source/opt/19.xml
 share/foomatic/db/source/opt/190.xml
 share/foomatic/db/source/opt/191.xml
 share/foomatic/db/source/opt/192.xml
@@ -482,8 +349,8 @@ share/foomatic/db/source/opt/196.xml
 share/foomatic/db/source/opt/197.xml
 share/foomatic/db/source/opt/198.xml
 share/foomatic/db/source/opt/199.xml
-share/foomatic/db/source/opt/19.xml
-share/foomatic/db/source/opt/1.xml
+share/foomatic/db/source/opt/2.xml
+share/foomatic/db/source/opt/20.xml
 share/foomatic/db/source/opt/200.xml
 share/foomatic/db/source/opt/201.xml
 share/foomatic/db/source/opt/202.xml
@@ -494,7 +361,7 @@ share/foomatic/db/source/opt/206.xml
 share/foomatic/db/source/opt/207.xml
 share/foomatic/db/source/opt/208.xml
 share/foomatic/db/source/opt/209.xml
-share/foomatic/db/source/opt/20.xml
+share/foomatic/db/source/opt/21.xml
 share/foomatic/db/source/opt/211.xml
 share/foomatic/db/source/opt/212.xml
 share/foomatic/db/source/opt/213.xml
@@ -504,7 +371,6 @@ share/foomatic/db/source/opt/216.xml
 share/foomatic/db/source/opt/217.xml
 share/foomatic/db/source/opt/218.xml
 share/foomatic/db/source/opt/219.xml
-share/foomatic/db/source/opt/21.xml
 share/foomatic/db/source/opt/220.xml
 share/foomatic/db/source/opt/221.xml
 share/foomatic/db/source/opt/222.xml
@@ -515,7 +381,7 @@ share/foomatic/db/source/opt/226.xml
 share/foomatic/db/source/opt/227.xml
 share/foomatic/db/source/opt/228.xml
 share/foomatic/db/source/opt/24.xml
-share/foomatic/db/source/opt/2.xml
+share/foomatic/db/source/opt/3.xml
 share/foomatic/db/source/opt/31.xml
 share/foomatic/db/source/opt/32.xml
 share/foomatic/db/source/opt/33.xml
@@ -525,7 +391,6 @@ share/foomatic/db/source/opt/36.xml
 share/foomatic/db/source/opt/37.xml
 share/foomatic/db/source/opt/38.xml
 share/foomatic/db/source/opt/39.xml
-share/foomatic/db/source/opt/3.xml
 share/foomatic/db/source/opt/40.xml
 share/foomatic/db/source/opt/41.xml
 share/foomatic/db/source/opt/42.xml
@@ -536,6 +401,7 @@ share/foomatic/db/source/opt/46.xml
 share/foomatic/db/source/opt/47.xml
 share/foomatic/db/source/opt/48.xml
 share/foomatic/db/source/opt/49.xml
+share/foomatic/db/source/opt/5.xml
 share/foomatic/db/source/opt/50.xml
 share/foomatic/db/source/opt/51.xml
 share/foomatic/db/source/opt/52.xml
@@ -544,7 +410,7 @@ share/foomatic/db/source/opt/55.xml
 share/foomatic/db/source/opt/56.xml
 share/foomatic/db/source/opt/57.xml
 share/foomatic/db/source/opt/58.xml
-share/foomatic/db/source/opt/5.xml
+share/foomatic/db/source/opt/6.xml
 share/foomatic/db/source/opt/60.xml
 share/foomatic/db/source/opt/61.xml
 share/foomatic/db/source/opt/62.xml
@@ -555,7 +421,7 @@ share/foomatic/db/source/opt/66.xml
 share/foomatic/db/source/opt/67.xml
 share/foomatic/db/source/opt/68.xml
 share/foomatic/db/source/opt/69.xml
-share/foomatic/db/source/opt/6.xml
+share/foomatic/db/source/opt/7.xml
 share/foomatic/db/source/opt/70.xml
 share/foomatic/db/source/opt/71.xml
 share/foomatic/db/source/opt/72.xml
@@ -566,7 +432,7 @@ share/foomatic/db/source/opt/76.xml
 share/foomatic/db/source/opt/77.xml
 share/foomatic/db/source/opt/78.xml
 share/foomatic/db/source/opt/79.xml
-share/foomatic/db/source/opt/7.xml
+share/foomatic/db/source/opt/8.xml
 share/foomatic/db/source/opt/80.xml
 share/foomatic/db/source/opt/81.xml
 share/foomatic/db/source/opt/82.xml
@@ -577,7 +443,7 @@ share/foomatic/db/source/opt/86.xml
 share/foomatic/db/source/opt/87.xml
 share/foomatic/db/source/opt/88.xml
 share/foomatic/db/source/opt/89.xml
-share/foomatic/db/source/opt/8.xml
+share/foomatic/db/source/opt/9.xml
 share/foomatic/db/source/opt/90.xml
 share/foomatic/db/source/opt/91.xml
 share/foomatic/db/source/opt/92.xml
@@ -588,7 +454,174 @@ share/foomatic/db/source/opt/96.xml
 share/foomatic/db/source/opt/97.xml
 share/foomatic/db/source/opt/98.xml
 share/foomatic/db/source/opt/99.xml
-share/foomatic/db/source/opt/9.xml
+share/foomatic/db/source/opt/Brother-MediaType.xml
+share/foomatic/db/source/opt/Minolta-PCL600.xml
+share/foomatic/db/source/opt/PCL-4-5-InputSlot.xml
+share/foomatic/db/source/opt/PCL-XL-InputSlot.xml
+share/foomatic/db/source/opt/PJL-Duplex.xml
+share/foomatic/db/source/opt/PJL-PJLBinding.xml
+share/foomatic/db/source/opt/PJL-PJLDuplex.xml
+share/foomatic/db/source/opt/PageSize-A4only.xml
+share/foomatic/db/source/opt/Postscript-PreFilter.xml
+share/foomatic/db/source/opt/Postscript-Resolution.xml
+share/foomatic/db/source/opt/bj8pa06n-Resolution.xml
+share/foomatic/db/source/opt/bjc250gs-BlueGamma.xml
+share/foomatic/db/source/opt/bjc250gs-ColorMode.xml
+share/foomatic/db/source/opt/bjc250gs-ComposeK.xml
+share/foomatic/db/source/opt/bjc250gs-Compress.xml
+share/foomatic/db/source/opt/bjc250gs-GreenGamma.xml
+share/foomatic/db/source/opt/bjc250gs-Inverse.xml
+share/foomatic/db/source/opt/bjc250gs-LimitCheck.xml
+share/foomatic/db/source/opt/bjc250gs-Manualfeed.xml
+share/foomatic/db/source/opt/bjc250gs-MasterGamma.xml
+share/foomatic/db/source/opt/bjc250gs-MediaType.xml
+share/foomatic/db/source/opt/bjc250gs-Model.xml
+share/foomatic/db/source/opt/bjc250gs-PaperBlue.xml
+share/foomatic/db/source/opt/bjc250gs-PaperGreen.xml
+share/foomatic/db/source/opt/bjc250gs-PaperRed.xml
+share/foomatic/db/source/opt/bjc250gs-PrintColors.xml
+share/foomatic/db/source/opt/bjc250gs-Quality.xml
+share/foomatic/db/source/opt/bjc250gs-Random.xml
+share/foomatic/db/source/opt/bjc250gs-RedGamma.xml
+share/foomatic/db/source/opt/bjc250gs-Smooth.xml
+share/foomatic/db/source/opt/cZ11somsom-Black.xml
+share/foomatic/db/source/opt/cZ11somsom-Cyan.xml
+share/foomatic/db/source/opt/cZ11somsom-DitherPPI.xml
+share/foomatic/db/source/opt/cZ11somsom-InkType.xml
+share/foomatic/db/source/opt/cZ11somsom-Magenta.xml
+share/foomatic/db/source/opt/cZ11somsom-Yellow.xml
+share/foomatic/db/source/opt/cdj5XX-BlackCorrect.xml
+share/foomatic/db/source/opt/cdj5XX-Depletion.xml
+share/foomatic/db/source/opt/cljet5-ColorMode.xml
+share/foomatic/db/source/opt/drv_x125-Bidirectional.xml
+share/foomatic/db/source/opt/drv_x125-ColorMode.xml
+share/foomatic/db/source/opt/drv_x125-Device.xml
+share/foomatic/db/source/opt/drv_x125-PageSize.xml
+share/foomatic/db/source/opt/drv_x125-Resolution.xml
+share/foomatic/db/source/opt/drv_z42-Bidirectional.xml
+share/foomatic/db/source/opt/drv_z42-InkType.xml
+share/foomatic/db/source/opt/drv_z42-PageSize.xml
+share/foomatic/db/source/opt/drv_z42-PrintoutMode.xml
+share/foomatic/db/source/opt/drv_z42-Resolution.xml
+share/foomatic/db/source/opt/eplaser-Collate.xml
+share/foomatic/db/source/opt/eplaser-Duplex.xml
+share/foomatic/db/source/opt/eplaser-FaceUp.xml
+share/foomatic/db/source/opt/eplaser-InputSlot.xml
+share/foomatic/db/source/opt/eplaser-Landscape.xml
+share/foomatic/db/source/opt/eplaser-MediaType.xml
+share/foomatic/db/source/opt/eplaser-Model.xml
+share/foomatic/db/source/opt/eplaser-NumCopies.xml
+share/foomatic/db/source/opt/eplaser-RITOff.xml
+share/foomatic/db/source/opt/eplaser-TonerSaving.xml
+share/foomatic/db/source/opt/eplaser-jp-Model.xml
+share/foomatic/db/source/opt/epsonepl-Density.xml
+share/foomatic/db/source/opt/epsonepl-Dpi.xml
+share/foomatic/db/source/opt/epsonepl-FlowControl.xml
+share/foomatic/db/source/opt/epsonepl-PageSize.xml
+share/foomatic/db/source/opt/epsonepl-PrintoutMode.xml
+share/foomatic/db/source/opt/epsonepl-Ritech.xml
+share/foomatic/db/source/opt/epsonepl-TonerSave.xml
+share/foomatic/db/source/opt/foo2oak-BitsPerPlane.xml
+share/foomatic/db/source/opt/foo2oak-ColorMode.xml
+share/foomatic/db/source/opt/foo2oak-ICM.xml
+share/foomatic/db/source/opt/foo2oak-InputSlot.xml
+share/foomatic/db/source/opt/foo2oak-MediaType.xml
+share/foomatic/db/source/opt/foo2zjs-ColorMode.xml
+share/foomatic/db/source/opt/foo2zjs-Copies.xml
+share/foomatic/db/source/opt/foo2zjs-Duplex.xml
+share/foomatic/db/source/opt/foo2zjs-ICM.xml
+share/foomatic/db/source/opt/foo2zjs-InputSlot.xml
+share/foomatic/db/source/opt/foo2zjs-Intent.xml
+share/foomatic/db/source/opt/foo2zjs-MediaType.xml
+share/foomatic/db/source/opt/foo2zjs-Nup.xml
+share/foomatic/db/source/opt/foo2zjs-PageSize.xml
+share/foomatic/db/source/opt/foo2zjs-PrinterType.xml
+share/foomatic/db/source/opt/foo2zjs-Resolution.xml
+share/foomatic/db/source/opt/gdi-AllowReprint.xml
+share/foomatic/db/source/opt/gdi-Altitude.xml
+share/foomatic/db/source/opt/gdi-Copies.xml
+share/foomatic/db/source/opt/gdi-Density.xml
+share/foomatic/db/source/opt/gdi-Economode.xml
+share/foomatic/db/source/opt/gdi-JamRecovery.xml
+share/foomatic/db/source/opt/gdi-Manualfeed.xml
+share/foomatic/db/source/opt/gdi-MediaType.xml
+share/foomatic/db/source/opt/gdi-PageSize.xml
+share/foomatic/db/source/opt/gdi-PageSizeJCL.xml
+share/foomatic/db/source/opt/gdi-PageSizePS.xml
+share/foomatic/db/source/opt/gdi-PageTimeout.xml
+share/foomatic/db/source/opt/gdi-PowerSaveTime.xml
+share/foomatic/db/source/opt/gdi-PowerSaving.xml
+share/foomatic/db/source/opt/gdi-RET.xml
+share/foomatic/db/source/opt/jap-PageSize.xml
+share/foomatic/db/source/opt/jap-Resolution.xml
+share/foomatic/db/source/opt/largeformat-PageSize.xml
+share/foomatic/db/source/opt/lm1100-Brightness.xml
+share/foomatic/db/source/opt/lxm3200-tweaked-Model.xml
+share/foomatic/db/source/opt/lxm3200-tweaked-Z31Margin.xml
+share/foomatic/db/source/opt/lz11-InkSaving.xml
+share/foomatic/db/source/opt/lz11-InkType.xml
+share/foomatic/db/source/opt/lz11-PageSize.xml
+share/foomatic/db/source/opt/lz11-ResX.xml
+share/foomatic/db/source/opt/lz11-ResY.xml
+share/foomatic/db/source/opt/m2300w-ColorMode.xml
+share/foomatic/db/source/opt/m2300w-ColorProfile.xml
+share/foomatic/db/source/opt/m2300w-MediaType.xml
+share/foomatic/db/source/opt/m2300w-PageSize.xml
+share/foomatic/db/source/opt/m2300w-Resolution.xml
+share/foomatic/db/source/opt/m2300w-psnup.xml
+share/foomatic/db/source/opt/min12xxw-DriverPageSize.xml
+share/foomatic/db/source/opt/min12xxw-DriverResolution.xml
+share/foomatic/db/source/opt/min12xxw-Economode.xml
+share/foomatic/db/source/opt/min12xxw-GSPageSize.xml
+share/foomatic/db/source/opt/min12xxw-GSResolution.xml
+share/foomatic/db/source/opt/min12xxw-InputSlot.xml
+share/foomatic/db/source/opt/min12xxw-MediaType.xml
+share/foomatic/db/source/opt/min12xxw-Model.xml
+share/foomatic/db/source/opt/min12xxw-PageSize.xml
+share/foomatic/db/source/opt/min12xxw-Resolution.xml
+share/foomatic/db/source/opt/oki4w-PageSize.xml
+share/foomatic/db/source/opt/oki4w-Resolution.xml
+share/foomatic/db/source/opt/pbmtozjs-PageSize.xml
+share/foomatic/db/source/opt/pcl3-ConfigureEveryPage.xml
+share/foomatic/db/source/opt/pentaxpj-Density.xml
+share/foomatic/db/source/opt/pentaxpj-OutputType.xml
+share/foomatic/db/source/opt/pentaxpj-PageSize.xml
+share/foomatic/db/source/opt/pjl-Samsung-ML-1650-AllowReprint.xml
+share/foomatic/db/source/opt/pjl-Samsung-ML-1650-Economode.xml
+share/foomatic/db/source/opt/pjl-Samsung-ML-1650-MediaType.xml
+share/foomatic/db/source/opt/pjl-Samsung-ML-1650-RET.xml
+share/foomatic/db/source/opt/pjxl-Quality.xml
+share/foomatic/db/source/opt/pjxl-RenderType.xml
+share/foomatic/db/source/opt/pnm2ppa-Dither.xml
+share/foomatic/db/source/opt/pnm2ppa-EconoFast.xml
+share/foomatic/db/source/opt/ppmtocpva-solidblack.xml
+share/foomatic/db/source/opt/ppmtomd-ColorMode.xml
+share/foomatic/db/source/opt/ppmtomd-ColourCorrection.xml
+share/foomatic/db/source/opt/ppmtomd-CurlCorrection.xml
+share/foomatic/db/source/opt/ppmtomd-Dither.xml
+share/foomatic/db/source/opt/ppmtomd-GammaCorrection.xml
+share/foomatic/db/source/opt/ppmtomd-GammaSaturation.xml
+share/foomatic/db/source/opt/ppmtomd-Glossy.xml
+share/foomatic/db/source/opt/ppmtomd-JobType.xml
+share/foomatic/db/source/opt/ppmtomd-KeepBlack.xml
+share/foomatic/db/source/opt/ppmtomd-LFAdjust.xml
+share/foomatic/db/source/opt/ppmtomd-MediaType.xml
+share/foomatic/db/source/opt/ppmtomd-Model.xml
+share/foomatic/db/source/opt/ppmtomd-NoReset.xml
+share/foomatic/db/source/opt/ppmtomd-Overlay.xml
+share/foomatic/db/source/opt/ppmtomd-PHAdjust.xml
+share/foomatic/db/source/opt/ppmtomd-PageSize.xml
+share/foomatic/db/source/opt/ppmtomd-Primer.xml
+share/foomatic/db/source/opt/ppmtomd-PrintColors.xml
+share/foomatic/db/source/opt/ppmtomd-PrintingMethod.xml
+share/foomatic/db/source/opt/ppmtomd-UseMultiColourRibbon.xml
+share/foomatic/db/source/opt/pxlmono-GSResolution.xml
+share/foomatic/db/source/opt/pxlmono-JCLResolution.xml
+share/foomatic/db/source/opt/pxlmono-PrinterResolution.xml
+share/foomatic/db/source/opt/pxlmono-PrintoutMode.xml
+share/foomatic/db/source/opt/s400a1-Resolution.xml
+share/foomatic/db/source/opt/st640ih-Resolution.xml
+share/foomatic/db/source/opt/stc300.upp-Resolution.xml
 share/foomatic/db/source/printer/Alps-MD-1000.xml
 share/foomatic/db/source/printer/Alps-MD-1300.xml
 share/foomatic/db/source/printer/Alps-MD-1500.xml
@@ -610,6 +643,7 @@ share/foomatic/db/source/printer/Apollo-P-2500.xml
 share/foomatic/db/source/printer/Apollo-P-2550.xml
 share/foomatic/db/source/printer/Apollo-P-2600.xml
 share/foomatic/db/source/printer/Apollo-P-2650.xml
+share/foomatic/db/source/printer/Apple-12_640ps.xml
 share/foomatic/db/source/printer/Apple-Color_StyleWriter_1500.xml
 share/foomatic/db/source/printer/Apple-Color_StyleWriter_2200.xml
 share/foomatic/db/source/printer/Apple-Color_StyleWriter_2400.xml
@@ -618,29 +652,29 @@ share/foomatic/db/source/printer/Apple-Dot_Matrix.xml
 share/foomatic/db/source/printer/Apple-ImageWriter.xml
 share/foomatic/db/source/printer/Apple-ImageWriter_II.xml
 share/foomatic/db/source/printer/Apple-ImageWriter_LQ.xml
-share/foomatic/db/source/printer/Apple-LaserWriter_IIg.xml
+share/foomatic/db/source/printer/Apple-LaserWriter_16_600.xml
+share/foomatic/db/source/printer/Apple-LaserWriter_4_600.xml
 share/foomatic/db/source/printer/Apple-LaserWriter_IINTX.xml
+share/foomatic/db/source/printer/Apple-LaserWriter_IIg.xml
 share/foomatic/db/source/printer/Apple-LaserWriter_NT.xml
 share/foomatic/db/source/printer/Apple-LaserWriter_Pro_630.xml
 share/foomatic/db/source/printer/Apple-LaserWriter_Select_360.xml
-share/foomatic/db/source/printer/Apple-LaserWriter_16_600.xml
-share/foomatic/db/source/printer/Apple-LaserWriter_4_600.xml
-share/foomatic/db/source/printer/Apple-StyleWriter_II.xml
-share/foomatic/db/source/printer/Apple-StyleWriter_I.xml
 share/foomatic/db/source/printer/Apple-StyleWriter_1200.xml
-share/foomatic/db/source/printer/Apple-12_640ps.xml
-share/foomatic/db/source/printer/Avery-Personal_Label_Printerplus.xml
+share/foomatic/db/source/printer/Apple-StyleWriter_I.xml
+share/foomatic/db/source/printer/Apple-StyleWriter_II.xml
 share/foomatic/db/source/printer/Avery-Personal_Label_Printer.xml
+share/foomatic/db/source/printer/Avery-Personal_Label_Printerplus.xml
+share/foomatic/db/source/printer/Brother-4550.xml
 share/foomatic/db/source/printer/Brother-DCP-1200.xml
 share/foomatic/db/source/printer/Brother-HJ-400.xml
-share/foomatic/db/source/printer/Brother-HL-10h.xml
-share/foomatic/db/source/printer/Brother-HL-10V.xml
 share/foomatic/db/source/printer/Brother-HL-1020.xml
 share/foomatic/db/source/printer/Brother-HL-1030.xml
 share/foomatic/db/source/printer/Brother-HL-1040.xml
 share/foomatic/db/source/printer/Brother-HL-1050.xml
 share/foomatic/db/source/printer/Brother-HL-1060.xml
 share/foomatic/db/source/printer/Brother-HL-1070.xml
+share/foomatic/db/source/printer/Brother-HL-10V.xml
+share/foomatic/db/source/printer/Brother-HL-10h.xml
 share/foomatic/db/source/printer/Brother-HL-1230.xml
 share/foomatic/db/source/printer/Brother-HL-1240.xml
 share/foomatic/db/source/printer/Brother-HL-1250.xml
@@ -658,30 +692,32 @@ share/foomatic/db/source/printer/Brother-HL-1850.xml
 share/foomatic/db/source/printer/Brother-HL-1870N.xml
 share/foomatic/db/source/printer/Brother-HL-2060.xml
 share/foomatic/db/source/printer/Brother-HL-2400CeN.xml
-share/foomatic/db/source/printer/Brother-HL-2460N.xml
 share/foomatic/db/source/printer/Brother-HL-2460.xml
+share/foomatic/db/source/printer/Brother-HL-2460N.xml
 share/foomatic/db/source/printer/Brother-HL-2600CN.xml
 share/foomatic/db/source/printer/Brother-HL-3260N.xml
 share/foomatic/db/source/printer/Brother-HL-3400CN.xml
 share/foomatic/db/source/printer/Brother-HL-3450CN.xml
-share/foomatic/db/source/printer/Brother-HL-4Ve.xml
 share/foomatic/db/source/printer/Brother-HL-4000CN.xml
+share/foomatic/db/source/printer/Brother-HL-4Ve.xml
 share/foomatic/db/source/printer/Brother-HL-5030.xml
 share/foomatic/db/source/printer/Brother-HL-5040.xml
 share/foomatic/db/source/printer/Brother-HL-5050.xml
 share/foomatic/db/source/printer/Brother-HL-5070N.xml
+share/foomatic/db/source/printer/Brother-HL-5140.xml
+share/foomatic/db/source/printer/Brother-HL-5150D.xml
+share/foomatic/db/source/printer/Brother-HL-5170DN.xml
 share/foomatic/db/source/printer/Brother-HL-630.xml
 share/foomatic/db/source/printer/Brother-HL-660.xml
-share/foomatic/db/source/printer/Brother-HL-7050N.xml
 share/foomatic/db/source/printer/Brother-HL-7050.xml
+share/foomatic/db/source/printer/Brother-HL-7050N.xml
 share/foomatic/db/source/printer/Brother-HL-720.xml
 share/foomatic/db/source/printer/Brother-HL-730.xml
 share/foomatic/db/source/printer/Brother-HL-760.xml
-share/foomatic/db/source/printer/Brother-HL-820.xml
 share/foomatic/db/source/printer/Brother-HL-8.xml
+share/foomatic/db/source/printer/Brother-HL-820.xml
 share/foomatic/db/source/printer/Brother-HL-960.xml
 share/foomatic/db/source/printer/Brother-MC-3000.xml
-share/foomatic/db/source/printer/Brother-MFC-P2500.xml
 share/foomatic/db/source/printer/Brother-MFC-4350.xml
 share/foomatic/db/source/printer/Brother-MFC-6550MC.xml
 share/foomatic/db/source/printer/Brother-MFC-8300.xml
@@ -689,20 +725,32 @@ share/foomatic/db/source/printer/Brother-MFC-9050.xml
 share/foomatic/db/source/printer/Brother-MFC-9100c.xml
 share/foomatic/db/source/printer/Brother-MFC-9500.xml
 share/foomatic/db/source/printer/Brother-MFC-9600.xml
+share/foomatic/db/source/printer/Brother-MFC-P2500.xml
 share/foomatic/db/source/printer/Brother-MFC_7150C.xml
 share/foomatic/db/source/printer/Brother-MP-21C.xml
-share/foomatic/db/source/printer/Brother-4550.xml
+share/foomatic/db/source/printer/CItoh-M8510.xml
 share/foomatic/db/source/printer/CalComp-Artisan_1023_penplotter.xml
+share/foomatic/db/source/printer/Canon-BJ-100.xml
+share/foomatic/db/source/printer/Canon-BJ-10e.xml
+share/foomatic/db/source/printer/Canon-BJ-10v.xml
+share/foomatic/db/source/printer/Canon-BJ-15v.xml
+share/foomatic/db/source/printer/Canon-BJ-20.xml
+share/foomatic/db/source/printer/Canon-BJ-200.xml
+share/foomatic/db/source/printer/Canon-BJ-30.xml
+share/foomatic/db/source/printer/Canon-BJ-300.xml
+share/foomatic/db/source/printer/Canon-BJ-330.xml
+share/foomatic/db/source/printer/Canon-BJ-35v.xml
+share/foomatic/db/source/printer/Canon-BJ-5.xml
 share/foomatic/db/source/printer/Canon-BJC-1000.xml
 share/foomatic/db/source/printer/Canon-BJC-2000.xml
 share/foomatic/db/source/printer/Canon-BJC-2010.xml
-share/foomatic/db/source/printer/Canon-BJC-210SP.xml
-share/foomatic/db/source/printer/Canon-BJC-2100.xml
 share/foomatic/db/source/printer/Canon-BJC-210.xml
+share/foomatic/db/source/printer/Canon-BJC-2100.xml
+share/foomatic/db/source/printer/Canon-BJC-210SP.xml
 share/foomatic/db/source/printer/Canon-BJC-2110.xml
 share/foomatic/db/source/printer/Canon-BJC-240.xml
-share/foomatic/db/source/printer/Canon-BJC-250ex.xml
 share/foomatic/db/source/printer/Canon-BJC-250.xml
+share/foomatic/db/source/printer/Canon-BJC-250ex.xml
 share/foomatic/db/source/printer/Canon-BJC-255SP.xml
 share/foomatic/db/source/printer/Canon-BJC-265SP.xml
 share/foomatic/db/source/printer/Canon-BJC-3000.xml
@@ -713,63 +761,51 @@ share/foomatic/db/source/printer/Canon-BJC-4300.xml
 share/foomatic/db/source/printer/Canon-BJC-4310SP.xml
 share/foomatic/db/source/printer/Canon-BJC-4400.xml
 share/foomatic/db/source/printer/Canon-BJC-4550.xml
-share/foomatic/db/source/printer/Canon-BJC-5000.xml
 share/foomatic/db/source/printer/Canon-BJC-50.xml
+share/foomatic/db/source/printer/Canon-BJC-5000.xml
 share/foomatic/db/source/printer/Canon-BJC-5100.xml
 share/foomatic/db/source/printer/Canon-BJC-55.xml
-share/foomatic/db/source/printer/Canon-BJC-6000.xml
 share/foomatic/db/source/printer/Canon-BJC-600.xml
-share/foomatic/db/source/printer/Canon-BJC-6100.xml
+share/foomatic/db/source/printer/Canon-BJC-6000.xml
 share/foomatic/db/source/printer/Canon-BJC-610.xml
-share/foomatic/db/source/printer/Canon-BJC-6200.xml
+share/foomatic/db/source/printer/Canon-BJC-6100.xml
 share/foomatic/db/source/printer/Canon-BJC-620.xml
+share/foomatic/db/source/printer/Canon-BJC-6200.xml
 share/foomatic/db/source/printer/Canon-BJC-6500.xml
 share/foomatic/db/source/printer/Canon-BJC-680J.xml
+share/foomatic/db/source/printer/Canon-BJC-70.xml
 share/foomatic/db/source/printer/Canon-BJC-7000.xml
 share/foomatic/db/source/printer/Canon-BJC-7004.xml
-share/foomatic/db/source/printer/Canon-BJC-70.xml
 share/foomatic/db/source/printer/Canon-BJC-7100.xml
-share/foomatic/db/source/printer/Canon-BJC-800.xml
 share/foomatic/db/source/printer/Canon-BJC-80.xml
+share/foomatic/db/source/printer/Canon-BJC-800.xml
 share/foomatic/db/source/printer/Canon-BJC-8200.xml
-share/foomatic/db/source/printer/Canon-BJC-8500.xml
 share/foomatic/db/source/printer/Canon-BJC-85.xml
+share/foomatic/db/source/printer/Canon-BJC-8500.xml
 share/foomatic/db/source/printer/Canon-BJC-880J.xml
-share/foomatic/db/source/printer/Canon-BJ-10e.xml
-share/foomatic/db/source/printer/Canon-BJ-10v.xml
-share/foomatic/db/source/printer/Canon-BJ-100.xml
-share/foomatic/db/source/printer/Canon-BJ-15v.xml
-share/foomatic/db/source/printer/Canon-BJ-200.xml
-share/foomatic/db/source/printer/Canon-BJ-20.xml
-share/foomatic/db/source/printer/Canon-BJ-300.xml
-share/foomatic/db/source/printer/Canon-BJ-30.xml
-share/foomatic/db/source/printer/Canon-BJ-330.xml
-share/foomatic/db/source/printer/Canon-BJ-35v.xml
-share/foomatic/db/source/printer/Canon-BJ-5.xml
 share/foomatic/db/source/printer/Canon-CP-100.xml
 share/foomatic/db/source/printer/Canon-GP_335.xml
 share/foomatic/db/source/printer/Canon-GP_405.xml
-share/foomatic/db/source/printer/Canon-imageRunner_330s.xml
 share/foomatic/db/source/printer/Canon-LBP-1000.xml
 share/foomatic/db/source/printer/Canon-LBP-1260.xml
 share/foomatic/db/source/printer/Canon-LBP-1760.xml
 share/foomatic/db/source/printer/Canon-LBP-310.xml
 share/foomatic/db/source/printer/Canon-LBP-320_Pro.xml
 share/foomatic/db/source/printer/Canon-LBP-350.xml
-share/foomatic/db/source/printer/Canon-LBP-4plus.xml
-share/foomatic/db/source/printer/Canon-LBP-4sx.xml
-share/foomatic/db/source/printer/Canon-LBP-4U.xml
 share/foomatic/db/source/printer/Canon-LBP-430.xml
 share/foomatic/db/source/printer/Canon-LBP-460.xml
 share/foomatic/db/source/printer/Canon-LBP-470.xml
+share/foomatic/db/source/printer/Canon-LBP-4U.xml
+share/foomatic/db/source/printer/Canon-LBP-4plus.xml
+share/foomatic/db/source/printer/Canon-LBP-4sx.xml
 share/foomatic/db/source/printer/Canon-LBP-600.xml
 share/foomatic/db/source/printer/Canon-LBP-660.xml
-share/foomatic/db/source/printer/Canon-LBP-8A1.xml
 share/foomatic/db/source/printer/Canon-LBP-800.xml
+share/foomatic/db/source/printer/Canon-LBP-8A1.xml
 share/foomatic/db/source/printer/Canon-LIPS-III.xml
 share/foomatic/db/source/printer/Canon-LIPS-IIplus.xml
-share/foomatic/db/source/printer/Canon-LIPS-IVv.xml
 share/foomatic/db/source/printer/Canon-LIPS-IV.xml
+share/foomatic/db/source/printer/Canon-LIPS-IVv.xml
 share/foomatic/db/source/printer/Canon-MultiPASS_C2500.xml
 share/foomatic/db/source/printer/Canon-MultiPASS_C3000.xml
 share/foomatic/db/source/printer/Canon-MultiPASS_C3500.xml
@@ -780,25 +816,29 @@ share/foomatic/db/source/printer/Canon-S100.xml
 share/foomatic/db/source/printer/Canon-S200.xml
 share/foomatic/db/source/printer/Canon-S300.xml
 share/foomatic/db/source/printer/Canon-S400.xml
-share/foomatic/db/source/printer/Canon-S4500.xml
 share/foomatic/db/source/printer/Canon-S450.xml
+share/foomatic/db/source/printer/Canon-S4500.xml
 share/foomatic/db/source/printer/Canon-S500.xml
 share/foomatic/db/source/printer/Canon-S600.xml
 share/foomatic/db/source/printer/Canon-S630.xml
 share/foomatic/db/source/printer/Canon-S800.xml
+share/foomatic/db/source/printer/Canon-imageRunner_330s.xml
+share/foomatic/db/source/printer/Casio-KL-E11.xml
+share/foomatic/db/source/printer/Casio-KL-P1000.xml
+share/foomatic/db/source/printer/Casio-KP-C10.xml
+share/foomatic/db/source/printer/Citizen-ProJet_II.xml
+share/foomatic/db/source/printer/Citizen-ProJet_IIc.xml
 share/foomatic/db/source/printer/Citizen-printiva1700.xml
 share/foomatic/db/source/printer/Citizen-printiva600C.xml
 share/foomatic/db/source/printer/Citizen-printiva600U.xml
 share/foomatic/db/source/printer/Citizen-printiva700.xml
-share/foomatic/db/source/printer/Citizen-ProJet_IIc.xml
-share/foomatic/db/source/printer/Citizen-ProJet_II.xml
-share/foomatic/db/source/printer/CItoh-M8510.xml
 share/foomatic/db/source/printer/Compaq-IJ1200.xml
 share/foomatic/db/source/printer/Compaq-IJ300.xml
 share/foomatic/db/source/printer/Compaq-IJ750.xml
 share/foomatic/db/source/printer/Compaq-IJ900.xml
-share/foomatic/db/source/printer/DEC-DECwriter_110i.xml
+share/foomatic/db/source/printer/DEC-1800.xml
 share/foomatic/db/source/printer/DEC-DECWriter_500i.xml
+share/foomatic/db/source/printer/DEC-DECwriter_110i.xml
 share/foomatic/db/source/printer/DEC-DECwriter_520ic.xml
 share/foomatic/db/source/printer/DEC-LA50.xml
 share/foomatic/db/source/printer/DEC-LA70.xml
@@ -808,71 +848,109 @@ share/foomatic/db/source/printer/DEC-LJ250.xml
 share/foomatic/db/source/printer/DEC-LN03.xml
 share/foomatic/db/source/printer/DEC-LN07.xml
 share/foomatic/db/source/printer/DEC-LN17.xml
-share/foomatic/db/source/printer/DEC-1800.xml
 share/foomatic/db/source/printer/Dell-M5200.xml
 share/foomatic/db/source/printer/Dell-S2500.xml
-share/foomatic/db/source/printer/Dymo-CoStar-ASCIIplus.xml
 share/foomatic/db/source/printer/Dymo-CoStar-ASCII_250.xml
+share/foomatic/db/source/printer/Dymo-CoStar-ASCIIplus.xml
 share/foomatic/db/source/printer/Dymo-CoStar-EL40.xml
 share/foomatic/db/source/printer/Dymo-CoStar-EL60.xml
 share/foomatic/db/source/printer/Dymo-CoStar-LabelWriter_II.xml
-share/foomatic/db/source/printer/Dymo-CoStar-LabelWriter_XLplus.xml
 share/foomatic/db/source/printer/Dymo-CoStar-LabelWriter_XL.xml
-share/foomatic/db/source/printer/Dymo-CoStar-SE250plus.xml
+share/foomatic/db/source/printer/Dymo-CoStar-LabelWriter_XLplus.xml
 share/foomatic/db/source/printer/Dymo-CoStar-SE250.xml
+share/foomatic/db/source/printer/Dymo-CoStar-SE250plus.xml
 share/foomatic/db/source/printer/Dymo-CoStar-Turbo.xml
-share/foomatic/db/source/printer/Epson-ActionLaser_II.xml
 share/foomatic/db/source/printer/Epson-ActionLaser_1100.xml
+share/foomatic/db/source/printer/Epson-ActionLaser_II.xml
 share/foomatic/db/source/printer/Epson-ActionPrinter_3250.xml
 share/foomatic/db/source/printer/Epson-AcuLaser_C1000.xml
-share/foomatic/db/source/printer/Epson-AcuLaser_C1900PS.xml
 share/foomatic/db/source/printer/Epson-AcuLaser_C1900.xml
-share/foomatic/db/source/printer/Epson-AcuLaser_C2000PS.xml
+share/foomatic/db/source/printer/Epson-AcuLaser_C1900PS.xml
 share/foomatic/db/source/printer/Epson-AcuLaser_C2000.xml
-share/foomatic/db/source/printer/Epson-AcuLaser_C4000PS.xml
+share/foomatic/db/source/printer/Epson-AcuLaser_C2000PS.xml
 share/foomatic/db/source/printer/Epson-AcuLaser_C4000.xml
-share/foomatic/db/source/printer/Epson-AcuLaser_C8500PS.xml
+share/foomatic/db/source/printer/Epson-AcuLaser_C4000PS.xml
+share/foomatic/db/source/printer/Epson-AcuLaser_C4100.xml
+share/foomatic/db/source/printer/Epson-AcuLaser_C4100PS.xml
 share/foomatic/db/source/printer/Epson-AcuLaser_C8500.xml
-share/foomatic/db/source/printer/Epson-AcuLaser_C8600PS.xml
+share/foomatic/db/source/printer/Epson-AcuLaser_C8500PS.xml
 share/foomatic/db/source/printer/Epson-AcuLaser_C8600.xml
+share/foomatic/db/source/printer/Epson-AcuLaser_C8600PS.xml
 share/foomatic/db/source/printer/Epson-AcuLaser_C900.xml
+share/foomatic/db/source/printer/Epson-AcuLaser_C9100.xml
 share/foomatic/db/source/printer/Epson-CL_700.xml
 share/foomatic/db/source/printer/Epson-CL_750.xml
 share/foomatic/db/source/printer/Epson-CL_760.xml
 share/foomatic/db/source/printer/Epson-Dot_Matrix.xml
-share/foomatic/db/source/printer/Epson-EM_900CN.xml
 share/foomatic/db/source/printer/Epson-EM_900C.xml
-share/foomatic/db/source/printer/Epson-EM_930CN.xml
+share/foomatic/db/source/printer/Epson-EM_900CN.xml
 share/foomatic/db/source/printer/Epson-EM_930C.xml
-share/foomatic/db/source/printer/Epson-EPL-N1600PS.xml
-share/foomatic/db/source/printer/Epson-EPL-N1600.xml
-share/foomatic/db/source/printer/Epson-EPL-N2050plus.xml
-share/foomatic/db/source/printer/Epson-EPL-N2050PSplus.xml
-share/foomatic/db/source/printer/Epson-EPL-N2050PS.xml
-share/foomatic/db/source/printer/Epson-EPL-N2050.xml
-share/foomatic/db/source/printer/Epson-EPL-N2120.xml
-share/foomatic/db/source/printer/Epson-EPL-N2750PS.xml
-share/foomatic/db/source/printer/Epson-EPL-N2750.xml
-share/foomatic/db/source/printer/Epson-EPL-5200plus.xml
+share/foomatic/db/source/printer/Epson-EM_930CN.xml
 share/foomatic/db/source/printer/Epson-EPL-5200.xml
+share/foomatic/db/source/printer/Epson-EPL-5200plus.xml
 share/foomatic/db/source/printer/Epson-EPL-5500W.xml
-share/foomatic/db/source/printer/Epson-EPL-5700L.xml
 share/foomatic/db/source/printer/Epson-EPL-5700.xml
+share/foomatic/db/source/printer/Epson-EPL-5700L.xml
+share/foomatic/db/source/printer/Epson-EPL-5800.xml
 share/foomatic/db/source/printer/Epson-EPL-5800L.xml
 share/foomatic/db/source/printer/Epson-EPL-5800PS.xml
-share/foomatic/db/source/printer/Epson-EPL-5800.xml
+share/foomatic/db/source/printer/Epson-EPL-5900.xml
 share/foomatic/db/source/printer/Epson-EPL-5900L.xml
 share/foomatic/db/source/printer/Epson-EPL-5900PS.xml
-share/foomatic/db/source/printer/Epson-EPL-5900.xml
+share/foomatic/db/source/printer/Epson-EPL-6100.xml
 share/foomatic/db/source/printer/Epson-EPL-6100L.xml
 share/foomatic/db/source/printer/Epson-EPL-6100PS.xml
-share/foomatic/db/source/printer/Epson-EPL-6100.xml
+share/foomatic/db/source/printer/Epson-EPL-6200L.xml
 share/foomatic/db/source/printer/Epson-EPL-7100.xml
-share/foomatic/db/source/printer/Epson-LP-xx00.xml
+share/foomatic/db/source/printer/Epson-EPL-N1600.xml
+share/foomatic/db/source/printer/Epson-EPL-N1600PS.xml
+share/foomatic/db/source/printer/Epson-EPL-N2050.xml
+share/foomatic/db/source/printer/Epson-EPL-N2050PS.xml
+share/foomatic/db/source/printer/Epson-EPL-N2050PSplus.xml
+share/foomatic/db/source/printer/Epson-EPL-N2050plus.xml
+share/foomatic/db/source/printer/Epson-EPL-N2120.xml
+share/foomatic/db/source/printer/Epson-EPL-N2500.xml
+share/foomatic/db/source/printer/Epson-EPL-N2500PS.xml
+share/foomatic/db/source/printer/Epson-EPL-N2750.xml
+share/foomatic/db/source/printer/Epson-EPL-N2750PS.xml
+share/foomatic/db/source/printer/Epson-L-1000.xml
+share/foomatic/db/source/printer/Epson-LP-1800.xml
+share/foomatic/db/source/printer/Epson-LP-1900.xml
 share/foomatic/db/source/printer/Epson-LP-2000.xml
+share/foomatic/db/source/printer/Epson-LP-2200.xml
+share/foomatic/db/source/printer/Epson-LP-2400.xml
+share/foomatic/db/source/printer/Epson-LP-2500.xml
 share/foomatic/db/source/printer/Epson-LP-3000.xml
-share/foomatic/db/source/printer/Epson-LP-7000G.xml
+share/foomatic/db/source/printer/Epson-LP-3000C.xml
 share/foomatic/db/source/printer/Epson-LP-7000.xml
+share/foomatic/db/source/printer/Epson-LP-7000G.xml
+share/foomatic/db/source/printer/Epson-LP-7500.xml
+share/foomatic/db/source/printer/Epson-LP-7700.xml
+share/foomatic/db/source/printer/Epson-LP-7900.xml
+share/foomatic/db/source/printer/Epson-LP-8000C.xml
+share/foomatic/db/source/printer/Epson-LP-8100.xml
+share/foomatic/db/source/printer/Epson-LP-8200C.xml
+share/foomatic/db/source/printer/Epson-LP-8300C.xml
+share/foomatic/db/source/printer/Epson-LP-8300F.xml
+share/foomatic/db/source/printer/Epson-LP-8400F.xml
+share/foomatic/db/source/printer/Epson-LP-8500C.xml
+share/foomatic/db/source/printer/Epson-LP-8600.xml
+share/foomatic/db/source/printer/Epson-LP-8600F.xml
+share/foomatic/db/source/printer/Epson-LP-8700.xml
+share/foomatic/db/source/printer/Epson-LP-8800C.xml
+share/foomatic/db/source/printer/Epson-LP-8900.xml
+share/foomatic/db/source/printer/Epson-LP-9000B.xml
+share/foomatic/db/source/printer/Epson-LP-9000C.xml
+share/foomatic/db/source/printer/Epson-LP-9100.xml
+share/foomatic/db/source/printer/Epson-LP-9200B.xml
+share/foomatic/db/source/printer/Epson-LP-9200C.xml
+share/foomatic/db/source/printer/Epson-LP-9300.xml
+share/foomatic/db/source/printer/Epson-LP-9400.xml
+share/foomatic/db/source/printer/Epson-LP-9500C.xml
+share/foomatic/db/source/printer/Epson-LP-9600.xml
+share/foomatic/db/source/printer/Epson-LP-9600S.xml
+share/foomatic/db/source/printer/Epson-LP-9800C.xml
+share/foomatic/db/source/printer/Epson-LP-xx00.xml
 share/foomatic/db/source/printer/Epson-LP_8000.xml
 share/foomatic/db/source/printer/Epson-LQ-24.xml
 share/foomatic/db/source/printer/Epson-LQ-2550.xml
@@ -880,8 +958,6 @@ share/foomatic/db/source/printer/Epson-LQ-500.xml
 share/foomatic/db/source/printer/Epson-LQ-570plus.xml
 share/foomatic/db/source/printer/Epson-LQ-850.xml
 share/foomatic/db/source/printer/Epson-LX-1050.xml
-share/foomatic/db/source/printer/Epson-L-1000.xml
-share/foomatic/db/source/printer/Epson-MachJet.xml
 share/foomatic/db/source/printer/Epson-MC_10000.xml
 share/foomatic/db/source/printer/Epson-MC_2000.xml
 share/foomatic/db/source/printer/Epson-MC_5000.xml
@@ -892,6 +968,7 @@ share/foomatic/db/source/printer/Epson-MJ_520C.xml
 share/foomatic/db/source/printer/Epson-MJ_6000C.xml
 share/foomatic/db/source/printer/Epson-MJ_8000C.xml
 share/foomatic/db/source/printer/Epson-MJ_930C.xml
+share/foomatic/db/source/printer/Epson-MachJet.xml
 share/foomatic/db/source/printer/Epson-PM_10000.xml
 share/foomatic/db/source/printer/Epson-PM_2000C.xml
 share/foomatic/db/source/printer/Epson-PM_2200C.xml
@@ -901,8 +978,8 @@ share/foomatic/db/source/printer/Epson-PM_3500C.xml
 share/foomatic/db/source/printer/Epson-PM_3700C.xml
 share/foomatic/db/source/printer/Epson-PM_4000PX.xml
 share/foomatic/db/source/printer/Epson-PM_5000C.xml
-share/foomatic/db/source/printer/Epson-PM_700C.xml
 share/foomatic/db/source/printer/Epson-PM_7000C.xml
+share/foomatic/db/source/printer/Epson-PM_700C.xml
 share/foomatic/db/source/printer/Epson-PM_730C.xml
 share/foomatic/db/source/printer/Epson-PM_740C.xml
 share/foomatic/db/source/printer/Epson-PM_750C.xml
@@ -919,22 +996,45 @@ share/foomatic/db/source/printer/Epson-PM_9000C.xml
 share/foomatic/db/source/printer/Epson-PM_930C.xml
 share/foomatic/db/source/printer/Epson-PM_950C.xml
 share/foomatic/db/source/printer/Epson-PM_970C.xml
-share/foomatic/db/source/printer/Epson-PX_V500.xml
 share/foomatic/db/source/printer/Epson-PX_7000.xml
 share/foomatic/db/source/printer/Epson-PX_9000.xml
+share/foomatic/db/source/printer/Epson-PX_V500.xml
 share/foomatic/db/source/printer/Epson-SQ_1170.xml
 share/foomatic/db/source/printer/Epson-Stylus.xml
+share/foomatic/db/source/printer/Epson-Stylus_800.xml
+share/foomatic/db/source/printer/Epson-Stylus_C20SX.xml
+share/foomatic/db/source/printer/Epson-Stylus_C20UX.xml
+share/foomatic/db/source/printer/Epson-Stylus_C40SX.xml
+share/foomatic/db/source/printer/Epson-Stylus_C40UX.xml
+share/foomatic/db/source/printer/Epson-Stylus_C41SX.xml
+share/foomatic/db/source/printer/Epson-Stylus_C41UX.xml
+share/foomatic/db/source/printer/Epson-Stylus_C42SX.xml
+share/foomatic/db/source/printer/Epson-Stylus_C42UX.xml
+share/foomatic/db/source/printer/Epson-Stylus_C44UX.xml
+share/foomatic/db/source/printer/Epson-Stylus_C46.xml
+share/foomatic/db/source/printer/Epson-Stylus_C50.xml
+share/foomatic/db/source/printer/Epson-Stylus_C60.xml
+share/foomatic/db/source/printer/Epson-Stylus_C61.xml
+share/foomatic/db/source/printer/Epson-Stylus_C62.xml
+share/foomatic/db/source/printer/Epson-Stylus_C63.xml
+share/foomatic/db/source/printer/Epson-Stylus_C64.xml
+share/foomatic/db/source/printer/Epson-Stylus_C70.xml
+share/foomatic/db/source/printer/Epson-Stylus_C80.xml
+share/foomatic/db/source/printer/Epson-Stylus_C82.xml
+share/foomatic/db/source/printer/Epson-Stylus_C83.xml
+share/foomatic/db/source/printer/Epson-Stylus_C84.xml
+share/foomatic/db/source/printer/Epson-Stylus_C86.xml
+share/foomatic/db/source/printer/Epson-Stylus_CX3200.xml
+share/foomatic/db/source/printer/Epson-Stylus_CX5200.xml
+share/foomatic/db/source/printer/Epson-Stylus_CX5400.xml
+share/foomatic/db/source/printer/Epson-Stylus_CX6400.xml
 share/foomatic/db/source/printer/Epson-Stylus_Color.xml
-share/foomatic/db/source/printer/Epson-Stylus_Color_IIs.xml
-share/foomatic/db/source/printer/Epson-Stylus_Color_II.xml
-share/foomatic/db/source/printer/Epson-Stylus_Color_I.xml
-share/foomatic/db/source/printer/Epson-Stylus_Color_PRO.xml
 share/foomatic/db/source/printer/Epson-Stylus_Color_1160.xml
 share/foomatic/db/source/printer/Epson-Stylus_Color_1500.xml
 share/foomatic/db/source/printer/Epson-Stylus_Color_1520.xml
 share/foomatic/db/source/printer/Epson-Stylus_Color_200.xml
-share/foomatic/db/source/printer/Epson-Stylus_Color_3000.xml
 share/foomatic/db/source/printer/Epson-Stylus_Color_300.xml
+share/foomatic/db/source/printer/Epson-Stylus_Color_3000.xml
 share/foomatic/db/source/printer/Epson-Stylus_Color_400.xml
 share/foomatic/db/source/printer/Epson-Stylus_Color_440.xml
 share/foomatic/db/source/printer/Epson-Stylus_Color_460.xml
@@ -956,39 +1056,16 @@ share/foomatic/db/source/printer/Epson-Stylus_Color_880.xml
 share/foomatic/db/source/printer/Epson-Stylus_Color_8_3.xml
 share/foomatic/db/source/printer/Epson-Stylus_Color_900.xml
 share/foomatic/db/source/printer/Epson-Stylus_Color_980.xml
-share/foomatic/db/source/printer/Epson-Stylus_CX3200.xml
-share/foomatic/db/source/printer/Epson-Stylus_CX5200.xml
-share/foomatic/db/source/printer/Epson-Stylus_CX5400.xml
-share/foomatic/db/source/printer/Epson-Stylus_CX6400.xml
-share/foomatic/db/source/printer/Epson-Stylus_C20SX.xml
-share/foomatic/db/source/printer/Epson-Stylus_C20UX.xml
-share/foomatic/db/source/printer/Epson-Stylus_C40SX.xml
-share/foomatic/db/source/printer/Epson-Stylus_C40UX.xml
-share/foomatic/db/source/printer/Epson-Stylus_C41SX.xml
-share/foomatic/db/source/printer/Epson-Stylus_C41UX.xml
-share/foomatic/db/source/printer/Epson-Stylus_C42SX.xml
-share/foomatic/db/source/printer/Epson-Stylus_C42UX.xml
-share/foomatic/db/source/printer/Epson-Stylus_C50.xml
-share/foomatic/db/source/printer/Epson-Stylus_C60.xml
-share/foomatic/db/source/printer/Epson-Stylus_C61.xml
-share/foomatic/db/source/printer/Epson-Stylus_C62.xml
-share/foomatic/db/source/printer/Epson-Stylus_C63.xml
-share/foomatic/db/source/printer/Epson-Stylus_C64.xml
-share/foomatic/db/source/printer/Epson-Stylus_C70.xml
-share/foomatic/db/source/printer/Epson-Stylus_C80.xml
-share/foomatic/db/source/printer/Epson-Stylus_C82.xml
-share/foomatic/db/source/printer/Epson-Stylus_C83.xml
-share/foomatic/db/source/printer/Epson-Stylus_C84.xml
+share/foomatic/db/source/printer/Epson-Stylus_Color_I.xml
+share/foomatic/db/source/printer/Epson-Stylus_Color_II.xml
+share/foomatic/db/source/printer/Epson-Stylus_Color_IIs.xml
+share/foomatic/db/source/printer/Epson-Stylus_Color_PRO.xml
 share/foomatic/db/source/printer/Epson-Stylus_Photo.xml
-share/foomatic/db/source/printer/Epson-Stylus_Photo_EX3.xml
-share/foomatic/db/source/printer/Epson-Stylus_Photo_EX.xml
-share/foomatic/db/source/printer/Epson-Stylus_Photo_RX500.xml
-share/foomatic/db/source/printer/Epson-Stylus_Photo_R300.xml
 share/foomatic/db/source/printer/Epson-Stylus_Photo_1200.xml
 share/foomatic/db/source/printer/Epson-Stylus_Photo_1270.xml
 share/foomatic/db/source/printer/Epson-Stylus_Photo_1280.xml
-share/foomatic/db/source/printer/Epson-Stylus_Photo_1290S.xml
 share/foomatic/db/source/printer/Epson-Stylus_Photo_1290.xml
+share/foomatic/db/source/printer/Epson-Stylus_Photo_1290S.xml
 share/foomatic/db/source/printer/Epson-Stylus_Photo_2000P.xml
 share/foomatic/db/source/printer/Epson-Stylus_Photo_2100.xml
 share/foomatic/db/source/printer/Epson-Stylus_Photo_2200.xml
@@ -1011,7 +1088,13 @@ share/foomatic/db/source/printer/Epson-Stylus_Photo_915.xml
 share/foomatic/db/source/printer/Epson-Stylus_Photo_925.xml
 share/foomatic/db/source/printer/Epson-Stylus_Photo_950.xml
 share/foomatic/db/source/printer/Epson-Stylus_Photo_960.xml
-share/foomatic/db/source/printer/Epson-Stylus_Pro_XL.xml
+share/foomatic/db/source/printer/Epson-Stylus_Photo_EX.xml
+share/foomatic/db/source/printer/Epson-Stylus_Photo_EX3.xml
+share/foomatic/db/source/printer/Epson-Stylus_Photo_R200.xml
+share/foomatic/db/source/printer/Epson-Stylus_Photo_R300.xml
+share/foomatic/db/source/printer/Epson-Stylus_Photo_R800.xml
+share/foomatic/db/source/printer/Epson-Stylus_Photo_RX500.xml
+share/foomatic/db/source/printer/Epson-Stylus_Photo_RX600.xml
 share/foomatic/db/source/printer/Epson-Stylus_Pro_10000.xml
 share/foomatic/db/source/printer/Epson-Stylus_Pro_5000.xml
 share/foomatic/db/source/printer/Epson-Stylus_Pro_5500.xml
@@ -1021,79 +1104,138 @@ share/foomatic/db/source/printer/Epson-Stylus_Pro_7600.xml
 share/foomatic/db/source/printer/Epson-Stylus_Pro_9000.xml
 share/foomatic/db/source/printer/Epson-Stylus_Pro_9500.xml
 share/foomatic/db/source/printer/Epson-Stylus_Pro_9600.xml
+share/foomatic/db/source/printer/Epson-Stylus_Pro_XL.xml
 share/foomatic/db/source/printer/Epson-Stylus_Scan_2000.xml
 share/foomatic/db/source/printer/Epson-Stylus_Scan_2500.xml
-share/foomatic/db/source/printer/Epson-Stylus_800.xml
+share/foomatic/db/source/printer/Fujitsu-1200.xml
+share/foomatic/db/source/printer/Fujitsu-2400.xml
+share/foomatic/db/source/printer/Fujitsu-3400.xml
 share/foomatic/db/source/printer/Fujitsu-FMLBP2xx_Page_Printer.xml
 share/foomatic/db/source/printer/Fujitsu-FMPR.xml
 share/foomatic/db/source/printer/Fujitsu-PrintPartner_10V.xml
 share/foomatic/db/source/printer/Fujitsu-PrintPartner_16DV.xml
 share/foomatic/db/source/printer/Fujitsu-PrintPartner_20W.xml
 share/foomatic/db/source/printer/Fujitsu-PrintPartner_8000.xml
-share/foomatic/db/source/printer/Fujitsu-1200.xml
-share/foomatic/db/source/printer/Fujitsu-2400.xml
-share/foomatic/db/source/printer/Fujitsu-3400.xml
 share/foomatic/db/source/printer/Generic-ESC_P_Dot_Matrix_Printer.xml
 share/foomatic/db/source/printer/Generic-GDI_Printer.xml
 share/foomatic/db/source/printer/Generic-IBM-Compatible_Dot_Matrix_Printer.xml
 share/foomatic/db/source/printer/Generic-OAKT_Printer.xml
 share/foomatic/db/source/printer/Generic-PCL_3_Printer.xml
 share/foomatic/db/source/printer/Generic-PCL_4_Printer.xml
+share/foomatic/db/source/printer/Generic-PCL_5_Printer.xml
 share/foomatic/db/source/printer/Generic-PCL_5c_Printer.xml
 share/foomatic/db/source/printer/Generic-PCL_5e_Printer.xml
-share/foomatic/db/source/printer/Generic-PCL_5_Printer.xml
 share/foomatic/db/source/printer/Generic-PCL_6_PCL_XL_Printer.xml
 share/foomatic/db/source/printer/Generic-PostScript_Printer.xml
 share/foomatic/db/source/printer/Generic-ZjStream_Printer.xml
-share/foomatic/db/source/printer/Heidelberg-Digimaster_9110.xml
-share/foomatic/db/source/printer/Hitachi-DDP_70_with_MicroPress.xml
+share/foomatic/db/source/printer/Gestetner-10512_PS.xml
+share/foomatic/db/source/printer/Gestetner-2212_PS.xml
+share/foomatic/db/source/printer/Gestetner-2712_PS.xml
+share/foomatic/db/source/printer/Gestetner-3212_PS.xml
+share/foomatic/db/source/printer/Gestetner-3502_PS.xml
+share/foomatic/db/source/printer/Gestetner-3532_4235g_PS.xml
+share/foomatic/db/source/printer/Gestetner-4502_PS.xml
+share/foomatic/db/source/printer/Gestetner-4532_4245g_PS.xml
+share/foomatic/db/source/printer/Gestetner-6002_PS.xml
+share/foomatic/db/source/printer/Gestetner-7502_PS.xml
+share/foomatic/db/source/printer/Gestetner-9002_PS.xml
+share/foomatic/db/source/printer/Gestetner-C7010_PS.xml
+share/foomatic/db/source/printer/Gestetner-C7116_PS.xml
+share/foomatic/db/source/printer/Gestetner-C7416_PS.xml
+share/foomatic/db/source/printer/Gestetner-C7417_PS.xml
+share/foomatic/db/source/printer/Gestetner-C7425dn_PS.xml
+share/foomatic/db/source/printer/Gestetner-C7435n_PS.xml
+share/foomatic/db/source/printer/Gestetner-DSc224_PS.xml
+share/foomatic/db/source/printer/Gestetner-DSc232_PS.xml
+share/foomatic/db/source/printer/Gestetner-DSc328_PS.xml
+share/foomatic/db/source/printer/Gestetner-DSc332_PS.xml
+share/foomatic/db/source/printer/Gestetner-DSc338_PS.xml
+share/foomatic/db/source/printer/Gestetner-DSc38_PS.xml
+share/foomatic/db/source/printer/Gestetner-DSc38u_PS.xml
+share/foomatic/db/source/printer/Gestetner-DSc524_PS.xml
+share/foomatic/db/source/printer/Gestetner-DSc532_PS.xml
+share/foomatic/db/source/printer/Gestetner-DSm615_PS.xml
+share/foomatic/db/source/printer/Gestetner-DSm618_PS.xml
+share/foomatic/db/source/printer/Gestetner-DSm618d_PS.xml
+share/foomatic/db/source/printer/Gestetner-DSm622_PS.xml
+share/foomatic/db/source/printer/Gestetner-DSm627_PS.xml
+share/foomatic/db/source/printer/Gestetner-DSm635_635G_PS.xml
+share/foomatic/db/source/printer/Gestetner-DSm645_645G_PS.xml
+share/foomatic/db/source/printer/Gestetner-DSm651_PS.xml
+share/foomatic/db/source/printer/Gestetner-DSm660_PS.xml
+share/foomatic/db/source/printer/Gestetner-DSm675_PS.xml
+share/foomatic/db/source/printer/Gestetner-F9199_9199nf_PS.xml
+share/foomatic/db/source/printer/Gestetner-P7026_PS.xml
+share/foomatic/db/source/printer/Gestetner-P7026n_PS.xml
+share/foomatic/db/source/printer/Gestetner-P7032_PS.xml
+share/foomatic/db/source/printer/Gestetner-P7126_PS.xml
+share/foomatic/db/source/printer/Gestetner-P7126n_PS.xml
+share/foomatic/db/source/printer/Gestetner-P7132n_PS.xml
+share/foomatic/db/source/printer/Gestetner-P7145_PS.xml
+share/foomatic/db/source/printer/Gestetner-P7325_PS.xml
+share/foomatic/db/source/printer/Gestetner-P7325n_PS.xml
+share/foomatic/db/source/printer/Gestetner-P7431cn_PS.xml
+share/foomatic/db/source/printer/HP-2000C.xml
+share/foomatic/db/source/printer/HP-2500C.xml
+share/foomatic/db/source/printer/HP-2500CM.xml
+share/foomatic/db/source/printer/HP-2563.xml
 share/foomatic/db/source/printer/HP-Business_Inkjet_1100.xml
+share/foomatic/db/source/printer/HP-Business_Inkjet_1200.xml
 share/foomatic/db/source/printer/HP-Business_Inkjet_2200.xml
 share/foomatic/db/source/printer/HP-Business_Inkjet_2230.xml
-share/foomatic/db/source/printer/HP-Business_Inkjet_2250TN.xml
 share/foomatic/db/source/printer/HP-Business_Inkjet_2250.xml
+share/foomatic/db/source/printer/HP-Business_Inkjet_2250TN.xml
 share/foomatic/db/source/printer/HP-Business_Inkjet_2280.xml
+share/foomatic/db/source/printer/HP-Business_Inkjet_2300.xml
 share/foomatic/db/source/printer/HP-Business_Inkjet_2600.xml
+share/foomatic/db/source/printer/HP-Business_Inkjet_2800.xml
 share/foomatic/db/source/printer/HP-Business_Inkjet_3000.xml
 share/foomatic/db/source/printer/HP-Color_Inkjet_Printer_CP1160.xml
 share/foomatic/db/source/printer/HP-Color_Inkjet_Printer_CP1700.xml
 share/foomatic/db/source/printer/HP-Color_LaserJet_1500.xml
 share/foomatic/db/source/printer/HP-Color_LaserJet_2500.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_2550.xml
 share/foomatic/db/source/printer/HP-Color_LaserJet_3500.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_3550.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_3700.xml
 share/foomatic/db/source/printer/HP-Color_LaserJet_4500.xml
 share/foomatic/db/source/printer/HP-Color_LaserJet_4550.xml
 share/foomatic/db/source/printer/HP-Color_LaserJet_4600.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_4650.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_5.xml
 share/foomatic/db/source/printer/HP-Color_LaserJet_5000.xml
 share/foomatic/db/source/printer/HP-Color_LaserJet_5500.xml
-share/foomatic/db/source/printer/HP-Color_LaserJet_5.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_5550.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_5M.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_8500.xml
 share/foomatic/db/source/printer/HP-Color_LaserJet_8550GN.xml
-share/foomatic/db/source/printer/HP-DesignJet_ColorPro_CAD.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_9500.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_9500_MFP.xml
 share/foomatic/db/source/printer/HP-DesignJet_230.xml
-share/foomatic/db/source/printer/HP-DesignJet_250C.xml
 share/foomatic/db/source/printer/HP-DesignJet_2500CP.xml
-share/foomatic/db/source/printer/HP-DesignJet_350C.xml
+share/foomatic/db/source/printer/HP-DesignJet_250C.xml
 share/foomatic/db/source/printer/HP-DesignJet_3500CP.xml
+share/foomatic/db/source/printer/HP-DesignJet_350C.xml
 share/foomatic/db/source/printer/HP-DesignJet_430.xml
 share/foomatic/db/source/printer/HP-DesignJet_450C.xml
 share/foomatic/db/source/printer/HP-DesignJet_455CA.xml
 share/foomatic/db/source/printer/HP-DesignJet_488CA.xml
-share/foomatic/db/source/printer/HP-DesignJet_5500ps.xml
 share/foomatic/db/source/printer/HP-DesignJet_5500.xml
+share/foomatic/db/source/printer/HP-DesignJet_5500ps.xml
 share/foomatic/db/source/printer/HP-DesignJet_650C.xml
 share/foomatic/db/source/printer/HP-DesignJet_700.xml
-share/foomatic/db/source/printer/HP-DesignJet_750C_Plus.xml
 share/foomatic/db/source/printer/HP-DesignJet_750.xml
+share/foomatic/db/source/printer/HP-DesignJet_750C_Plus.xml
+share/foomatic/db/source/printer/HP-DesignJet_ColorPro_CAD.xml
 share/foomatic/db/source/printer/HP-DeskJet.xml
-share/foomatic/db/source/printer/HP-DeskJet_Plus.xml
-share/foomatic/db/source/printer/HP-DeskJet_Portable.xml
 share/foomatic/db/source/printer/HP-DeskJet_1000C.xml
 share/foomatic/db/source/printer/HP-DeskJet_1100C.xml
 share/foomatic/db/source/printer/HP-DeskJet_1120C.xml
 share/foomatic/db/source/printer/HP-DeskJet_1125C.xml
 share/foomatic/db/source/printer/HP-DeskJet_1200C.xml
 share/foomatic/db/source/printer/HP-DeskJet_1220C.xml
-share/foomatic/db/source/printer/HP-DeskJet_1600CM.xml
 share/foomatic/db/source/printer/HP-DeskJet_1600C.xml
+share/foomatic/db/source/printer/HP-DeskJet_1600CM.xml
 share/foomatic/db/source/printer/HP-DeskJet_200.xml
 share/foomatic/db/source/printer/HP-DeskJet_310.xml
 share/foomatic/db/source/printer/HP-DeskJet_320.xml
@@ -1105,20 +1247,24 @@ share/foomatic/db/source/printer/HP-DeskJet_3425.xml
 share/foomatic/db/source/printer/HP-DeskJet_350C.xml
 share/foomatic/db/source/printer/HP-DeskJet_3520.xml
 share/foomatic/db/source/printer/HP-DeskJet_3528.xml
+share/foomatic/db/source/printer/HP-DeskJet_3535.xml
 share/foomatic/db/source/printer/HP-DeskJet_3550.xml
 share/foomatic/db/source/printer/HP-DeskJet_3558.xml
 share/foomatic/db/source/printer/HP-DeskJet_3650.xml
 share/foomatic/db/source/printer/HP-DeskJet_3658.xml
 share/foomatic/db/source/printer/HP-DeskJet_3668.xml
+share/foomatic/db/source/printer/HP-DeskJet_3740.xml
 share/foomatic/db/source/printer/HP-DeskJet_3810.xml
 share/foomatic/db/source/printer/HP-DeskJet_3816.xml
 share/foomatic/db/source/printer/HP-DeskJet_3820.xml
 share/foomatic/db/source/printer/HP-DeskJet_3822.xml
+share/foomatic/db/source/printer/HP-DeskJet_3840.xml
+share/foomatic/db/source/printer/HP-DeskJet_3845.xml
 share/foomatic/db/source/printer/HP-DeskJet_400.xml
 share/foomatic/db/source/printer/HP-DeskJet_420C.xml
 share/foomatic/db/source/printer/HP-DeskJet_450.xml
-share/foomatic/db/source/printer/HP-DeskJet_500C.xml
 share/foomatic/db/source/printer/HP-DeskJet_500.xml
+share/foomatic/db/source/printer/HP-DeskJet_500C.xml
 share/foomatic/db/source/printer/HP-DeskJet_505J_Plus.xml
 share/foomatic/db/source/printer/HP-DeskJet_510.xml
 share/foomatic/db/source/printer/HP-DeskJet_5150.xml
@@ -1133,24 +1279,30 @@ share/foomatic/db/source/printer/HP-DeskJet_560C.xml
 share/foomatic/db/source/printer/HP-DeskJet_5650.xml
 share/foomatic/db/source/printer/HP-DeskJet_5652.xml
 share/foomatic/db/source/printer/HP-DeskJet_5670.xml
+share/foomatic/db/source/printer/HP-DeskJet_5740.xml
 share/foomatic/db/source/printer/HP-DeskJet_5850.xml
 share/foomatic/db/source/printer/HP-DeskJet_600.xml
-share/foomatic/db/source/printer/HP-DeskJet_610CL.xml
 share/foomatic/db/source/printer/HP-DeskJet_610C.xml
-share/foomatic/db/source/printer/HP-DeskJet_612C.xml
+share/foomatic/db/source/printer/HP-DeskJet_610CL.xml
 share/foomatic/db/source/printer/HP-DeskJet_6122.xml
 share/foomatic/db/source/printer/HP-DeskJet_6127.xml
+share/foomatic/db/source/printer/HP-DeskJet_612C.xml
 share/foomatic/db/source/printer/HP-DeskJet_630C.xml
 share/foomatic/db/source/printer/HP-DeskJet_632C.xml
 share/foomatic/db/source/printer/HP-DeskJet_640C.xml
 share/foomatic/db/source/printer/HP-DeskJet_648C.xml
+share/foomatic/db/source/printer/HP-DeskJet_6520.xml
+share/foomatic/db/source/printer/HP-DeskJet_6540.xml
 share/foomatic/db/source/printer/HP-DeskJet_656C.xml
+share/foomatic/db/source/printer/HP-DeskJet_6600.xml
 share/foomatic/db/source/printer/HP-DeskJet_660C.xml
 share/foomatic/db/source/printer/HP-DeskJet_670C.xml
 share/foomatic/db/source/printer/HP-DeskJet_670TV.xml
 share/foomatic/db/source/printer/HP-DeskJet_672C.xml
+share/foomatic/db/source/printer/HP-DeskJet_6800.xml
 share/foomatic/db/source/printer/HP-DeskJet_680C.xml
 share/foomatic/db/source/printer/HP-DeskJet_682C.xml
+share/foomatic/db/source/printer/HP-DeskJet_6840.xml
 share/foomatic/db/source/printer/HP-DeskJet_690C.xml
 share/foomatic/db/source/printer/HP-DeskJet_692C.xml
 share/foomatic/db/source/printer/HP-DeskJet_693C.xml
@@ -1183,8 +1335,8 @@ share/foomatic/db/source/printer/HP-DeskJet_890C.xml
 share/foomatic/db/source/printer/HP-DeskJet_895C.xml
 share/foomatic/db/source/printer/HP-DeskJet_916C.xml
 share/foomatic/db/source/printer/HP-DeskJet_920C.xml
-share/foomatic/db/source/printer/HP-DeskJet_930C.xml
 share/foomatic/db/source/printer/HP-DeskJet_9300.xml
+share/foomatic/db/source/printer/HP-DeskJet_930C.xml
 share/foomatic/db/source/printer/HP-DeskJet_932C.xml
 share/foomatic/db/source/printer/HP-DeskJet_933C.xml
 share/foomatic/db/source/printer/HP-DeskJet_934C.xml
@@ -1196,107 +1348,102 @@ share/foomatic/db/source/printer/HP-DeskJet_952C.xml
 share/foomatic/db/source/printer/HP-DeskJet_955C.xml
 share/foomatic/db/source/printer/HP-DeskJet_957C.xml
 share/foomatic/db/source/printer/HP-DeskJet_959C.xml
-share/foomatic/db/source/printer/HP-DeskJet_960C.xml
 share/foomatic/db/source/printer/HP-DeskJet_9600.xml
+share/foomatic/db/source/printer/HP-DeskJet_960C.xml
 share/foomatic/db/source/printer/HP-DeskJet_970C.xml
 share/foomatic/db/source/printer/HP-DeskJet_975C.xml
 share/foomatic/db/source/printer/HP-DeskJet_980C.xml
 share/foomatic/db/source/printer/HP-DeskJet_990C.xml
 share/foomatic/db/source/printer/HP-DeskJet_995C.xml
-share/foomatic/db/source/printer/HP-e-printer_e20.xml
+share/foomatic/db/source/printer/HP-DeskJet_Plus.xml
+share/foomatic/db/source/printer/HP-DeskJet_Portable.xml
 share/foomatic/db/source/printer/HP-LaserJet.xml
-share/foomatic/db/source/printer/HP-LaserJet_Plus.xml
 share/foomatic/db/source/printer/HP-LaserJet_1000.xml
 share/foomatic/db/source/printer/HP-LaserJet_1005.xml
 share/foomatic/db/source/printer/HP-LaserJet_1010.xml
 share/foomatic/db/source/printer/HP-LaserJet_1012.xml
 share/foomatic/db/source/printer/HP-LaserJet_1015.xml
-share/foomatic/db/source/printer/HP-LaserJet_1100A.xml
 share/foomatic/db/source/printer/HP-LaserJet_1100.xml
+share/foomatic/db/source/printer/HP-LaserJet_1100A.xml
 share/foomatic/db/source/printer/HP-LaserJet_1150.xml
+share/foomatic/db/source/printer/HP-LaserJet_1160.xml
 share/foomatic/db/source/printer/HP-LaserJet_1200.xml
 share/foomatic/db/source/printer/HP-LaserJet_1220.xml
 share/foomatic/db/source/printer/HP-LaserJet_1300.xml
-share/foomatic/db/source/printer/HP-LaserJet_2D.xml
-share/foomatic/db/source/printer/HP-LaserJet_2P.xml
-share/foomatic/db/source/printer/HP-LaserJet_2P_Plus.xml
-share/foomatic/db/source/printer/HP-LaserJet_2100M.xml
+share/foomatic/db/source/printer/HP-LaserJet_1320.xml
+share/foomatic/db/source/printer/HP-LaserJet_2.xml
 share/foomatic/db/source/printer/HP-LaserJet_2100.xml
+share/foomatic/db/source/printer/HP-LaserJet_2100M.xml
 share/foomatic/db/source/printer/HP-LaserJet_2200.xml
 share/foomatic/db/source/printer/HP-LaserJet_2300.xml
-share/foomatic/db/source/printer/HP-LaserJet_2.xml
+share/foomatic/db/source/printer/HP-LaserJet_2410.xml
+share/foomatic/db/source/printer/HP-LaserJet_2420.xml
+share/foomatic/db/source/printer/HP-LaserJet_2430.xml
+share/foomatic/db/source/printer/HP-LaserJet_2D.xml
+share/foomatic/db/source/printer/HP-LaserJet_2P.xml
+share/foomatic/db/source/printer/HP-LaserJet_2P_Plus.xml
 share/foomatic/db/source/printer/HP-LaserJet_2_w_PS.xml
-share/foomatic/db/source/printer/HP-LaserJet_3D.xml
-share/foomatic/db/source/printer/HP-LaserJet_3P_w_PCL5.xml
-share/foomatic/db/source/printer/HP-LaserJet_3P_w_PS.xml
+share/foomatic/db/source/printer/HP-LaserJet_3.xml
+share/foomatic/db/source/printer/HP-LaserJet_3015.xml
+share/foomatic/db/source/printer/HP-LaserJet_3020.xml
+share/foomatic/db/source/printer/HP-LaserJet_3030.xml
 share/foomatic/db/source/printer/HP-LaserJet_3100.xml
 share/foomatic/db/source/printer/HP-LaserJet_3150.xml
+share/foomatic/db/source/printer/HP-LaserJet_3200.xml
 share/foomatic/db/source/printer/HP-LaserJet_3200m.xml
 share/foomatic/db/source/printer/HP-LaserJet_3200se.xml
-share/foomatic/db/source/printer/HP-LaserJet_3200.xml
 share/foomatic/db/source/printer/HP-LaserJet_3300_MFP.xml
 share/foomatic/db/source/printer/HP-LaserJet_3310_MFP.xml
 share/foomatic/db/source/printer/HP-LaserJet_3320N_MFP.xml
 share/foomatic/db/source/printer/HP-LaserJet_3320_MFP.xml
 share/foomatic/db/source/printer/HP-LaserJet_3330_MFP.xml
-share/foomatic/db/source/printer/HP-LaserJet_3.xml
+share/foomatic/db/source/printer/HP-LaserJet_3380.xml
+share/foomatic/db/source/printer/HP-LaserJet_3D.xml
+share/foomatic/db/source/printer/HP-LaserJet_3P_w_PCL5.xml
+share/foomatic/db/source/printer/HP-LaserJet_3P_w_PS.xml
+share/foomatic/db/source/printer/HP-LaserJet_4.xml
+share/foomatic/db/source/printer/HP-LaserJet_4000.xml
+share/foomatic/db/source/printer/HP-LaserJet_4050.xml
+share/foomatic/db/source/printer/HP-LaserJet_4100.xml
+share/foomatic/db/source/printer/HP-LaserJet_4200.xml
+share/foomatic/db/source/printer/HP-LaserJet_4250.xml
+share/foomatic/db/source/printer/HP-LaserJet_4300.xml
+share/foomatic/db/source/printer/HP-LaserJet_4345_MFP.xml
+share/foomatic/db/source/printer/HP-LaserJet_4350.xml
 share/foomatic/db/source/printer/HP-LaserJet_4L.xml
-share/foomatic/db/source/printer/HP-LaserJet_4ML.xml
 share/foomatic/db/source/printer/HP-LaserJet_4M.xml
+share/foomatic/db/source/printer/HP-LaserJet_4ML.xml
 share/foomatic/db/source/printer/HP-LaserJet_4P.xml
 share/foomatic/db/source/printer/HP-LaserJet_4Si.xml
 share/foomatic/db/source/printer/HP-LaserJet_4V.xml
 share/foomatic/db/source/printer/HP-LaserJet_4V_4LJ_Pro.xml
-share/foomatic/db/source/printer/HP-LaserJet_4000.xml
-share/foomatic/db/source/printer/HP-LaserJet_4050.xml
-share/foomatic/db/source/printer/HP-LaserJet_4100.xml
-share/foomatic/db/source/printer/HP-LaserJet_4200.xml
-share/foomatic/db/source/printer/HP-LaserJet_4300.xml
-share/foomatic/db/source/printer/HP-LaserJet_4.xml
 share/foomatic/db/source/printer/HP-LaserJet_4_Plus.xml
+share/foomatic/db/source/printer/HP-LaserJet_5.xml
+share/foomatic/db/source/printer/HP-LaserJet_5000.xml
+share/foomatic/db/source/printer/HP-LaserJet_5100.xml
 share/foomatic/db/source/printer/HP-LaserJet_5L.xml
-share/foomatic/db/source/printer/HP-LaserJet_5MP.xml
 share/foomatic/db/source/printer/HP-LaserJet_5M.xml
+share/foomatic/db/source/printer/HP-LaserJet_5MP.xml
 share/foomatic/db/source/printer/HP-LaserJet_5P.xml
 share/foomatic/db/source/printer/HP-LaserJet_5Si.xml
-share/foomatic/db/source/printer/HP-LaserJet_5000.xml
-share/foomatic/db/source/printer/HP-LaserJet_5100.xml
-share/foomatic/db/source/printer/HP-LaserJet_5.xml
+share/foomatic/db/source/printer/HP-LaserJet_6.xml
 share/foomatic/db/source/printer/HP-LaserJet_6L.xml
 share/foomatic/db/source/printer/HP-LaserJet_6MP.xml
 share/foomatic/db/source/printer/HP-LaserJet_6P.xml
-share/foomatic/db/source/printer/HP-LaserJet_6.xml
 share/foomatic/db/source/printer/HP-LaserJet_8000.xml
 share/foomatic/db/source/printer/HP-LaserJet_8100.xml
 share/foomatic/db/source/printer/HP-LaserJet_8150.xml
 share/foomatic/db/source/printer/HP-LaserJet_9000.xml
+share/foomatic/db/source/printer/HP-LaserJet_9000_MFP.xml
+share/foomatic/db/source/printer/HP-LaserJet_9040_MFP.xml
+share/foomatic/db/source/printer/HP-LaserJet_9050.xml
+share/foomatic/db/source/printer/HP-LaserJet_9050_MFP.xml
+share/foomatic/db/source/printer/HP-LaserJet_9055_MFP.xml
+share/foomatic/db/source/printer/HP-LaserJet_9065_MFP.xml
+share/foomatic/db/source/printer/HP-LaserJet_Plus.xml
 share/foomatic/db/source/printer/HP-Mopier_240.xml
 share/foomatic/db/source/printer/HP-Mopier_320.xml
 share/foomatic/db/source/printer/HP-OfficeJet.xml
-share/foomatic/db/source/printer/HP-OfficeJet_D125.xml
-share/foomatic/db/source/printer/HP-OfficeJet_D135.xml
-share/foomatic/db/source/printer/HP-OfficeJet_D145.xml
-share/foomatic/db/source/printer/HP-OfficeJet_D155.xml
-share/foomatic/db/source/printer/HP-OfficeJet_G55.xml
-share/foomatic/db/source/printer/HP-OfficeJet_G85.xml
-share/foomatic/db/source/printer/HP-OfficeJet_G95.xml
-share/foomatic/db/source/printer/HP-OfficeJet_K60xi.xml
-share/foomatic/db/source/printer/HP-OfficeJet_K60.xml
-share/foomatic/db/source/printer/HP-OfficeJet_K80xi.xml
-share/foomatic/db/source/printer/HP-OfficeJet_K80.xml
-share/foomatic/db/source/printer/HP-OfficeJet_LX.xml
-share/foomatic/db/source/printer/HP-OfficeJet_Pro_1150C.xml
-share/foomatic/db/source/printer/HP-OfficeJet_Pro_1170C.xml
-share/foomatic/db/source/printer/HP-OfficeJet_Pro_1175C.xml
-share/foomatic/db/source/printer/HP-OfficeJet_R40.xml
-share/foomatic/db/source/printer/HP-OfficeJet_R45.xml
-share/foomatic/db/source/printer/HP-OfficeJet_R60.xml
-share/foomatic/db/source/printer/HP-OfficeJet_R65.xml
-share/foomatic/db/source/printer/HP-OfficeJet_R80.xml
-share/foomatic/db/source/printer/HP-OfficeJet_T45.xml
-share/foomatic/db/source/printer/HP-OfficeJet_T65.xml
-share/foomatic/db/source/printer/HP-OfficeJet_V40xi.xml
-share/foomatic/db/source/printer/HP-OfficeJet_V40.xml
 share/foomatic/db/source/printer/HP-OfficeJet_300.xml
 share/foomatic/db/source/printer/HP-OfficeJet_330.xml
 share/foomatic/db/source/printer/HP-OfficeJet_350.xml
@@ -1304,118 +1451,207 @@ share/foomatic/db/source/printer/HP-OfficeJet_4100.xml
 share/foomatic/db/source/printer/HP-OfficeJet_4105.xml
 share/foomatic/db/source/printer/HP-OfficeJet_4110.xml
 share/foomatic/db/source/printer/HP-OfficeJet_4115.xml
+share/foomatic/db/source/printer/HP-OfficeJet_4200.xml
 share/foomatic/db/source/printer/HP-OfficeJet_500.xml
 share/foomatic/db/source/printer/HP-OfficeJet_5105.xml
-share/foomatic/db/source/printer/HP-OfficeJet_5110xi.xml
 share/foomatic/db/source/printer/HP-OfficeJet_5110.xml
+share/foomatic/db/source/printer/HP-OfficeJet_5110xi.xml
 share/foomatic/db/source/printer/HP-OfficeJet_520.xml
 share/foomatic/db/source/printer/HP-OfficeJet_5500.xml
 share/foomatic/db/source/printer/HP-OfficeJet_570.xml
 share/foomatic/db/source/printer/HP-OfficeJet_580.xml
 share/foomatic/db/source/printer/HP-OfficeJet_590.xml
 share/foomatic/db/source/printer/HP-OfficeJet_600.xml
+share/foomatic/db/source/printer/HP-OfficeJet_610.xml
 share/foomatic/db/source/printer/HP-OfficeJet_6100.xml
 share/foomatic/db/source/printer/HP-OfficeJet_6105.xml
-share/foomatic/db/source/printer/HP-OfficeJet_610.xml
 share/foomatic/db/source/printer/HP-OfficeJet_6110.xml
 share/foomatic/db/source/printer/HP-OfficeJet_6150.xml
+share/foomatic/db/source/printer/HP-OfficeJet_6200.xml
 share/foomatic/db/source/printer/HP-OfficeJet_625.xml
 share/foomatic/db/source/printer/HP-OfficeJet_630.xml
 share/foomatic/db/source/printer/HP-OfficeJet_635.xml
 share/foomatic/db/source/printer/HP-OfficeJet_700.xml
-share/foomatic/db/source/printer/HP-OfficeJet_7100.xml
 share/foomatic/db/source/printer/HP-OfficeJet_710.xml
+share/foomatic/db/source/printer/HP-OfficeJet_7100.xml
 share/foomatic/db/source/printer/HP-OfficeJet_7110.xml
 share/foomatic/db/source/printer/HP-OfficeJet_7130.xml
 share/foomatic/db/source/printer/HP-OfficeJet_7140.xml
 share/foomatic/db/source/printer/HP-OfficeJet_720.xml
+share/foomatic/db/source/printer/HP-OfficeJet_7200.xml
 share/foomatic/db/source/printer/HP-OfficeJet_725.xml
-share/foomatic/db/source/printer/HP-PaintJet.xml
-share/foomatic/db/source/printer/HP-PaintJet_XL300.xml
-share/foomatic/db/source/printer/HP-PaintJet_XL.xml
-share/foomatic/db/source/printer/HP-PhotoSmart.xml
-share/foomatic/db/source/printer/HP-PhotoSmart_P1000.xml
-share/foomatic/db/source/printer/HP-PhotoSmart_P100.xml
-share/foomatic/db/source/printer/HP-PhotoSmart_P1100.xml
-share/foomatic/db/source/printer/HP-PhotoSmart_P1115.xml
-share/foomatic/db/source/printer/HP-PhotoSmart_P1215.xml
-share/foomatic/db/source/printer/HP-PhotoSmart_P1218.xml
-share/foomatic/db/source/printer/HP-PhotoSmart_P130.xml
-share/foomatic/db/source/printer/HP-PhotoSmart_P1315.xml
-share/foomatic/db/source/printer/HP-PhotoSmart_P230.xml
-share/foomatic/db/source/printer/HP-PhotoSmart_140.xml
-share/foomatic/db/source/printer/HP-PhotoSmart_240.xml
-share/foomatic/db/source/printer/HP-PhotoSmart_7150.xml
-share/foomatic/db/source/printer/HP-PhotoSmart_7260.xml
-share/foomatic/db/source/printer/HP-PhotoSmart_7268.xml
-share/foomatic/db/source/printer/HP-PhotoSmart_7345.xml
-share/foomatic/db/source/printer/HP-PhotoSmart_7350.xml
-share/foomatic/db/source/printer/HP-PhotoSmart_7550.xml
-share/foomatic/db/source/printer/HP-PhotoSmart_7660.xml
-share/foomatic/db/source/printer/HP-PhotoSmart_7760.xml
-share/foomatic/db/source/printer/HP-PhotoSmart_7960.xml
+share/foomatic/db/source/printer/HP-OfficeJet_7300.xml
+share/foomatic/db/source/printer/HP-OfficeJet_7400.xml
+share/foomatic/db/source/printer/HP-OfficeJet_9100.xml
+share/foomatic/db/source/printer/HP-OfficeJet_D125.xml
+share/foomatic/db/source/printer/HP-OfficeJet_D135.xml
+share/foomatic/db/source/printer/HP-OfficeJet_D145.xml
+share/foomatic/db/source/printer/HP-OfficeJet_D155.xml
+share/foomatic/db/source/printer/HP-OfficeJet_G55.xml
+share/foomatic/db/source/printer/HP-OfficeJet_G85.xml
+share/foomatic/db/source/printer/HP-OfficeJet_G95.xml
+share/foomatic/db/source/printer/HP-OfficeJet_K60.xml
+share/foomatic/db/source/printer/HP-OfficeJet_K60xi.xml
+share/foomatic/db/source/printer/HP-OfficeJet_K80.xml
+share/foomatic/db/source/printer/HP-OfficeJet_K80xi.xml
+share/foomatic/db/source/printer/HP-OfficeJet_LX.xml
+share/foomatic/db/source/printer/HP-OfficeJet_Pro_1150C.xml
+share/foomatic/db/source/printer/HP-OfficeJet_Pro_1170C.xml
+share/foomatic/db/source/printer/HP-OfficeJet_Pro_1175C.xml
+share/foomatic/db/source/printer/HP-OfficeJet_R40.xml
+share/foomatic/db/source/printer/HP-OfficeJet_R45.xml
+share/foomatic/db/source/printer/HP-OfficeJet_R60.xml
+share/foomatic/db/source/printer/HP-OfficeJet_R65.xml
+share/foomatic/db/source/printer/HP-OfficeJet_R80.xml
+share/foomatic/db/source/printer/HP-OfficeJet_T45.xml
+share/foomatic/db/source/printer/HP-OfficeJet_T65.xml
+share/foomatic/db/source/printer/HP-OfficeJet_V40.xml
+share/foomatic/db/source/printer/HP-OfficeJet_V40xi.xml
 share/foomatic/db/source/printer/HP-PSC_1100.xml
 share/foomatic/db/source/printer/HP-PSC_1110.xml
 share/foomatic/db/source/printer/HP-PSC_1200.xml
 share/foomatic/db/source/printer/HP-PSC_1205.xml
 share/foomatic/db/source/printer/HP-PSC_1210.xml
 share/foomatic/db/source/printer/HP-PSC_1300.xml
+share/foomatic/db/source/printer/HP-PSC_1310.xml
+share/foomatic/db/source/printer/HP-PSC_1600.xml
 share/foomatic/db/source/printer/HP-PSC_2110.xml
 share/foomatic/db/source/printer/HP-PSC_2150.xml
 share/foomatic/db/source/printer/HP-PSC_2170.xml
 share/foomatic/db/source/printer/HP-PSC_2175.xml
 share/foomatic/db/source/printer/HP-PSC_2210.xml
 share/foomatic/db/source/printer/HP-PSC_2300.xml
+share/foomatic/db/source/printer/HP-PSC_2350.xml
 share/foomatic/db/source/printer/HP-PSC_2400.xml
 share/foomatic/db/source/printer/HP-PSC_2500.xml
 share/foomatic/db/source/printer/HP-PSC_370.xml
 share/foomatic/db/source/printer/HP-PSC_380.xml
 share/foomatic/db/source/printer/HP-PSC_500.xml
-share/foomatic/db/source/printer/HP-PSC_750xi.xml
 share/foomatic/db/source/printer/HP-PSC_750.xml
-share/foomatic/db/source/printer/HP-PSC_950xi.xml
+share/foomatic/db/source/printer/HP-PSC_750xi.xml
 share/foomatic/db/source/printer/HP-PSC_950.xml
+share/foomatic/db/source/printer/HP-PSC_950xi.xml
+share/foomatic/db/source/printer/HP-PaintJet.xml
+share/foomatic/db/source/printer/HP-PaintJet_XL.xml
+share/foomatic/db/source/printer/HP-PaintJet_XL300.xml
+share/foomatic/db/source/printer/HP-PhotoSmart.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_140.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_240.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_2600.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_2700.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_320.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_370.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_7150.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_7260.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_7268.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_7345.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_7350.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_7400.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_7550.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_7660.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_7760.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_7960.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_8100.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_8400.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_8700.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_P100.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_P1000.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_P1100.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_P1115.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_P1215.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_P1218.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_P130.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_P1315.xml
+share/foomatic/db/source/printer/HP-PhotoSmart_P230.xml
 share/foomatic/db/source/printer/HP-ThinkJet.xml
-share/foomatic/db/source/printer/HP-2000C.xml
-share/foomatic/db/source/printer/HP-2500CM.xml
-share/foomatic/db/source/printer/HP-2500C.xml
-share/foomatic/db/source/printer/HP-2563.xml
-share/foomatic/db/source/printer/IBM-Execjet_4072.xml
-share/foomatic/db/source/printer/IBM-Infoprint_12.xml
-share/foomatic/db/source/printer/IBM-Page_Printer_3112.xml
-share/foomatic/db/source/printer/IBM-ProPrinterII.xml
+share/foomatic/db/source/printer/HP-e-printer_e20.xml
+share/foomatic/db/source/printer/Heidelberg-Digimaster_9110.xml
+share/foomatic/db/source/printer/Hitachi-DDP_70_with_MicroPress.xml
 share/foomatic/db/source/printer/IBM-3853_JetPrinter.xml
 share/foomatic/db/source/printer/IBM-4019.xml
 share/foomatic/db/source/printer/IBM-4029_030_LaserPrinter_10.xml
 share/foomatic/db/source/printer/IBM-4029_10P.xml
 share/foomatic/db/source/printer/IBM-4303_Network_Color_Printer.xml
+share/foomatic/db/source/printer/IBM-Execjet_4072.xml
+share/foomatic/db/source/printer/IBM-Infoprint_12.xml
+share/foomatic/db/source/printer/IBM-Page_Printer_3112.xml
+share/foomatic/db/source/printer/IBM-ProPrinterII.xml
 share/foomatic/db/source/printer/Imagen-ImPress.xml
+share/foomatic/db/source/printer/Infotec-4353_MF_PS.xml
+share/foomatic/db/source/printer/Infotec-4452_MF_PS.xml
 share/foomatic/db/source/printer/Infotec-4651_MF.xml
+share/foomatic/db/source/printer/Infotec-IPC1036_PS.xml
+share/foomatic/db/source/printer/Infotec-IPC2838_PS.xml
+share/foomatic/db/source/printer/Infotec-IPC_2525_PS.xml
+share/foomatic/db/source/printer/Infotec-IPC_2525e_PS.xml
+share/foomatic/db/source/printer/Infotec-IPC_3535_PS.xml
+share/foomatic/db/source/printer/Infotec-IP_280_PS.xml
+share/foomatic/db/source/printer/Infotec-IS2022_PS.xml
+share/foomatic/db/source/printer/Infotec-IS2027_PS.xml
+share/foomatic/db/source/printer/Infotec-IS2032_PS.xml
+share/foomatic/db/source/printer/Infotec-IS2035_PS.xml
+share/foomatic/db/source/printer/Infotec-IS2045_PS.xml
+share/foomatic/db/source/printer/Infotec-IS2090_PS.xml
+share/foomatic/db/source/printer/Infotec-IS2105_PS.xml
+share/foomatic/db/source/printer/Infotec-ISC1032_PS.xml
+share/foomatic/db/source/printer/Infotec-ISC824_PS.xml
+share/foomatic/db/source/printer/Infotec-ISC_2028_PS.xml
+share/foomatic/db/source/printer/Infotec-ISC_2432_PS.xml
+share/foomatic/db/source/printer/Infotec-ISC_2838_PS.xml
+share/foomatic/db/source/printer/Infotec-IS_2015_PS.xml
+share/foomatic/db/source/printer/Infotec-IS_2018D_PS.xml
+share/foomatic/db/source/printer/Infotec-IS_2018_PS.xml
+share/foomatic/db/source/printer/Infotec-IS_2060_PS.xml
+share/foomatic/db/source/printer/Infotec-IS_2075_PS.xml
+share/foomatic/db/source/printer/Infotec-IS_2122_PS.xml
+share/foomatic/db/source/printer/Infotec-IS_2127_PS.xml
+share/foomatic/db/source/printer/Infotec-IS_2132_PS.xml
+share/foomatic/db/source/printer/Infotec-IS_2135_PS.xml
+share/foomatic/db/source/printer/Infotec-IS_2145_PS.xml
+share/foomatic/db/source/printer/Infotec-IS_2151_PS.xml
+share/foomatic/db/source/printer/Infotec-IS_2160_PS.xml
+share/foomatic/db/source/printer/Infotec-IS_2175_PS.xml
 share/foomatic/db/source/printer/Kodak-DigiSource_9110.xml
 share/foomatic/db/source/printer/Kodak-IS_70_CPII.xml
-share/foomatic/db/source/printer/Kyocera-FS-1000plus.xml
+share/foomatic/db/source/printer/Kyocera-F-1000.xml
+share/foomatic/db/source/printer/Kyocera-F-1010.xml
+share/foomatic/db/source/printer/Kyocera-F-1200.xml
+share/foomatic/db/source/printer/Kyocera-F-1200S.xml
+share/foomatic/db/source/printer/Kyocera-F-1800.xml
+share/foomatic/db/source/printer/Kyocera-F-2000.xml
+share/foomatic/db/source/printer/Kyocera-F-2010.xml
+share/foomatic/db/source/printer/Kyocera-F-2200.xml
+share/foomatic/db/source/printer/Kyocera-F-2200S.xml
+share/foomatic/db/source/printer/Kyocera-F-3000.xml
+share/foomatic/db/source/printer/Kyocera-F-3010.xml
+share/foomatic/db/source/printer/Kyocera-F-3300.xml
+share/foomatic/db/source/printer/Kyocera-F-5000.xml
+share/foomatic/db/source/printer/Kyocera-F-800.xml
+share/foomatic/db/source/printer/Kyocera-F-800T.xml
+share/foomatic/db/source/printer/Kyocera-F-820.xml
 share/foomatic/db/source/printer/Kyocera-FS-1000.xml
+share/foomatic/db/source/printer/Kyocera-FS-1000plus.xml
 share/foomatic/db/source/printer/Kyocera-FS-1010.xml
 share/foomatic/db/source/printer/Kyocera-FS-1050.xml
 share/foomatic/db/source/printer/Kyocera-FS-1200.xml
 share/foomatic/db/source/printer/Kyocera-FS-1500.xml
-share/foomatic/db/source/printer/Kyocera-FS-1550plus.xml
 share/foomatic/db/source/printer/Kyocera-FS-1550.xml
-share/foomatic/db/source/printer/Kyocera-FS-1600plus.xml
+share/foomatic/db/source/printer/Kyocera-FS-1550plus.xml
 share/foomatic/db/source/printer/Kyocera-FS-1600.xml
-share/foomatic/db/source/printer/Kyocera-FS-1700plus.xml
+share/foomatic/db/source/printer/Kyocera-FS-1600plus.xml
 share/foomatic/db/source/printer/Kyocera-FS-1700.xml
+share/foomatic/db/source/printer/Kyocera-FS-1700plus.xml
 share/foomatic/db/source/printer/Kyocera-FS-1750.xml
-share/foomatic/db/source/printer/Kyocera-FS-1800plus.xml
 share/foomatic/db/source/printer/Kyocera-FS-1800.xml
+share/foomatic/db/source/printer/Kyocera-FS-1800plus.xml
 share/foomatic/db/source/printer/Kyocera-FS-1900.xml
-share/foomatic/db/source/printer/Kyocera-FS-3400plus.xml
 share/foomatic/db/source/printer/Kyocera-FS-3400.xml
+share/foomatic/db/source/printer/Kyocera-FS-3400plus.xml
 share/foomatic/db/source/printer/Kyocera-FS-3500.xml
-share/foomatic/db/source/printer/Kyocera-FS-3600plus.xml
 share/foomatic/db/source/printer/Kyocera-FS-3600.xml
-share/foomatic/db/source/printer/Kyocera-FS-3700plus.xml
+share/foomatic/db/source/printer/Kyocera-FS-3600plus.xml
 share/foomatic/db/source/printer/Kyocera-FS-3700.xml
+share/foomatic/db/source/printer/Kyocera-FS-3700plus.xml
 share/foomatic/db/source/printer/Kyocera-FS-3750.xml
 share/foomatic/db/source/printer/Kyocera-FS-3800.xml
 share/foomatic/db/source/printer/Kyocera-FS-400.xml
@@ -1424,34 +1660,18 @@ share/foomatic/db/source/printer/Kyocera-FS-5800C.xml
 share/foomatic/db/source/printer/Kyocera-FS-5900C.xml
 share/foomatic/db/source/printer/Kyocera-FS-600.xml
 share/foomatic/db/source/printer/Kyocera-FS-600_KPDL-2.xml
-share/foomatic/db/source/printer/Kyocera-FS-6500plus.xml
 share/foomatic/db/source/printer/Kyocera-FS-6500.xml
+share/foomatic/db/source/printer/Kyocera-FS-6500plus.xml
 share/foomatic/db/source/printer/Kyocera-FS-6700.xml
 share/foomatic/db/source/printer/Kyocera-FS-680.xml
-share/foomatic/db/source/printer/Kyocera-FS-7000plus.xml
 share/foomatic/db/source/printer/Kyocera-FS-7000.xml
-share/foomatic/db/source/printer/Kyocera-FS-8000C.xml
+share/foomatic/db/source/printer/Kyocera-FS-7000plus.xml
 share/foomatic/db/source/printer/Kyocera-FS-800.xml
+share/foomatic/db/source/printer/Kyocera-FS-8000C.xml
 share/foomatic/db/source/printer/Kyocera-FS-850.xml
 share/foomatic/db/source/printer/Kyocera-FS-9000.xml
 share/foomatic/db/source/printer/Kyocera-FS-9100DN.xml
 share/foomatic/db/source/printer/Kyocera-FS-9500DN.xml
-share/foomatic/db/source/printer/Kyocera-F-1000.xml
-share/foomatic/db/source/printer/Kyocera-F-1010.xml
-share/foomatic/db/source/printer/Kyocera-F-1200S.xml
-share/foomatic/db/source/printer/Kyocera-F-1200.xml
-share/foomatic/db/source/printer/Kyocera-F-1800.xml
-share/foomatic/db/source/printer/Kyocera-F-2000.xml
-share/foomatic/db/source/printer/Kyocera-F-2010.xml
-share/foomatic/db/source/printer/Kyocera-F-2200S.xml
-share/foomatic/db/source/printer/Kyocera-F-2200.xml
-share/foomatic/db/source/printer/Kyocera-F-3000.xml
-share/foomatic/db/source/printer/Kyocera-F-3010.xml
-share/foomatic/db/source/printer/Kyocera-F-3300.xml
-share/foomatic/db/source/printer/Kyocera-F-5000.xml
-share/foomatic/db/source/printer/Kyocera-F-800T.xml
-share/foomatic/db/source/printer/Kyocera-F-800.xml
-share/foomatic/db/source/printer/Kyocera-F-820.xml
 share/foomatic/db/source/printer/Kyocera-KM-1530.xml
 share/foomatic/db/source/printer/Kyocera-KM-1810.xml
 share/foomatic/db/source/printer/Kyocera-KM-2030.xml
@@ -1464,25 +1684,82 @@ share/foomatic/db/source/printer/Kyocera-KM-5530.xml
 share/foomatic/db/source/printer/Kyocera-KM-6230.xml
 share/foomatic/db/source/printer/Kyocera-P-2000.xml
 share/foomatic/db/source/printer/Kyocera-P-2002.xml
+share/foomatic/db/source/printer/Lanier-2132_PS.xml
+share/foomatic/db/source/printer/Lanier-2138_PS.xml
+share/foomatic/db/source/printer/Lanier-2145_PS.xml
+share/foomatic/db/source/printer/Lanier-5622_PS.xml
+share/foomatic/db/source/printer/Lanier-5627_PS.xml
+share/foomatic/db/source/printer/Lanier-5632_PS.xml
+share/foomatic/db/source/printer/Lanier-5635_PS.xml
+share/foomatic/db/source/printer/Lanier-5645_PS.xml
+share/foomatic/db/source/printer/Lanier-LD0105_PS.xml
+share/foomatic/db/source/printer/Lanier-LD024c_PS.xml
+share/foomatic/db/source/printer/Lanier-LD032c_PS.xml
+share/foomatic/db/source/printer/Lanier-LD035_PS.xml
+share/foomatic/db/source/printer/Lanier-LD045_PS.xml
+share/foomatic/db/source/printer/Lanier-LD060_PS.xml
+share/foomatic/db/source/printer/Lanier-LD075_PS.xml
+share/foomatic/db/source/printer/Lanier-LD090_PS.xml
+share/foomatic/db/source/printer/Lanier-LD115_PS.xml
+share/foomatic/db/source/printer/Lanier-LD118_PS.xml
+share/foomatic/db/source/printer/Lanier-LD118d_PS.xml
+share/foomatic/db/source/printer/Lanier-LD122_PS.xml
+share/foomatic/db/source/printer/Lanier-LD127_PS.xml
+share/foomatic/db/source/printer/Lanier-LD132_PS.xml
+share/foomatic/db/source/printer/Lanier-LD135_PS.xml
+share/foomatic/db/source/printer/Lanier-LD145_PS.xml
+share/foomatic/db/source/printer/Lanier-LD151_PS.xml
+share/foomatic/db/source/printer/Lanier-LD160_PS.xml
+share/foomatic/db/source/printer/Lanier-LD175_PS.xml
+share/foomatic/db/source/printer/Lanier-LD228c_PS.xml
+share/foomatic/db/source/printer/Lanier-LD232c_PS.xml
+share/foomatic/db/source/printer/Lanier-LD238c_PS.xml
+share/foomatic/db/source/printer/Lanier-LF510_515e_PS.xml
+share/foomatic/db/source/printer/Lanier-LP025N_LP026N_PS.xml
+share/foomatic/db/source/printer/Lanier-LP025_LP026_PS.xml
+share/foomatic/db/source/printer/Lanier-LP031c_PS.xml
+share/foomatic/db/source/printer/Lanier-LP032_PS.xml
+share/foomatic/db/source/printer/Lanier-LP116c_PS.xml
+share/foomatic/db/source/printer/Lanier-LP122c_LP121c_PS.xml
+share/foomatic/db/source/printer/Lanier-LP125cx_LP126cn_PS.xml
+share/foomatic/db/source/printer/Lanier-LP138c_PS.xml
+share/foomatic/db/source/printer/Lanier-LP235c_PS.xml
+share/foomatic/db/source/printer/Lanier-LP_020c_PS.xml
+share/foomatic/db/source/printer/Lanier-LP_036c_PS.xml
 share/foomatic/db/source/printer/LaserMaster-LM_1000.xml
+share/foomatic/db/source/printer/Lexmark-1000.xml
+share/foomatic/db/source/printer/Lexmark-1020.xml
+share/foomatic/db/source/printer/Lexmark-1020_Business.xml
+share/foomatic/db/source/printer/Lexmark-1100.xml
+share/foomatic/db/source/printer/Lexmark-2030.xml
+share/foomatic/db/source/printer/Lexmark-2050.xml
+share/foomatic/db/source/printer/Lexmark-2070.xml
+share/foomatic/db/source/printer/Lexmark-3000.xml
+share/foomatic/db/source/printer/Lexmark-3200.xml
+share/foomatic/db/source/printer/Lexmark-4039_10plus.xml
+share/foomatic/db/source/printer/Lexmark-4076.xml
+share/foomatic/db/source/printer/Lexmark-5000.xml
+share/foomatic/db/source/printer/Lexmark-5700.xml
+share/foomatic/db/source/printer/Lexmark-7000.xml
+share/foomatic/db/source/printer/Lexmark-7200.xml
 share/foomatic/db/source/printer/Lexmark-E210.xml
+share/foomatic/db/source/printer/Lexmark-Optra_C710.xml
 share/foomatic/db/source/printer/Lexmark-Optra_Color_1200.xml
 share/foomatic/db/source/printer/Lexmark-Optra_Color_1275.xml
 share/foomatic/db/source/printer/Lexmark-Optra_Color_40.xml
 share/foomatic/db/source/printer/Lexmark-Optra_Color_45.xml
-share/foomatic/db/source/printer/Lexmark-Optra_C710.xml
-share/foomatic/db/source/printer/Lexmark-Optra_Eplus.xml
-share/foomatic/db/source/printer/Lexmark-Optra_Ep.xml
+share/foomatic/db/source/printer/Lexmark-Optra_E.xml
 share/foomatic/db/source/printer/Lexmark-Optra_E310.xml
 share/foomatic/db/source/printer/Lexmark-Optra_E312.xml
-share/foomatic/db/source/printer/Lexmark-Optra_E.xml
+share/foomatic/db/source/printer/Lexmark-Optra_Ep.xml
+share/foomatic/db/source/printer/Lexmark-Optra_Eplus.xml
 share/foomatic/db/source/printer/Lexmark-Optra_K_1220.xml
 share/foomatic/db/source/printer/Lexmark-Optra_M410.xml
 share/foomatic/db/source/printer/Lexmark-Optra_M412.xml
 share/foomatic/db/source/printer/Lexmark-Optra_Rplus.xml
-share/foomatic/db/source/printer/Lexmark-Optra_Se_3455.xml
 share/foomatic/db/source/printer/Lexmark-Optra_S_1250.xml
 share/foomatic/db/source/printer/Lexmark-Optra_S_1855.xml
+share/foomatic/db/source/printer/Lexmark-Optra_Se_3455.xml
 share/foomatic/db/source/printer/Lexmark-Optra_T610.xml
 share/foomatic/db/source/printer/Lexmark-Optra_T612.xml
 share/foomatic/db/source/printer/Lexmark-Optra_T614.xml
@@ -1493,7 +1770,10 @@ share/foomatic/db/source/printer/Lexmark-Winwriter_100.xml
 share/foomatic/db/source/printer/Lexmark-Winwriter_150c.xml
 share/foomatic/db/source/printer/Lexmark-Winwriter_200.xml
 share/foomatic/db/source/printer/Lexmark-Winwriter_400.xml
+share/foomatic/db/source/printer/Lexmark-X125.xml
 share/foomatic/db/source/printer/Lexmark-X73.xml
+share/foomatic/db/source/printer/Lexmark-X74.xml
+share/foomatic/db/source/printer/Lexmark-X75.xml
 share/foomatic/db/source/printer/Lexmark-Z11.xml
 share/foomatic/db/source/printer/Lexmark-Z12.xml
 share/foomatic/db/source/printer/Lexmark-Z13.xml
@@ -1508,51 +1788,43 @@ share/foomatic/db/source/printer/Lexmark-Z51.xml
 share/foomatic/db/source/printer/Lexmark-Z52.xml
 share/foomatic/db/source/printer/Lexmark-Z53.xml
 share/foomatic/db/source/printer/Lexmark-Z82.xml
-share/foomatic/db/source/printer/Lexmark-1000.xml
-share/foomatic/db/source/printer/Lexmark-1020.xml
-share/foomatic/db/source/printer/Lexmark-1020_Business.xml
-share/foomatic/db/source/printer/Lexmark-1100.xml
-share/foomatic/db/source/printer/Lexmark-2030.xml
-share/foomatic/db/source/printer/Lexmark-2050.xml
-share/foomatic/db/source/printer/Lexmark-2070.xml
-share/foomatic/db/source/printer/Lexmark-3000.xml
-share/foomatic/db/source/printer/Lexmark-3200.xml
-share/foomatic/db/source/printer/Lexmark-4039_10plus.xml
-share/foomatic/db/source/printer/Lexmark-4076.xml
-share/foomatic/db/source/printer/Lexmark-5000.xml
-share/foomatic/db/source/printer/Lexmark-5700.xml
-share/foomatic/db/source/printer/Lexmark-7000.xml
-share/foomatic/db/source/printer/Lexmark-7200.xml
 share/foomatic/db/source/printer/Minolta-Color_PageWorks_Pro_L.xml
-share/foomatic/db/source/printer/Minolta-magicolor_2200_DL.xml
-share/foomatic/db/source/printer/Minolta-magicolor_2300_DL.xml
-share/foomatic/db/source/printer/Minolta-magicolor_3100.xml
-share/foomatic/db/source/printer/Minolta-PagePro_1100L.xml
 share/foomatic/db/source/printer/Minolta-PagePro_1100.xml
-share/foomatic/db/source/printer/Minolta-PagePro_6ex.xml
-share/foomatic/db/source/printer/Minolta-PagePro_6e.xml
-share/foomatic/db/source/printer/Minolta-PagePro_6L.xml
+share/foomatic/db/source/printer/Minolta-PagePro_1100L.xml
+share/foomatic/db/source/printer/Minolta-PagePro_1200W.xml
+share/foomatic/db/source/printer/Minolta-PagePro_1250E.xml
+share/foomatic/db/source/printer/Minolta-PagePro_1250W.xml
+share/foomatic/db/source/printer/Minolta-PagePro_1300W.xml
+share/foomatic/db/source/printer/Minolta-PagePro_1350W.xml
 share/foomatic/db/source/printer/Minolta-PagePro_6.xml
-share/foomatic/db/source/printer/Minolta-PagePro_8L.xml
+share/foomatic/db/source/printer/Minolta-PagePro_6L.xml
+share/foomatic/db/source/printer/Minolta-PagePro_6e.xml
+share/foomatic/db/source/printer/Minolta-PagePro_6ex.xml
 share/foomatic/db/source/printer/Minolta-PagePro_8.xml
+share/foomatic/db/source/printer/Minolta-PagePro_8L.xml
+share/foomatic/db/source/printer/Minolta-magicolor_2200_DL.xml
+share/foomatic/db/source/printer/Minolta-magicolor_2300W.xml
+share/foomatic/db/source/printer/Minolta-magicolor_2300_DL.xml
+share/foomatic/db/source/printer/Minolta-magicolor_2430_DL.xml
+share/foomatic/db/source/printer/Minolta-magicolor_3100.xml
 share/foomatic/db/source/printer/Mitsubishi-CP50_Color_Printer.xml
 share/foomatic/db/source/printer/NEC-MultiWriter.xml
+share/foomatic/db/source/printer/NEC-P2X.xml
 share/foomatic/db/source/printer/NEC-PC-PR1000.xml
 share/foomatic/db/source/printer/NEC-PC-PR150.xml
 share/foomatic/db/source/printer/NEC-PC-PR2000.xml
 share/foomatic/db/source/printer/NEC-PC-PR201.xml
 share/foomatic/db/source/printer/NEC-PICTY180.xml
-share/foomatic/db/source/printer/NEC-Pinwriter_P20.xml
-share/foomatic/db/source/printer/NEC-PinWriter_P60.xml
 share/foomatic/db/source/printer/NEC-PinWriter_P6.xml
+share/foomatic/db/source/printer/NEC-PinWriter_P60.xml
 share/foomatic/db/source/printer/NEC-PinWriter_P6_plus.xml
-share/foomatic/db/source/printer/NEC-PinWriter_P70.xml
 share/foomatic/db/source/printer/NEC-PinWriter_P7.xml
+share/foomatic/db/source/printer/NEC-PinWriter_P70.xml
 share/foomatic/db/source/printer/NEC-PinWriter_P7_plus.xml
-share/foomatic/db/source/printer/NEC-P2X.xml
-share/foomatic/db/source/printer/NEC-Silentwriter2_model_290.xml
-share/foomatic/db/source/printer/NEC-Silentwriter2_S60P.xml
+share/foomatic/db/source/printer/NEC-Pinwriter_P20.xml
 share/foomatic/db/source/printer/NEC-SilentWriter_LC_890.xml
+share/foomatic/db/source/printer/NEC-Silentwriter2_S60P.xml
+share/foomatic/db/source/printer/NEC-Silentwriter2_model_290.xml
 share/foomatic/db/source/printer/NEC-Silentwriter_95f.xml
 share/foomatic/db/source/printer/NEC-SuperScript_100C.xml
 share/foomatic/db/source/printer/NEC-SuperScript_1260.xml
@@ -1561,53 +1833,99 @@ share/foomatic/db/source/printer/NEC-SuperScript_1800.xml
 share/foomatic/db/source/printer/NEC-SuperScript_4600N.xml
 share/foomatic/db/source/printer/NEC-SuperScript_610plus.xml
 share/foomatic/db/source/printer/NEC-SuperScript_650C.xml
+share/foomatic/db/source/printer/NEC-SuperScript_660.xml
 share/foomatic/db/source/printer/NEC-SuperScript_660i.xml
 share/foomatic/db/source/printer/NEC-SuperScript_660plus.xml
-share/foomatic/db/source/printer/NEC-SuperScript_660.xml
 share/foomatic/db/source/printer/NEC-SuperScript_750C.xml
 share/foomatic/db/source/printer/NEC-SuperScript_860.xml
 share/foomatic/db/source/printer/NEC-SuperScript_870.xml
+share/foomatic/db/source/printer/NRG-10515_10518_10512_PS.xml
+share/foomatic/db/source/printer/NRG-2205_2238_2212_PS.xml
+share/foomatic/db/source/printer/NRG-2705_2738_2712_PS.xml
+share/foomatic/db/source/printer/NRG-3205_3238_3212_PS.xml
+share/foomatic/db/source/printer/NRG-3525_3508_3502_PS.xml
+share/foomatic/db/source/printer/NRG-3545_3518_3532_PS.xml
+share/foomatic/db/source/printer/NRG-4525_4508_4502_PS.xml
+share/foomatic/db/source/printer/NRG-4545_4518_4532_PS.xml
+share/foomatic/db/source/printer/NRG-6002_6005_6008_PS.xml
+share/foomatic/db/source/printer/NRG-7502_7505_7508_PS.xml
+share/foomatic/db/source/printer/NRG-9005_9008_9002_PS.xml
+share/foomatic/db/source/printer/NRG-C7010_PS.xml
+share/foomatic/db/source/printer/NRG-C7116_PS.xml
+share/foomatic/db/source/printer/NRG-C7416_PS.xml
+share/foomatic/db/source/printer/NRG-C7425dn_PS.xml
+share/foomatic/db/source/printer/NRG-C7425hdn_PS.xml
+share/foomatic/db/source/printer/NRG-C7435n_PS.xml
+share/foomatic/db/source/printer/NRG-CC7417_PS.xml
+share/foomatic/db/source/printer/NRG-DSc224_PS.xml
+share/foomatic/db/source/printer/NRG-DSc232_PS.xml
+share/foomatic/db/source/printer/NRG-DSc328_PS.xml
+share/foomatic/db/source/printer/NRG-DSc332_PS.xml
+share/foomatic/db/source/printer/NRG-DSc338_PS.xml
+share/foomatic/db/source/printer/NRG-DSc38_PS.xml
+share/foomatic/db/source/printer/NRG-DSc38u_PS.xml
+share/foomatic/db/source/printer/NRG-DSm615_PS.xml
+share/foomatic/db/source/printer/NRG-DSm618_PS.xml
+share/foomatic/db/source/printer/NRG-DSm618d_PS.xml
+share/foomatic/db/source/printer/NRG-DSm622_PS.xml
+share/foomatic/db/source/printer/NRG-DSm627_PS.xml
+share/foomatic/db/source/printer/NRG-DSm632_PS.xml
+share/foomatic/db/source/printer/NRG-DSm635_PS.xml
+share/foomatic/db/source/printer/NRG-DSm645_PS.xml
+share/foomatic/db/source/printer/NRG-DSm651_PS.xml
+share/foomatic/db/source/printer/NRG-DSm660_PS.xml
+share/foomatic/db/source/printer/NRG-DSm675_PS.xml
+share/foomatic/db/source/printer/NRG-P7026N_PS.xml
+share/foomatic/db/source/printer/NRG-P7026_PS.xml
+share/foomatic/db/source/printer/NRG-P7032_PS.xml
+share/foomatic/db/source/printer/NRG-P7126N_PS.xml
+share/foomatic/db/source/printer/NRG-P7126_PS.xml
+share/foomatic/db/source/printer/NRG-P7132N_PS.xml
+share/foomatic/db/source/printer/NRG-P7145_PS.xml
+share/foomatic/db/source/printer/NRG-P7325N_PS.xml
+share/foomatic/db/source/printer/NRG-P7325_PS.xml
+share/foomatic/db/source/printer/NRG-P7431cn_PS.xml
 share/foomatic/db/source/printer/Oce-3165.xml
 share/foomatic/db/source/printer/Oce-9050.xml
 share/foomatic/db/source/printer/Okidata-DP_5000.xml
-share/foomatic/db/source/printer/Okidata-Microline_IBM_compatible_9_pin.xml
+share/foomatic/db/source/printer/Okidata-ML_320.xml
+share/foomatic/db/source/printer/Okidata-ML_321.xml
+share/foomatic/db/source/printer/Okidata-ML_380.xml
 share/foomatic/db/source/printer/Okidata-Microline_182.xml
 share/foomatic/db/source/printer/Okidata-Microline_192plus.xml
 share/foomatic/db/source/printer/Okidata-Microline_600CL.xml
 share/foomatic/db/source/printer/Okidata-Microline_620CL.xml
-share/foomatic/db/source/printer/Okidata-ML_320.xml
-share/foomatic/db/source/printer/Okidata-ML_321.xml
-share/foomatic/db/source/printer/Okidata-ML_380.xml
+share/foomatic/db/source/printer/Okidata-Microline_IBM_compatible_9_pin.xml
+share/foomatic/db/source/printer/Okidata-OL400.xml
+share/foomatic/db/source/printer/Okidata-OL400e.xml
+share/foomatic/db/source/printer/Okidata-OL400ex.xml
+share/foomatic/db/source/printer/Okidata-OL400w.xml
+share/foomatic/db/source/printer/Okidata-OL410e.xml
+share/foomatic/db/source/printer/Okidata-OL600e.xml
+share/foomatic/db/source/printer/Okidata-OL610e_PS.xml
+share/foomatic/db/source/printer/Okidata-OL610e_S.xml
+share/foomatic/db/source/printer/Okidata-OL800.xml
+share/foomatic/db/source/printer/Okidata-OL810e_PS.xml
+share/foomatic/db/source/printer/Okidata-OL810ex.xml
+share/foomatic/db/source/printer/Okidata-OL820.xml
+share/foomatic/db/source/printer/Okidata-OL830Plus.xml
 share/foomatic/db/source/printer/Okidata-Okijet_2010.xml
 share/foomatic/db/source/printer/Okidata-Okijet_2500.xml
-share/foomatic/db/source/printer/Okidata-Okipage_10ex.xml
 share/foomatic/db/source/printer/Okidata-Okipage_10e.xml
+share/foomatic/db/source/printer/Okidata-Okipage_10ex.xml
 share/foomatic/db/source/printer/Okidata-Okipage_12i.xml
 share/foomatic/db/source/printer/Okidata-Okipage_14ex.xml
 share/foomatic/db/source/printer/Okidata-Okipage_20DXn.xml
-share/foomatic/db/source/printer/Okidata-Okipage_4wplus.xml
 share/foomatic/db/source/printer/Okidata-Okipage_4w.xml
-share/foomatic/db/source/printer/Okidata-Okipage_6ex.xml
+share/foomatic/db/source/printer/Okidata-Okipage_4wplus.xml
 share/foomatic/db/source/printer/Okidata-Okipage_6e.xml
+share/foomatic/db/source/printer/Okidata-Okipage_6ex.xml
 share/foomatic/db/source/printer/Okidata-Okipage_6w.xml
 share/foomatic/db/source/printer/Okidata-Okipage_8c.xml
 share/foomatic/db/source/printer/Okidata-Okipage_8p.xml
 share/foomatic/db/source/printer/Okidata-Okipage_8w.xml
 share/foomatic/db/source/printer/Okidata-Okipage_8w_Lite.xml
 share/foomatic/db/source/printer/Okidata-Okipage_8z.xml
-share/foomatic/db/source/printer/Okidata-OL400ex.xml
-share/foomatic/db/source/printer/Okidata-OL400e.xml
-share/foomatic/db/source/printer/Okidata-OL400w.xml
-share/foomatic/db/source/printer/Okidata-OL400.xml
-share/foomatic/db/source/printer/Okidata-OL410e.xml
-share/foomatic/db/source/printer/Okidata-OL600e.xml
-share/foomatic/db/source/printer/Okidata-OL610e_PS.xml
-share/foomatic/db/source/printer/Okidata-OL610e_S.xml
-share/foomatic/db/source/printer/Okidata-OL800.xml
-share/foomatic/db/source/printer/Okidata-OL810ex.xml
-share/foomatic/db/source/printer/Okidata-OL810e_PS.xml
-share/foomatic/db/source/printer/Okidata-OL820.xml
-share/foomatic/db/source/printer/Okidata-OL830Plus.xml
 share/foomatic/db/source/printer/Okidata-Super_6e.xml
 share/foomatic/db/source/printer/Olivetti-JP350S.xml
 share/foomatic/db/source/printer/Olivetti-JP450.xml
@@ -1617,8 +1935,7 @@ share/foomatic/db/source/printer/Olympus-P-300E.xml
 share/foomatic/db/source/printer/Olympus-P-300NE.xml
 share/foomatic/db/source/printer/Olympus-P-300U.xml
 share/foomatic/db/source/printer/Olympus-P-400.xml
-share/foomatic/db/source/printer/Panasonic-KX-PS600.xml
-share/foomatic/db/source/printer/Panasonic-KX-Pxxxx_24-pin.xml
+share/foomatic/db/source/printer/PCPI-1030.xml
 share/foomatic/db/source/printer/Panasonic-KX-P1123.xml
 share/foomatic/db/source/printer/Panasonic-KX-P1124.xml
 share/foomatic/db/source/printer/Panasonic-KX-P1150.xml
@@ -1638,29 +1955,84 @@ share/foomatic/db/source/printer/Panasonic-KX-P6500.xml
 share/foomatic/db/source/printer/Panasonic-KX-P8410.xml
 share/foomatic/db/source/printer/Panasonic-KX-P8420.xml
 share/foomatic/db/source/printer/Panasonic-KX-P8475.xml
-share/foomatic/db/source/printer/PCPI-1030.xml
-share/foomatic/db/source/printer/Pentax-PocketJet_II.xml
+share/foomatic/db/source/printer/Panasonic-KX-PS600.xml
+share/foomatic/db/source/printer/Panasonic-KX-Pxxxx_24-pin.xml
 share/foomatic/db/source/printer/Pentax-PocketJet_200.xml
+share/foomatic/db/source/printer/Pentax-PocketJet_II.xml
 share/foomatic/db/source/printer/Printrex-820_DL.xml
+share/foomatic/db/source/printer/QMS-2425_Turbo_EX.xml
 share/foomatic/db/source/printer/QMS-LPK-100.xml
-share/foomatic/db/source/printer/QMS-magicolor_2plus.xml
 share/foomatic/db/source/printer/QMS-magicolor_2.xml
+share/foomatic/db/source/printer/QMS-magicolor_2plus.xml
 share/foomatic/db/source/printer/QMS-ps-810.xml
-share/foomatic/db/source/printer/QMS-2425_Turbo_EX.xml
 share/foomatic/db/source/printer/Raven-LP-410.xml
-share/foomatic/db/source/printer/Ricoh-Aficio_AP2000.xml
-share/foomatic/db/source/printer/Ricoh-Aficio_Color_2206.xml
+share/foomatic/db/source/printer/Ricoh-4081.xml
+share/foomatic/db/source/printer/Ricoh-4801.xml
+share/foomatic/db/source/printer/Ricoh-6000.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_1022_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_1027_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_1032_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_1035_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_1045_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_1060_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_1075_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_1224C_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_1232C_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_2015_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_2018D_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_2018_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_2022_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_2027_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_2032_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_2035_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_2035e_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_2045_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_2045e_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_2051_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_2060_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_2075_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_2090_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_2105_PS.xml
 share/foomatic/db/source/printer/Ricoh-Aficio_220.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_2228C_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_2232C_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_2238C_PS.xml
 share/foomatic/db/source/printer/Ricoh-Aficio_401.xml
 share/foomatic/db/source/printer/Ricoh-Aficio_700.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_AP2000.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_AP2600N_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_AP2600_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_AP2610N_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_AP2610_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_AP3200_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_AP3800C_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_AP400N_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_AP400_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_AP4510_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_AP600N_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_CL1000N_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_CL2000_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_CL3000_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_CL3000e_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_CL3100_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_CL4000DN_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_CL4000HDN_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_CL5000_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_CL7000_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_CL7100_PS.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_Color_2206.xml
 share/foomatic/db/source/printer/Ricoh-Afico_FX10.xml
+share/foomatic/db/source/printer/Ricoh-ColorLaser_AP828_PS.xml
+share/foomatic/db/source/printer/Ricoh-FAX5510L_5510NF_PS.xml
+share/foomatic/db/source/printer/Ricoh-LASER_AP2600N_PS.xml
+share/foomatic/db/source/printer/Ricoh-LASER_AP2600_PS.xml
+share/foomatic/db/source/printer/Ricoh-LASER_AP2610N_PS.xml
+share/foomatic/db/source/printer/Ricoh-LASER_AP2610_PS.xml
 share/foomatic/db/source/printer/Ricoh-RPDL_III_Laser_Printer.xml
 share/foomatic/db/source/printer/Ricoh-RPDL_II_Laser_Printer.xml
 share/foomatic/db/source/printer/Ricoh-RPDL_IV_Laser_Printer.xml
 share/foomatic/db/source/printer/Ricoh-RPDL_I_Laser_Printer.xml
-share/foomatic/db/source/printer/Ricoh-4081.xml
-share/foomatic/db/source/printer/Ricoh-4801.xml
-share/foomatic/db/source/printer/Ricoh-6000.xml
+share/foomatic/db/source/printer/Samsung-CLP-500.xml
 share/foomatic/db/source/printer/Samsung-ML-1000.xml
 share/foomatic/db/source/printer/Samsung-ML-1010.xml
 share/foomatic/db/source/printer/Samsung-ML-1020.xml
@@ -1668,10 +2040,27 @@ share/foomatic/db/source/printer/Samsung-ML-1200.xml
 share/foomatic/db/source/printer/Samsung-ML-1210.xml
 share/foomatic/db/source/printer/Samsung-ML-1220.xml
 share/foomatic/db/source/printer/Samsung-ML-1250.xml
+share/foomatic/db/source/printer/Samsung-ML-1410.xml
+share/foomatic/db/source/printer/Samsung-ML-1430.xml
+share/foomatic/db/source/printer/Samsung-ML-1440.xml
+share/foomatic/db/source/printer/Samsung-ML-1450.xml
+share/foomatic/db/source/printer/Samsung-ML-1450PS.xml
+share/foomatic/db/source/printer/Samsung-ML-1510.xml
 share/foomatic/db/source/printer/Samsung-ML-1650.xml
 share/foomatic/db/source/printer/Samsung-ML-1651N.xml
+share/foomatic/db/source/printer/Samsung-ML-1710.xml
+share/foomatic/db/source/printer/Samsung-ML-1750.xml
 share/foomatic/db/source/printer/Samsung-ML-200.xml
 share/foomatic/db/source/printer/Samsung-ML-210.xml
+share/foomatic/db/source/printer/Samsung-ML-2150.xml
+share/foomatic/db/source/printer/Samsung-ML-2150PS.xml
+share/foomatic/db/source/printer/Samsung-ML-2151N.xml
+share/foomatic/db/source/printer/Samsung-ML-2151NPS.xml
+share/foomatic/db/source/printer/Samsung-ML-2152W.xml
+share/foomatic/db/source/printer/Samsung-ML-2152WPS.xml
+share/foomatic/db/source/printer/Samsung-ML-2550.xml
+share/foomatic/db/source/printer/Samsung-ML-2551N.xml
+share/foomatic/db/source/printer/Samsung-ML-2552W.xml
 share/foomatic/db/source/printer/Samsung-ML-4500.xml
 share/foomatic/db/source/printer/Samsung-ML-4600.xml
 share/foomatic/db/source/printer/Samsung-ML-5000a.xml
@@ -1681,22 +2070,71 @@ share/foomatic/db/source/printer/Samsung-ML-6000_6100.xml
 share/foomatic/db/source/printer/Samsung-ML-6040.xml
 share/foomatic/db/source/printer/Samsung-ML-7000_7000P_7000N.xml
 share/foomatic/db/source/printer/Samsung-ML-7050.xml
-share/foomatic/db/source/printer/Samsung-ML-85G.xml
+share/foomatic/db/source/printer/Samsung-ML-7300.xml
+share/foomatic/db/source/printer/Samsung-ML-7300N.xml
 share/foomatic/db/source/printer/Samsung-ML-85.xml
+share/foomatic/db/source/printer/Samsung-ML-85G.xml
 share/foomatic/db/source/printer/Samsung-QL-5100A.xml
 share/foomatic/db/source/printer/Samsung-QL-6050.xml
 share/foomatic/db/source/printer/Samsung-QL-85G.xml
 share/foomatic/db/source/printer/Samsung-SF_MSYS_MJ-4700_4800_4500C.xml
 share/foomatic/db/source/printer/Samsung-SI-630A.xml
-share/foomatic/db/source/printer/Seiko-SLP.xml
+share/foomatic/db/source/printer/Savin-2522_PS.xml
+share/foomatic/db/source/printer/Savin-2527_PS.xml
+share/foomatic/db/source/printer/Savin-2532_PS.xml
+share/foomatic/db/source/printer/Savin-2535_2235_PS.xml
+share/foomatic/db/source/printer/Savin-2545_2245_PS.xml
+share/foomatic/db/source/printer/Savin-2560_PS.xml
+share/foomatic/db/source/printer/Savin-2575_PS.xml
+share/foomatic/db/source/printer/Savin-40105_PS.xml
+share/foomatic/db/source/printer/Savin-4015_PS.xml
+share/foomatic/db/source/printer/Savin-4018_PS.xml
+share/foomatic/db/source/printer/Savin-4018d_PS.xml
+share/foomatic/db/source/printer/Savin-4022_PS.xml
+share/foomatic/db/source/printer/Savin-4027_PS.xml
+share/foomatic/db/source/printer/Savin-4035_4135g_PS.xml
+share/foomatic/db/source/printer/Savin-4035e_4135eG_PS.xml
+share/foomatic/db/source/printer/Savin-4045_4145g_PS.xml
+share/foomatic/db/source/printer/Savin-4045e_4145eG_PS.xml
+share/foomatic/db/source/printer/Savin-4051_PS.xml
+share/foomatic/db/source/printer/Savin-4060_PS.xml
+share/foomatic/db/source/printer/Savin-4075_PS.xml
+share/foomatic/db/source/printer/Savin-4090_PS.xml
+share/foomatic/db/source/printer/Savin-C2408_PS.xml
+share/foomatic/db/source/printer/Savin-C2524_PS.xml
+share/foomatic/db/source/printer/Savin-C2532_PS.xml
+share/foomatic/db/source/printer/Savin-C2820_PS.xml
+share/foomatic/db/source/printer/Savin-C3210_PS.xml
+share/foomatic/db/source/printer/Savin-C3224_PS.xml
+share/foomatic/db/source/printer/Savin-C3828_PS.xml
+share/foomatic/db/source/printer/Savin-CLP1036_PS.xml
+share/foomatic/db/source/printer/Savin-CLP1620_PS.xml
+share/foomatic/db/source/printer/Savin-CLP17_PS.xml
+share/foomatic/db/source/printer/Savin-CLP18_PS.xml
+share/foomatic/db/source/printer/Savin-CLP26DN_PS.xml
+share/foomatic/db/source/printer/Savin-CLP28_PS.xml
+share/foomatic/db/source/printer/Savin-CLP35_PS.xml
+share/foomatic/db/source/printer/Savin-CLP831_PS.xml
+share/foomatic/db/source/printer/Savin-FAX3799_3799nf_PS.xml
+share/foomatic/db/source/printer/Savin-MLP25_PS.xml
+share/foomatic/db/source/printer/Savin-MLP25n_PS.xml
+share/foomatic/db/source/printer/Savin-MLP26_PS.xml
+share/foomatic/db/source/printer/Savin-MLP26n_PS.xml
+share/foomatic/db/source/printer/Savin-MLP32_PS.xml
+share/foomatic/db/source/printer/Savin-MLP45_PS.xml
+share/foomatic/db/source/printer/Savin-SLP26_PS.xml
+share/foomatic/db/source/printer/Savin-SLP26n_PS.xml
+share/foomatic/db/source/printer/Savin-SLP32_PS.xml
+share/foomatic/db/source/printer/Savin-SLP38c_PS.xml
 share/foomatic/db/source/printer/Seiko-SLP-100.xml
 share/foomatic/db/source/printer/Seiko-SLP-200.xml
 share/foomatic/db/source/printer/Seiko-SLP-240.xml
+share/foomatic/db/source/printer/Seiko-SLP.xml
+share/foomatic/db/source/printer/Seiko-SLP_120.xml
+share/foomatic/db/source/printer/Seiko-SLP_220.xml
 share/foomatic/db/source/printer/Seiko-SLP_EZ30.xml
 share/foomatic/db/source/printer/Seiko-SLP_Plus.xml
 share/foomatic/db/source/printer/Seiko-SLP_Pro.xml
-share/foomatic/db/source/printer/Seiko-SLP_120.xml
-share/foomatic/db/source/printer/Seiko-SLP_220.xml
 share/foomatic/db/source/printer/Seiko-SpeedJET_200.xml
 share/foomatic/db/source/printer/Sharp-AJ-1800.xml
 share/foomatic/db/source/printer/Sharp-AJ-1805.xml
@@ -1706,30 +2144,32 @@ share/foomatic/db/source/printer/Sharp-AJ-2100.xml
 share/foomatic/db/source/printer/Sharp-AR-161.xml
 share/foomatic/db/source/printer/Sony-IJP-V100.xml
 share/foomatic/db/source/printer/Star-JJ-100.xml
-share/foomatic/db/source/printer/Star-LaserPrinter_8.xml
 share/foomatic/db/source/printer/Star-LC24-100.xml
 share/foomatic/db/source/printer/Star-LC24-200.xml
 share/foomatic/db/source/printer/Star-LC_90.xml
 share/foomatic/db/source/printer/Star-LS-04.xml
+share/foomatic/db/source/printer/Star-LaserPrinter_8.xml
 share/foomatic/db/source/printer/Star-NL-10.xml
 share/foomatic/db/source/printer/Star-NX-1001.xml
 share/foomatic/db/source/printer/Star-StarJet_48.xml
 share/foomatic/db/source/printer/Star-WinType_4000.xml
 share/foomatic/db/source/printer/Tally-MT908.xml
-share/foomatic/db/source/printer/Tektronix-Phaser_IISX.xml
-share/foomatic/db/source/printer/Tektronix-Phaser_PX.xml
-share/foomatic/db/source/printer/Tektronix-Phaser_350.xml
-share/foomatic/db/source/printer/Tektronix-Phaser_780.xml
-share/foomatic/db/source/printer/Tektronix-Phaser_850.xml
 share/foomatic/db/source/printer/Tektronix-3693d_color_printer_8-bit_mode.xml
 share/foomatic/db/source/printer/Tektronix-4693d_color_printer_2-bit_mode.xml
 share/foomatic/db/source/printer/Tektronix-4693d_color_printer_4-bit_mode.xml
 share/foomatic/db/source/printer/Tektronix-4695.xml
 share/foomatic/db/source/printer/Tektronix-4696.xml
 share/foomatic/db/source/printer/Tektronix-4697.xml
+share/foomatic/db/source/printer/Tektronix-Phaser_350.xml
+share/foomatic/db/source/printer/Tektronix-Phaser_780.xml
+share/foomatic/db/source/printer/Tektronix-Phaser_850.xml
+share/foomatic/db/source/printer/Tektronix-Phaser_IISX.xml
+share/foomatic/db/source/printer/Tektronix-Phaser_PX.xml
+share/foomatic/db/source/printer/Xerox-2700_XES.xml
+share/foomatic/db/source/printer/Xerox-3700_XES.xml
+share/foomatic/db/source/printer/Xerox-4045_XES.xml
 share/foomatic/db/source/printer/Xerox-Able_1406.xml
-share/foomatic/db/source/printer/Xerox-Document_Centre_400.xml
-share/foomatic/db/source/printer/Xerox-Document_Homecentre.xml
+share/foomatic/db/source/printer/Xerox-DocuPrint_4508.xml
 share/foomatic/db/source/printer/Xerox-DocuPrint_C11.xml
 share/foomatic/db/source/printer/Xerox-DocuPrint_C20.xml
 share/foomatic/db/source/printer/Xerox-DocuPrint_C55.xml
@@ -1739,25 +2179,23 @@ share/foomatic/db/source/printer/Xerox-DocuPrint_M750.xml
 share/foomatic/db/source/printer/Xerox-DocuPrint_M760.xml
 share/foomatic/db/source/printer/Xerox-DocuPrint_N17.xml
 share/foomatic/db/source/printer/Xerox-DocuPrint_N32.xml
-share/foomatic/db/source/printer/Xerox-DocuPrint_N4512PS.xml
 share/foomatic/db/source/printer/Xerox-DocuPrint_N4512.xml
-share/foomatic/db/source/printer/Xerox-DocuPrint_P1202.xml
+share/foomatic/db/source/printer/Xerox-DocuPrint_N4512PS.xml
 share/foomatic/db/source/printer/Xerox-DocuPrint_P12.xml
-share/foomatic/db/source/printer/Xerox-DocuPrint_P8e.xml
+share/foomatic/db/source/printer/Xerox-DocuPrint_P1202.xml
 share/foomatic/db/source/printer/Xerox-DocuPrint_P8.xml
+share/foomatic/db/source/printer/Xerox-DocuPrint_P8e.xml
 share/foomatic/db/source/printer/Xerox-DocuPrint_XJ6C.xml
 share/foomatic/db/source/printer/Xerox-DocuPrint_XJ8C.xml
-share/foomatic/db/source/printer/Xerox-DocuPrint_4508.xml
+share/foomatic/db/source/printer/Xerox-Document_Centre_400.xml
+share/foomatic/db/source/printer/Xerox-Document_Homecentre.xml
+share/foomatic/db/source/printer/Xerox-WorkCentre_385.xml
+share/foomatic/db/source/printer/Xerox-WorkCentre_450cp.xml
+share/foomatic/db/source/printer/Xerox-WorkCentre_470cx.xml
 share/foomatic/db/source/printer/Xerox-WorkCentre_XD120f.xml
 share/foomatic/db/source/printer/Xerox-WorkCentre_XE80.xml
 share/foomatic/db/source/printer/Xerox-WorkCentre_XE90fx.xml
 share/foomatic/db/source/printer/Xerox-WorkCentre_XK35c.xml
-share/foomatic/db/source/printer/Xerox-WorkCentre_385.xml
-share/foomatic/db/source/printer/Xerox-WorkCentre_450cp.xml
-share/foomatic/db/source/printer/Xerox-WorkCentre_470cx.xml
-share/foomatic/db/source/printer/Xerox-2700_XES.xml
-share/foomatic/db/source/printer/Xerox-3700_XES.xml
-share/foomatic/db/source/printer/Xerox-4045_XES.xml
 @dirrm share/foomatic/db/source/printer
 @dirrm share/foomatic/db/source/opt
 @dirrm share/foomatic/db/source/driver