Imported Upstream version 20070718dfsg

27 files changed, 1050 insertions, 35 deletions

diff --git a/foomatic-db/driver/foo2lava.xml b/foomatic-db/driver/foo2lava.xml
index 4adf7a2..8c29aa9 100644
--- a/foomatic-db/driver/foo2lava.xml
+++ b/foomatic-db/driver/foo2lava.xml
@@ -9,12 +9,16 @@
 
 	This is a driver developed for the Konica Minolta magicolor 2530 DL.
 
-	It also works with Konica Minolta magicolor 2490 MF (printer only).
+	It also works with the Konica Minolta magicolor 2480 MF,
+	the Konica Minolta magicolor 2490 MF, and the
+	Xerox Phaser 6115MFP (printer only).
 
     </en> </comments>
     <printers>
 	<printer><id>printer/KonicaMinolta-magicolor_2490_MF</id></printer>
 	<printer><id>printer/KonicaMinolta-magicolor_2530_DL</id></printer>
+	<printer><id>printer/Xerox-Phaser-6115MFP</id></printer>
+	<printer><id>printer/KonicaMinolta-magicolor_2480_MF</id></printer>
 	<printer><id>printer/Generic-GDI_Printer</id></printer>
     </printers>
 </driver>
diff --git a/foomatic-db/driver/foo2qpdl.xml b/foomatic-db/driver/foo2qpdl.xml
new file mode 100644
index 0000000..13a09b6
--- /dev/null
+++ b/foomatic-db/driver/foo2qpdl.xml
@@ -0,0 +1,22 @@
+<driver id="driver/foo2qpdl">
+    <name>foo2qpdl</name>
+    <url>http://foo2qpdl.rkkda.com/</url>
+    <execution>
+	<filter />
+	<prototype>foo2qpdl-wrapper %A</prototype>
+    </execution>
+    <comments> <en>
+
+	This is a driver developed for the Samsung CLP-300, CLP-600,
+	CLX-3160 (printer only), and the Xerox Phaser 6110 or Phaser
+	6110MFP (printer only).
+
+    </en> </comments>
+    <printers>
+	<printer><id>printer/Samsung-CLP-300</id></printer>
+	<printer><id>printer/Samsung-CLP-600</id></printer>
+	<printer><id>printer/Samsung-CLX-3160</id></printer>
+	<printer><id>printer/Xerox-Phaser-6110</id></printer>
+	<printer><id>printer/Generic-GDI_Printer</id></printer>
+    </printers>
+</driver>
diff --git a/foomatic-db/opt/foo2lava-ColorMode.xml b/foomatic-db/opt/foo2lava-ColorMode.xml
index 07cef3c..261321c 100644
--- a/foomatic-db/opt/foo2lava-ColorMode.xml
+++ b/foomatic-db/opt/foo2lava-ColorMode.xml
@@ -27,12 +27,50 @@
 	    <ev_driverval></ev_driverval>
 	</enum_val>
 	<enum_val id="ev/foo2lava-ColorMode-color">
-	    <ev_longname> <en>Color</en> </ev_longname>
+	    <ev_longname> <en>Color - Best Compromise</en> </ev_longname>
 	    <comments><en>
 		Prints in color using the best compromise setting.
 	    </en></comments>
 	    <ev_shortname> <en>Color</en> </ev_shortname>
-	    <ev_driverval>-c</ev_driverval>
+	    <ev_driverval>-c -C2</ev_driverval>
+	</enum_val>
+        <enum_val id="ev/foo2zjs-ColorMode-PhotoOnly">
+            <ev_longname> <en>Color - Photo Only</en> </ev_longname>
+            <comments><en>
+                Prints with full usage of color.
+                Black will be mixed with color toner.
+                Not useful for text or large black areas.
+            </en></comments>
+            <ev_shortname> <en>PhotoOnly</en> </ev_shortname>
+            <ev_driverval>-c -C1</ev_driverval>
+	</enum_val>
+        <enum_val id="ev/foo2zjs-ColorMode-PhotoAndText">
+            <ev_longname> <en>Color - Photos and Text</en> </ev_longname>
+            <comments><en>
+                Prints without adding color to black.
+                Makes sharp text and colorful photos.
+            </en></comments>
+            <ev_shortname> <en>PhotosAndText</en> </ev_shortname>
+            <ev_driverval>-c -C2</ev_driverval>
+	</enum_val>
+        <enum_val id="ev/foo2zjs-ColorMode-GraphicAndText">
+            <ev_longname> <en>Color - Graphics and Text</en> </ev_longname>
+            <comments><en>
+                Best mode for everyday printing.
+                Also usable for photos, but reduces color under black pixels.
+                Very dark areas will printed with black only.
+                Produces nice Gray without Color shining.
+            </en></comments>
+            <ev_shortname> <en>GraphicsAndText</en> </ev_shortname>
+            <ev_driverval>-c -C3</ev_driverval>
+	</enum_val>
+        <enum_val id="ev/foo2zjs-ColorMode-ICM">
+            <ev_longname> <en>Color - use ICM color profile</en> </ev_longname>
+            <comments><en>
+                Uses the selected ICM color profile file and intent.
+            </en></comments>
+            <ev_shortname> <en>ICM</en> </ev_shortname>
+            <ev_driverval>-c -C10</ev_driverval>
 	</enum_val>
     </enum_vals>
 </option>
diff --git a/foomatic-db/opt/foo2lava-ICM.xml b/foomatic-db/opt/foo2lava-ICM.xml
new file mode 100644
index 0000000..aa6a92a
--- /dev/null
+++ b/foomatic-db/opt/foo2lava-ICM.xml
@@ -0,0 +1,58 @@
+<option type="enum" id="opt/foo2lava-ICM">
+    <comments>
+	<en>
+	This option controls which .ICM file to use for color correction.
+	ICM files are stored in directory /usr/share/foo2lava/icm/.
+	</en>
+    </comments>
+    <arg_longname> <en>ICM Color Profile</en> </arg_longname>
+    <arg_shortname> <en>ICM</en> </arg_shortname>
+    <arg_execution>
+	<arg_group>Adjustment</arg_group>
+	<arg_order>300</arg_order>
+	<arg_spot>A</arg_spot>
+	<arg_required />
+	<arg_substitution />
+	<arg_proto>%s </arg_proto>
+    </arg_execution>
+    <constraints>
+	<constraint sense="true">
+	    <driver>foo2lava</driver>
+	    <arg_defval>ev/foo2lava-ICM-1</arg_defval>
+	</constraint>
+    </constraints>
+    <enum_vals>
+	<enum_val id="ev/foo2lava-ICM-none">
+	    <ev_longname> <en>No ICM color correction</en> </ev_longname>
+		<!-- A multilingual <comments> block can appear here, too;
+		 it should be treated as documentation for the user. -->
+	    <ev_shortname> <en>none</en> </ev_shortname>
+	    <ev_driverval>-Gnone.icm</ev_driverval>
+	</enum_val>
+
+	<enum_val id="ev/foo2lava-ICM-0">
+	    <ev_longname> <en>km2530_0 - Resolution 600</en> </ev_longname>
+		<!-- A multilingual <comments> block can appear here, too;
+		 it should be treated as documentation for the user. -->
+	    <ev_shortname> <en>km2530_0</en> </ev_shortname>
+	    <ev_driverval>-Gkm2530_0.icm</ev_driverval>
+	</enum_val>
+
+	<enum_val id="ev/foo2lava-ICM-1">
+	    <ev_longname> <en>km2530_1 - Resolution 1200</en> </ev_longname>
+		<!-- A multilingual <comments> block can appear here, too;
+		 it should be treated as documentation for the user. -->
+	    <ev_shortname> <en>km2530_1</en> </ev_shortname>
+	    <ev_driverval>-Gkm2530_1.icm</ev_driverval>
+	</enum_val>
+
+	<enum_val id="ev/foo2lava-ICM-2">
+	    <ev_longname> <en>km2530_2 - Resolution 2400</en> </ev_longname>
+		<!-- A multilingual <comments> block can appear here, too;
+		 it should be treated as documentation for the user. -->
+	    <ev_shortname> <en>km2530_2</en> </ev_shortname>
+	    <ev_driverval>-Gkm2530_2.icm</ev_driverval>
+	</enum_val>
+
+    </enum_vals>
+</option>
diff --git a/foomatic-db/opt/foo2lava-MediaType.xml b/foomatic-db/opt/foo2lava-MediaType.xml
index f3097f5..27543fa 100644
--- a/foomatic-db/opt/foo2lava-MediaType.xml
+++ b/foomatic-db/opt/foo2lava-MediaType.xml
@@ -14,14 +14,14 @@
     <constraints>
 	<constraint sense="true">
 	<driver>foo2lava</driver>
-	<arg_defval>ev/foo2lava-MediaType-1</arg_defval>
+	<arg_defval>ev/foo2lava-MediaType-0</arg_defval>
 	</constraint>
     </constraints>
     <enum_vals>
-	<enum_val id="ev/foo2lava-MediaType-1">
+	<enum_val id="ev/foo2lava-MediaType-0">
 	    <ev_longname> <en>Plain Paper</en> </ev_longname>
 	    <ev_shortname> <en>plain</en> </ev_shortname>
-	    <ev_driverval>1</ev_driverval>
+	    <ev_driverval>0</ev_driverval>
 	</enum_val>
 	<enum_val id="ev/foo2lava-MediaType-4">
 	    <ev_longname> <en>Transparency</en> </ev_longname>
diff --git a/foomatic-db/opt/foo2lava-PageSize.xml b/foomatic-db/opt/foo2lava-PageSize.xml
index d2aebc0..b6c29cd 100644
--- a/foomatic-db/opt/foo2lava-PageSize.xml
+++ b/foomatic-db/opt/foo2lava-PageSize.xml
@@ -88,5 +88,10 @@
 	    <ev_shortname> <en>Photo10x15</en> </ev_shortname>
 	    <ev_driverval>837</ev_driverval>
 	</enum_val>
+	<enum_val id="ev/foo2lava-PageSize-Custom">
+	    <ev_longname> <en>Custom</en> </ev_longname>
+	    <ev_shortname> <en>Custom</en> </ev_shortname>
+	    <ev_driverval>Custom.%0x%1</ev_driverval>
+	</enum_val>
     </enum_vals>
 </option>
diff --git a/foomatic-db/opt/foo2lava-PrinterType.xml b/foomatic-db/opt/foo2lava-PrinterType.xml
new file mode 100644
index 0000000..2efa638
--- /dev/null
+++ b/foomatic-db/opt/foo2lava-PrinterType.xml
@@ -0,0 +1,62 @@
+<option type="enum" id="opt/foo2lava-PrinterType">
+    <!-- A multilingual <comments> block can appear here, too;
+       it should be treated as documentation for the user. -->
+    <arg_longname> <en>Printer Type</en> </arg_longname>
+    <arg_shortname> <en>PrinterType</en> </arg_shortname>
+    <arg_execution>
+	<arg_group>General</arg_group>
+	<arg_order>110</arg_order>
+	<arg_spot>A</arg_spot>
+	<arg_required />
+	<arg_substitution />
+	<arg_proto>%s </arg_proto>
+    </arg_execution>
+    <constraints>
+	<constraint sense="true">
+	    <driver>foo2lava</driver>
+	    <arg_defval>ev/foo2lava-PrinterType-lavaflow</arg_defval>
+	</constraint>
+	<constraint sense="true">
+	    <make>KonicaMinolta</make>
+	    <model>magicolor 2480 MF</model>
+	    <driver>foo2lava</driver>
+	    <arg_defval>ev/foo2lava-PrinterType-opl</arg_defval>
+	</constraint>
+    </constraints>
+    <enum_vals>
+	<enum_val id="ev/foo2lava-PrinterType-lavaflow">
+	    <ev_longname> <en>LAVAFLOW printer</en> </ev_longname>
+		<!-- A multilingual <comments> block can appear here, too;
+		 it should be treated as documentation for the user. -->
+	    <ev_shortname> <en>lavaflow</en> </ev_shortname>
+	    <ev_driverval>-z0</ev_driverval>
+	    <constraints>
+	        <constraint sense="true">
+		    <driver>foo2lava</driver>
+	        </constraint>
+	        <constraint sense="false">
+		    <driver>foo2lava</driver>
+	    	    <make>KonicaMinolta</make>
+	    	    <model>magicolor 2480 MF</model>
+	        </constraint>
+	    </constraints>
+	</enum_val>
+	<enum_val id="ev/foo2lava-PrinterType-opl">
+	    <ev_longname> <en>OPL printer</en> </ev_longname>
+		<!-- A multilingual <comments> block can appear here, too;
+		 it should be treated as documentation for the user. -->
+	    <ev_shortname> <en>opl</en> </ev_shortname>
+	    <ev_driverval>-z1</ev_driverval>
+	    <constraints>
+	        <constraint sense="false">
+		    <driver>foo2lava</driver>
+	        </constraint>
+	        <constraint sense="true">
+		    <driver>foo2lava</driver>
+	    	    <make>KonicaMinolta</make>
+	    	    <model>magicolor 2480 MF</model>
+	        </constraint>
+	    </constraints>
+	</enum_val>
+    </enum_vals>
+</option>
diff --git a/foomatic-db/opt/foo2qpdl-ColorMode.xml b/foomatic-db/opt/foo2qpdl-ColorMode.xml
new file mode 100644
index 0000000..734f65a
--- /dev/null
+++ b/foomatic-db/opt/foo2qpdl-ColorMode.xml
@@ -0,0 +1,38 @@
+<option type="enum" id="opt/foo2qpdl-ColorMode">
+    <!-- A multilingual <comments> block can appear here, too;
+       it should be treated as documentation for the user. -->
+    <arg_longname> <en>Color Mode</en> </arg_longname>
+    <arg_shortname> <en>ColorMode</en> </arg_shortname>
+    <arg_execution>
+	<arg_group>General</arg_group>
+	<arg_order>120</arg_order>
+	<arg_spot>A</arg_spot>
+	<arg_required />
+	<arg_substitution />
+	<arg_proto>%s </arg_proto>
+    </arg_execution>
+    <constraints>
+	<constraint sense="true">
+	<driver>foo2qpdl</driver>
+	<arg_defval>ev/foo2qpdl-ColorMode-mono</arg_defval>
+	</constraint>
+    </constraints>
+    <enum_vals>
+	<enum_val id="ev/foo2qpdl-ColorMode-mono">
+	    <ev_longname> <en>Monochrome</en> </ev_longname>
+	    <comments><en>
+		Prints in monochrome only
+	    </en></comments>
+	    <ev_shortname> <en>Monochrome</en> </ev_shortname>
+	    <ev_driverval></ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-ColorMode-color">
+	    <ev_longname> <en>Color</en> </ev_longname>
+	    <comments><en>
+		Prints in color using the best compromise setting.
+	    </en></comments>
+	    <ev_shortname> <en>Color</en> </ev_shortname>
+	    <ev_driverval>-c</ev_driverval>
+	</enum_val>
+    </enum_vals>
+</option>
diff --git a/foomatic-db/opt/foo2qpdl-Duplex.xml b/foomatic-db/opt/foo2qpdl-Duplex.xml
new file mode 100644
index 0000000..c861f23
--- /dev/null
+++ b/foomatic-db/opt/foo2qpdl-Duplex.xml
@@ -0,0 +1,37 @@
+<option type="enum" id="opt/foo2qpdl-Duplex">
+    <!-- A multilingual <comments> block can appear here, too;
+       it should be treated as documentation for the user. -->
+    <arg_longname> <en>Duplex Printing</en> </arg_longname>
+    <arg_shortname> <en>Duplex</en> </arg_shortname>
+    <arg_execution>
+        <arg_group>General</arg_group>
+	<arg_order>210</arg_order>
+	<arg_spot>A</arg_spot>
+	<arg_required />
+	<arg_substitution />
+	<arg_proto>-d%s </arg_proto>
+    </arg_execution>
+    <constraints>
+	<constraint sense="true">
+	    <driver>foo2qpdl</driver>
+	    <arg_defval>ev/foo2qpdl-Duplex-1</arg_defval>
+	</constraint>
+    </constraints>
+    <enum_vals>
+	<enum_val id="ev/foo2qpdl-Duplex-1">
+	    <ev_longname> <en>Off</en> </ev_longname>
+	    <ev_shortname> <en>None</en> </ev_shortname>
+	    <ev_driverval>1</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-Duplex-4">
+	    <ev_longname> <en>Long Edge (Standard)</en> </ev_longname>
+	    <ev_shortname> <en>DuplexNoTumble</en> </ev_shortname>
+	    <ev_driverval>4</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-Duplex-5">
+	    <ev_longname> <en>Short Edge (Flip)</en> </ev_longname>
+	    <ev_shortname> <en>DuplexTumble</en> </ev_shortname>
+	    <ev_driverval>5</ev_driverval>
+	</enum_val>
+    </enum_vals>
+</option>
diff --git a/foomatic-db/opt/foo2qpdl-ICM.xml b/foomatic-db/opt/foo2qpdl-ICM.xml
new file mode 100644
index 0000000..1633381
--- /dev/null
+++ b/foomatic-db/opt/foo2qpdl-ICM.xml
@@ -0,0 +1,89 @@
+<option type="enum" id="opt/foo2qpdl-ICM">
+    <comments>
+	<en>
+	This option controls which .ICM file to use for color correction.
+	ICM files are stored in directory /usr/share/foo2qpdl/icm/.
+	</en>
+    </comments>
+    <arg_longname> <en>ICM Color Profile</en> </arg_longname>
+    <arg_shortname> <en>ICM</en> </arg_shortname>
+    <arg_execution>
+	<arg_group>Adjustment</arg_group>
+	<arg_order>300</arg_order>
+	<arg_spot>A</arg_spot>
+	<arg_required />
+	<arg_substitution />
+	<arg_proto>%s </arg_proto>
+    </arg_execution>
+    <constraints>
+	<constraint sense="true">
+	    <driver>foo2qpdl</driver>
+	    <arg_defval>ev/foo2qpdl-ICM-none</arg_defval>
+	</constraint>
+	<constraint sense="true">
+	    <make>Samsung</make>
+	    <model>CLP-300</model>
+	    <driver>foo2qpdl</driver>
+	    <arg_defval>ev/foo2qpdl-ICM-300</arg_defval>
+	</constraint>
+	<constraint sense="true">
+	    <make>Samsung</make>
+	    <model>CLX-3160</model>
+	    <driver>foo2qpdl</driver>
+	    <arg_defval>ev/foo2qpdl-ICM-3160</arg_defval>
+	</constraint>
+	<constraint sense="true">
+	    <make>Xerox</make>
+	    <model>Phaser 6110</model>
+	    <driver>foo2qpdl</driver>
+	    <arg_defval>ev/foo2qpdl-ICM-6110</arg_defval>
+	</constraint>
+	<constraint sense="true">
+	    <make>Samsung</make>
+	    <model>CLP-600</model>
+	    <driver>foo2qpdl</driver>
+	    <arg_defval>ev/foo2qpdl-ICM-600</arg_defval>
+	</constraint>
+    </constraints>
+    <enum_vals>
+	<enum_val id="ev/foo2qpdl-ICM-none">
+	    <ev_longname> <en>No ICM color correction</en> </ev_longname>
+		<!-- A multilingual <comments> block can appear here, too;
+		 it should be treated as documentation for the user. -->
+	    <ev_shortname> <en>none</en> </ev_shortname>
+	    <ev_driverval>-C10 -Gnone.icm</ev_driverval>
+	</enum_val>
+
+	<enum_val id="ev/foo2qpdl-ICM-300">
+	    <ev_longname> <en>CLP-300</en> </ev_longname>
+		<!-- A multilingual <comments> block can appear here, too;
+		 it should be treated as documentation for the user. -->
+	    <ev_shortname> <en>clp300</en> </ev_shortname>
+	    <ev_driverval>-C10 -Gsamclp300-0.icm</ev_driverval>
+	</enum_val>
+
+	<enum_val id="ev/foo2qpdl-ICM-3160">
+	    <ev_longname> <en>CLX-3160</en> </ev_longname>
+		<!-- A multilingual <comments> block can appear here, too;
+		 it should be treated as documentation for the user. -->
+	    <ev_shortname> <en>clx3160</en> </ev_shortname>
+	    <ev_driverval>-C10 -Gsamclp300-0.icm</ev_driverval>
+	</enum_val>
+
+	<enum_val id="ev/foo2qpdl-ICM-6110">
+	    <ev_longname> <en>Phaser 6110</en> </ev_longname>
+		<!-- A multilingual <comments> block can appear here, too;
+		 it should be treated as documentation for the user. -->
+	    <ev_shortname> <en>ph6110</en> </ev_shortname>
+	    <ev_driverval>-C10 -Gsamclp300-0.icm</ev_driverval>
+	</enum_val>
+
+	<enum_val id="ev/foo2qpdl-ICM-600">
+	    <ev_longname> <en>CLP-600</en> </ev_longname>
+		<!-- A multilingual <comments> block can appear here, too;
+		 it should be treated as documentation for the user. -->
+	    <ev_shortname> <en>clp600</en> </ev_shortname>
+	    <ev_driverval>-z1</ev_driverval>
+	</enum_val>
+    </enum_vals>
+</option>
diff --git a/foomatic-db/opt/foo2qpdl-InputSlot.xml b/foomatic-db/opt/foo2qpdl-InputSlot.xml
new file mode 100644
index 0000000..ae44381
--- /dev/null
+++ b/foomatic-db/opt/foo2qpdl-InputSlot.xml
@@ -0,0 +1,42 @@
+<option type="enum" id="opt/foo2qpdl-InputSlot">
+    <!-- A multilingual <comments> block can appear here, too;
+       it should be treated as documentation for the user. -->
+    <arg_longname> <en>Media Source</en> </arg_longname>
+    <arg_shortname> <en>InputSlot</en> </arg_shortname>
+    <arg_execution>
+        <arg_group>General</arg_group>
+	<arg_order>150</arg_order>
+	<arg_spot>A</arg_spot>
+	<arg_required />
+	<arg_substitution />
+	<arg_proto>-s%s </arg_proto>
+    </arg_execution>
+    <constraints>
+	<constraint sense="true">
+	<driver>foo2qpdl</driver>
+	<arg_defval>ev/foo2qpdl-InputSlot-1</arg_defval>
+	</constraint>
+    </constraints>
+    <enum_vals>
+	<enum_val id="ev/foo2qpdl-InputSlot-1">
+	    <ev_longname> <en>Auto Select</en> </ev_longname>
+	    <ev_shortname> <en>Auto</en> </ev_shortname>
+	    <ev_driverval>1</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-InputSlot-2">
+	    <ev_longname> <en>Manual Select</en> </ev_longname>
+	    <ev_shortname> <en>Manual</en> </ev_shortname>
+	    <ev_driverval>2</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-InputSlot-3">
+	    <ev_longname> <en>Multipurpose</en> </ev_longname>
+	    <ev_shortname> <en>Multi</en> </ev_shortname>
+	    <ev_driverval>3</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-InputSlot-4">
+	    <ev_longname> <en>Tray 1</en> </ev_longname>
+	    <ev_shortname> <en>Tray1</en> </ev_shortname>
+	    <ev_driverval>4</ev_driverval>
+	</enum_val>
+    </enum_vals>
+</option>
diff --git a/foomatic-db/opt/foo2qpdl-MediaType.xml b/foomatic-db/opt/foo2qpdl-MediaType.xml
new file mode 100644
index 0000000..2ce043a
--- /dev/null
+++ b/foomatic-db/opt/foo2qpdl-MediaType.xml
@@ -0,0 +1,87 @@
+<option type="enum" id="opt/foo2qpdl-MediaType">
+    <!-- A multilingual <comments> block can appear here, too;
+       it should be treated as documentation for the user. -->
+    <arg_longname> <en>Media Type</en> </arg_longname>
+    <arg_shortname> <en>MediaType</en> </arg_shortname>
+    <arg_execution>
+	<arg_group>General</arg_group>
+	<arg_order>150</arg_order>
+	<arg_spot>A</arg_spot>
+	<arg_required />
+	<arg_substitution />
+	<arg_proto>-m%s </arg_proto>
+    </arg_execution>
+    <constraints>
+	<constraint sense="true">
+	<driver>foo2qpdl</driver>
+	<arg_defval>ev/foo2qpdl-MediaType-0</arg_defval>
+	</constraint>
+    </constraints>
+    <enum_vals>
+	<enum_val id="ev/foo2qpdl-MediaType-0">
+	    <ev_longname> <en>Plain Paper</en> </ev_longname>
+	    <ev_shortname> <en>plain</en> </ev_shortname>
+	    <ev_driverval>0</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-MediaType-1">
+	    <ev_longname> <en>Thick Stock</en> </ev_longname>
+	    <ev_shortname> <en>thick</en> </ev_shortname>
+	    <ev_driverval>1</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-MediaType-2">
+	    <ev_longname> <en>Thin Stock</en> </ev_longname>
+	    <ev_shortname> <en>thin</en> </ev_shortname>
+	    <ev_driverval>2</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-MediaType-3">
+	    <ev_longname> <en>Bond</en> </ev_longname>
+	    <ev_shortname> <en>bond</en> </ev_shortname>
+	    <ev_driverval>3</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-MediaType-4">
+	    <ev_longname> <en>Color Paper</en> </ev_longname>
+	    <ev_shortname> <en>color</en> </ev_shortname>
+	    <ev_driverval>4</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-MediaType-5">
+	    <ev_longname> <en>Card Stock</en> </ev_longname>
+	    <ev_shortname> <en>card</en> </ev_shortname>
+	    <ev_driverval>5</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-MediaType-6">
+	    <ev_longname> <en>Labels</en> </ev_longname>
+	    <ev_shortname> <en>labels</en> </ev_shortname>
+	    <ev_driverval>6</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-MediaType-7">
+	    <ev_longname> <en>Envelope</en> </ev_longname>
+	    <ev_shortname> <en>envelope</en> </ev_shortname>
+	    <ev_driverval>7</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-MediaType-8">
+	    <ev_longname> <en>Preprinted</en> </ev_longname>
+	    <ev_shortname> <en>preprinted</en> </ev_shortname>
+	    <ev_driverval>8</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-MediaType-9">
+	    <ev_longname> <en>Cotton</en> </ev_longname>
+	    <ev_shortname> <en>cotton</en> </ev_shortname>
+	    <ev_driverval>9</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-MediaType-10">
+	    <ev_longname> <en>Recycled Paper</en> </ev_longname>
+	    <ev_shortname> <en>recycled</en> </ev_shortname>
+	    <ev_driverval>10</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-MediaType-11">
+	    <ev_longname> <en>Transparency</en> </ev_longname>
+	    <ev_shortname> <en>transparency</en> </ev_shortname>
+	    <ev_driverval>11</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-MediaType-12">
+	    <ev_longname> <en>Archive Paper</en> </ev_longname>
+	    <ev_shortname> <en>archive</en> </ev_shortname>
+	    <ev_driverval>12</ev_driverval>
+	</enum_val>
+    </enum_vals>
+</option>
diff --git a/foomatic-db/opt/foo2qpdl-PageSize.xml b/foomatic-db/opt/foo2qpdl-PageSize.xml
new file mode 100644
index 0000000..c026b34
--- /dev/null
+++ b/foomatic-db/opt/foo2qpdl-PageSize.xml
@@ -0,0 +1,112 @@
+<option type="enum" id="opt/foo2qpdl-PageSize">
+    <arg_longname> <en>Page Size</en> </arg_longname>
+    <arg_shortname> <en>PageSize</en> </arg_shortname>
+    <arg_execution>
+	<arg_group>General</arg_group>
+	<arg_order>135</arg_order>
+	<arg_spot>A</arg_spot>
+	<arg_required />
+	<arg_substitution />
+	<arg_proto>-p%s </arg_proto>
+    </arg_execution>
+    <constraints>
+	<constraint sense="true">
+	<driver>foo2qpdl</driver>
+	<arg_defval>ev/foo2qpdl-PageSize-0</arg_defval>
+	</constraint>
+    </constraints>
+    <enum_vals>
+	<enum_val id="ev/foo2qpdl-PageSize-0">
+	    <ev_longname> <en>Letter</en> </ev_longname>
+	    <ev_shortname> <en>Letter</en> </ev_shortname>
+	    <ev_driverval>0</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-PageSize-1">
+	    <ev_longname> <en>Legal</en> </ev_longname>
+	    <ev_shortname> <en>Legal</en> </ev_shortname>
+	    <ev_driverval>1</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-PageSize-2">
+	    <ev_longname> <en>A4</en> </ev_longname>
+	    <ev_shortname> <en>A4</en> </ev_shortname>
+	    <ev_driverval>2</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-PageSize-3">
+	    <ev_longname> <en>Executive</en> </ev_longname>
+	    <ev_shortname> <en>Executive</en> </ev_shortname>
+	    <ev_driverval>3</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-PageSize-16">
+	    <ev_longname> <en>A5</en> </ev_longname>
+	    <ev_shortname> <en>A5</en> </ev_shortname>
+	    <ev_driverval>16</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-PageSize-11">
+	    <ev_longname> <en>B5 (JIS)</en> </ev_longname>
+	    <ev_shortname> <en>B5jis</en> </ev_shortname>
+	    <ev_driverval>11</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-PageSize-12">
+	    <ev_longname> <en>B5 (ISO)</en> </ev_longname>
+	    <ev_shortname> <en>B5iso</en> </ev_shortname>
+	    <ev_driverval>12</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-PageSize-7">
+	    <ev_longname> <en>Env Monarch</en> </ev_longname>
+	    <ev_shortname> <en>EnvMonarch</en> </ev_shortname>
+	    <ev_driverval>7</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-PageSize-6">
+	    <ev_longname> <en>Env #10</en> </ev_longname>
+	    <ev_shortname> <en>Env10</en> </ev_shortname>
+	    <ev_driverval>6</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-PageSize-9">
+	    <ev_longname> <en>Env DL</en> </ev_longname>
+	    <ev_shortname> <en>EnvDL</en> </ev_shortname>
+	    <ev_driverval>9</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-PageSize-8">
+	    <ev_longname> <en>Env C5</en> </ev_longname>
+	    <ev_shortname> <en>EnvC5</en> </ev_shortname>
+	    <ev_driverval>8</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-PageSize-17">
+	    <ev_longname> <en>A6</en> </ev_longname>
+	    <ev_shortname> <en>A6</en> </ev_shortname>
+	    <ev_driverval>17</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-PageSize-23">
+	    <ev_longname> <en>Env C6</en> </ev_longname>
+	    <ev_shortname> <en>EnvC6</en> </ev_shortname>
+	    <ev_driverval>23</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-PageSize-24">
+	    <ev_longname> <en>Folio</en> </ev_longname>
+	    <ev_shortname> <en>Folio</en> </ev_shortname>
+	    <ev_driverval>24</ev_driverval>
+	</enum_val>
+    <!-- A multilingual <comments> block can appear here, too;
+	<enum_val id="ev/foo2qpdl-PageSize-25">
+	    <ev_longname> <en>Env 6.75</en> </ev_longname>
+	    <ev_shortname> <en>Env6.75</en> </ev_shortname>
+	    <ev_driverval>25</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-PageSize-26">
+	    <ev_longname> <en>Env #9</en> </ev_longname>
+	    <ev_shortname> <en>Env9</en> </ev_shortname>
+	    <ev_driverval>26</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-PageSize-28">
+	    <ev_longname> <en>Oficio</en> </ev_longname>
+	    <ev_shortname> <en>Oficio</en> </ev_shortname>
+	    <ev_driverval>28</ev_driverval>
+	</enum_val>
+       it should be treated as documentation for the user. -->
+	<enum_val id="ev/foo2qpdl-PageSize-Custom">
+	    <ev_longname> <en>Custom</en> </ev_longname>
+	    <ev_shortname> <en>Custom</en> </ev_shortname>
+	    <ev_driverval>Custom.%0x%1</ev_driverval>
+	</enum_val>
+    </enum_vals>
+</option>
diff --git a/foomatic-db/opt/foo2qpdl-Quality.xml b/foomatic-db/opt/foo2qpdl-Quality.xml
new file mode 100644
index 0000000..01d645c
--- /dev/null
+++ b/foomatic-db/opt/foo2qpdl-Quality.xml
@@ -0,0 +1,32 @@
+<option type="enum" id="opt/foo2qpdl-Quality">
+    <!-- A multilingual <comments> block can appear here, too;
+       it should be treated as documentation for the user. -->
+    <arg_longname> <en>Printing Quality</en> </arg_longname>
+    <arg_shortname> <en>Quality</en> </arg_shortname>
+    <arg_execution>
+        <arg_group>General</arg_group>
+	<arg_order>110</arg_order>
+	<arg_spot>A</arg_spot>
+	<arg_required />
+	<arg_substitution />
+	<arg_proto> %s </arg_proto>
+    </arg_execution>
+    <constraints>
+	<constraint sense="true">
+	<driver>foo2qpdl</driver>
+	<arg_defval>ev/foo2qpdl-Quality-Normal</arg_defval>
+	</constraint>
+    </constraints>
+    <enum_vals>
+	<enum_val id="ev/foo2qpdl-Quality-Normal">
+	    <ev_longname> <en>Normal</en> </ev_longname>
+	    <ev_shortname> <en>normal</en> </ev_shortname>
+	    <ev_driverval></ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-Quality-Draft">
+	    <ev_longname> <en>Draft</en> </ev_longname>
+	    <ev_shortname> <en>draft</en> </ev_shortname>
+	    <ev_driverval>-t </ev_driverval>
+	</enum_val>
+    </enum_vals>
+</option>
diff --git a/foomatic-db/opt/foo2qpdl-Resolution.xml b/foomatic-db/opt/foo2qpdl-Resolution.xml
new file mode 100644
index 0000000..f87bb88
--- /dev/null
+++ b/foomatic-db/opt/foo2qpdl-Resolution.xml
@@ -0,0 +1,43 @@
+<option type="enum" id="opt/foo2qpdl-Resolution">
+    <!-- A multilingual <comments> block can appear here, too;
+       it should be treated as documentation for the user. -->
+    <arg_longname> <en>Resolution</en> </arg_longname>
+    <arg_shortname> <en>Resolution</en> </arg_shortname>
+    <arg_execution>
+	<arg_group>General</arg_group>
+	<arg_order>130</arg_order>
+	<arg_spot>A</arg_spot>
+	<arg_required />
+	<arg_substitution />
+	<arg_proto>-r%s </arg_proto>
+    </arg_execution>
+    <constraints>
+	<constraint sense="true">
+	    <driver>foo2qpdl</driver>
+	    <arg_defval>ev/foo2qpdl-Resolution-1200x600</arg_defval>
+	</constraint>
+    </constraints>
+    <enum_vals>
+	<enum_val id="ev/foo2qpdl-Resolution-600x600">
+	    <ev_longname> <en>600x600 dpi</en> </ev_longname>
+		<!-- A multilingual <comments> block can appear here, too;
+		 it should be treated as documentation for the user. -->
+	    <ev_shortname> <en>600x600dpi</en> </ev_shortname>
+	    <ev_driverval>600x600</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-Resolution-1200x600">
+	    <ev_longname> <en>1200x600 dpi</en> </ev_longname>
+		<!-- A multilingual <comments> block can appear here, too;
+		 it should be treated as documentation for the user. -->
+	    <ev_shortname> <en>1200x600dpi</en> </ev_shortname>
+	    <ev_driverval>1200x600</ev_driverval>
+	</enum_val>
+	<enum_val id="ev/foo2qpdl-Resolution-1200x1200">
+	    <ev_longname> <en>1200x1200 dpi</en> </ev_longname>
+		<!-- A multilingual <comments> block can appear here, too;
+		 it should be treated as documentation for the user. -->
+	    <ev_shortname> <en>1200x1200dpi</en> </ev_shortname>
+	    <ev_driverval>1200x1200</ev_driverval>
+	</enum_val>
+    </enum_vals>
+</option>
diff --git a/foomatic-db/opt/foo2zjs-ColorMode.xml b/foomatic-db/opt/foo2zjs-ColorMode.xml
index afef585..ea65a1a 100644
--- a/foomatic-db/opt/foo2zjs-ColorMode.xml
+++ b/foomatic-db/opt/foo2zjs-ColorMode.xml
@@ -51,31 +51,6 @@
 	        </constraint>
             </constraints>
 	</enum_val>
-	<enum_val id="ev/foo2zjs-ColorMode-color">
-	    <ev_longname> <en>Color</en> </ev_longname>
-	    <comments><en>
-		Prints in color using the best compromise setting.
-	    </en></comments>
-	    <ev_shortname> <en>Color</en> </ev_shortname>
-	    <ev_driverval>-c</ev_driverval>
-	    <constraints>
-	        <constraint sense="false">
-	    	    <make>HP</make> <model>LaserJet 1000</model>
-	        </constraint>
-	        <constraint sense="false">
-	    	    <make>HP</make> <model>LaserJet 1005</model>
-	        </constraint>
-	        <constraint sense="false">
-	    	    <make>HP</make> <model>LaserJet 1018</model>
-	        </constraint>
-	        <constraint sense="false">
-	    	    <make>HP</make> <model>LaserJet 1020</model>
-	        </constraint>
-	        <constraint sense="false">
-	    	    <make>HP</make> <model>LaserJet 1022</model>
-	        </constraint>
-            </constraints>
-	</enum_val>
 	<enum_val id="ev/foo2zjs-ColorMode-PhotoOnly">
 	    <ev_longname> <en>Color - Photo Only</en> </ev_longname>
 	    <comments><en>
diff --git a/foomatic-db/opt/foo2zjs-Copies.xml b/foomatic-db/opt/foo2zjs-Copies.xml
index 29a1c1b..adecfaf 100644
--- a/foomatic-db/opt/foo2zjs-Copies.xml
+++ b/foomatic-db/opt/foo2zjs-Copies.xml
@@ -32,6 +32,10 @@
 	<driver>foo2lava</driver>
 	<arg_defval>1</arg_defval>
 	</constraint>
+	<constraint sense="true">
+	<driver>foo2qpdl</driver>
+	<arg_defval>1</arg_defval>
+	</constraint>
     </constraints>
     <arg_max>100</arg_max>
     <arg_min>1</arg_min>
diff --git a/foomatic-db/opt/foo2zjs-Nup.xml b/foomatic-db/opt/foo2zjs-Nup.xml
index 1c720ec..660d288 100644
--- a/foomatic-db/opt/foo2zjs-Nup.xml
+++ b/foomatic-db/opt/foo2zjs-Nup.xml
@@ -32,6 +32,10 @@
 	<driver>foo2lava</driver>
 	<arg_defval>ev/foo2oakzjs-Nup-1</arg_defval>
 	</constraint>
+	<constraint sense="true">
+	<driver>foo2qpdl</driver>
+	<arg_defval>ev/foo2oakzjs-Nup-1</arg_defval>
+	</constraint>
     </constraints>
     <enum_vals>
 	<enum_val id="ev/foo2oakzjs-Nup-1">
diff --git a/foomatic-db/opt/foo2zjs-NupOrient.xml b/foomatic-db/opt/foo2zjs-NupOrient.xml
index 7b99d56..6a3bb2a 100644
--- a/foomatic-db/opt/foo2zjs-NupOrient.xml
+++ b/foomatic-db/opt/foo2zjs-NupOrient.xml
@@ -32,6 +32,10 @@
 	<driver>foo2lava</driver>
 	<arg_defval>ev/foo2oakzjs-NupOrient-port</arg_defval>
 	</constraint>
+	<constraint sense="true">
+	<driver>foo2qpdl</driver>
+	<arg_defval>ev/foo2oakzjs-NupOrient-port</arg_defval>
+	</constraint>
     </constraints>
     <enum_vals>
 	<enum_val id="ev/foo2oakzjs-NupOrient-port">
diff --git a/foomatic-db/opt/foo2zjs-PageSize.xml b/foomatic-db/opt/foo2zjs-PageSize.xml
index d6b8546..9be1947 100644
--- a/foomatic-db/opt/foo2zjs-PageSize.xml
+++ b/foomatic-db/opt/foo2zjs-PageSize.xml
@@ -85,5 +85,10 @@
 	    <ev_shortname> <en>EnvMonarch</en> </ev_shortname>
 	    <ev_driverval>37</ev_driverval>
 	</enum_val>
+	<enum_val id="ev/foo2oakzjs-PageSize-Custom">
+	    <ev_longname> <en>Custom</en> </ev_longname>
+	    <ev_shortname> <en>Custom</en> </ev_shortname>
+	    <ev_driverval>Custom.%0x%1</ev_driverval>
+	</enum_val>
     </enum_vals>
 </option>
diff --git a/foomatic-db/printer/KonicaMinolta-magicolor_2480_MF.xml b/foomatic-db/printer/KonicaMinolta-magicolor_2480_MF.xml
new file mode 100644
index 0000000..4ce6181
--- /dev/null
+++ b/foomatic-db/printer/KonicaMinolta-magicolor_2480_MF.xml
@@ -0,0 +1,61 @@
+<printer id="printer/KonicaMinolta-magicolor_2480_MF">
+    <make>KonicaMinolta</make>
+    <model>magicolor 2480 MF</model>
+    <mechanism>
+	<laser/>
+	<color/>
+	<resolution>
+	    <dpi>
+		<x>2400</x>
+		<y>600</y>
+	    </dpi>
+	</resolution>
+	<margins>
+	    <general>
+		<unit>mm</unit>
+		<top>4</top>
+		<bottom>4</bottom>
+		<left>4</left>
+		<right>4</right>
+	    </general>
+	</margins>
+	<consumables>
+	    <comments> <en>
+		Toner Black (4500 prints) - $79
+		Toner Yellow (4500 prints) - $119
+		Toner Magenta (4500 prints) - $119
+		Toner Cyan (4500 prints) - $119
+		Drum Catridge (45000 prints) - $149
+	    </en> </comments>
+	    <partno>1710587-004</partno>
+	    <partno>1710587-005</partno>
+	    <partno>1710587-006</partno>
+	    <partno>1710587-007</partno>
+	    <partno>1710591-001</partno>
+	</consumables>
+    </mechanism>
+    <url>http://www.minolta-qms.com/products/mfp/mc2480MF/index.asp</url>
+    <lang>
+	<proprietary/>
+	<!--no pjl--><!--No "text"?-->
+    </lang>
+    <autodetect>
+	<parallel>
+	    <ieee1284>CLASS:PRINTER;MODEL:magicolor 2480 MF;MANUFACTURER:KONICA MINOLTA;COMMAND SET:ZJS,PJL;</ieee1284>
+	    <manufacturer>KONICA MINOLTA</manufacturer>
+	    <model>magicolor 2480 MF</model>
+	    <commandset>ZJS,PJL</commandset>
+	</parallel>
+	<snmp>
+	    <description>KONICA MINOLTA magicolor 2480 MF</description>
+	</snmp>
+    </autodetect>
+    <functionality>B</functionality>
+    <driver>foo2lava</driver>
+    <!--not "unverified"--><!--no "contrib_url"-->
+    <comments> <en>
+	The magicolor 2480 MF is a network color all-in-one printer/scanner.
+	The printer *only* is supported by the foo2lava open software printer
+	driver.
+    </en> </comments>
+</printer>
diff --git a/foomatic-db/printer/KonicaMinolta-magicolor_2530_DL.xml b/foomatic-db/printer/KonicaMinolta-magicolor_2530_DL.xml
index 9b20bd3..9578579 100644
--- a/foomatic-db/printer/KonicaMinolta-magicolor_2530_DL.xml
+++ b/foomatic-db/printer/KonicaMinolta-magicolor_2530_DL.xml
@@ -25,7 +25,7 @@
 		Toner Yellow (4500 prints) - $119
 		Toner Magenta (4500 prints) - $119
 		Toner Cyan (4500 prints) - $119
-		Drum Catridge (45000 prints) - $149
+		Drum Cartridge (45000 prints) - $149
 	    </en> </comments>
 	    <partno>1710587-004</partno>
 	    <partno>1710587-005</partno>
@@ -41,10 +41,10 @@
     </lang>
     <autodetect>
 	<parallel>
-	    <ieee1284>CLASS:PRINTER;MODEL:magicolor 2530 DL;MANUFACTURER:KONICA MINOLTA;COMMAND SET:ZJS,PJL;</ieee1284>
+	    <ieee1284>MFG:KONICA MINOLTA;CMD:ZJS,PJL,LAVAFLOW;MDL:mc2530DL;CLS:PRINTER;DES:KONICA MINOLTA mc2530DL;</ieee1284>
 	    <manufacturer>KONICA MINOLTA</manufacturer>
-	    <model>magicolor 2530 DL</model>
-	    <commandset>ZJS,PJL</commandset>
+	    <model>mc2530DL</model>
+	    <commandset>ZJS,PJL,LAVAFLOW</commandset>
 	</parallel>
 	<snmp>
 	    <description>KONICA MINOLTA magicolor 2530 DL</description>
diff --git a/foomatic-db/printer/Samsung-CLP-300.xml b/foomatic-db/printer/Samsung-CLP-300.xml
new file mode 100644
index 0000000..0d0ce33
--- /dev/null
+++ b/foomatic-db/printer/Samsung-CLP-300.xml
@@ -0,0 +1,57 @@
+<printer id="printer/Samsung-CLP-300">
+    <make>Samsung</make>
+    <model>CLP-300</model>
+    <mechanism>
+	<laser/>
+	<color/>
+	<resolution>
+	    <dpi>
+		<x>1200</x>
+		<y>1200</y>
+	    </dpi>
+	</resolution>
+	<margins>
+	    <general>
+		<unit>mm</unit>
+		<top>4.23164</top>
+		<bottom>4.23164</bottom>
+		<left>3.175</left>
+		<right>3.175</right>
+	    </general>
+	</margins>
+	<consumables>
+	    <comments> <en>
+		Toner Black (2000 prints) - $54
+		Toner Yellow (1000 prints) - $45
+		Toner Magenta (1000 prints) - $45
+		Toner Cyan (1000 prints) - $45
+		Waste Toner (5000 prints) - $10
+		Drum Kit (20000 prints) - $96
+	    </en> </comments>
+	    <partno>CLP-K300A</partno>
+	    <partno>CLP-Y300A</partno>
+	    <partno>CLP-M300A</partno>
+	    <partno>CLP-C300A</partno>
+	    <partno>CLP-W300A</partno>
+	    <partno>CLP-R300A</partno>
+	</consumables>
+    </mechanism>
+    <url>http://www.samsung.com/Products/PrinterandMultifunction/ColorLaserPrinters/CLP_300NXAA.asp</url>
+    <lang>
+	<proprietary/>
+	<!--no pjl--><!--No "text"?-->
+    </lang>
+    <autodetect>
+    </autodetect>
+    <functionality>B</functionality>
+    <driver>foo2qpdl</driver>
+    <!--not "unverified"--><!--no "contrib_url"-->
+    <comments> <en>
+
+	The Samsung CLP-300 (USB) and Samsung CLP-300N (Net) are color laser
+	printers with a 2007 street price of $299 USD and $349 USD.
+
+	This printer is supported by the foo2qpdl open software printer driver.
+
+    </en> </comments>
+</printer>
diff --git a/foomatic-db/printer/Samsung-CLP-600.xml b/foomatic-db/printer/Samsung-CLP-600.xml
new file mode 100644
index 0000000..e3ecff2
--- /dev/null
+++ b/foomatic-db/printer/Samsung-CLP-600.xml
@@ -0,0 +1,54 @@
+<printer id="printer/Samsung-CLP-600">
+    <make>Samsung</make>
+    <model>CLP-600</model>
+    <mechanism>
+	<laser/>
+	<color/>
+	<resolution>
+	    <dpi>
+		<x>1200</x>
+		<y>1200</y>
+	    </dpi>
+	</resolution>
+	<margins>
+	    <general>
+		<unit>mm</unit>
+		<top>4.23164</top>
+		<bottom>4.23164</bottom>
+		<left>3.175</left>
+		<right>3.175</right>
+	    </general>
+	</margins>
+	<consumables>
+	    <comments> <en>
+		Toner Black (4000 prints) - $80
+		Toner Yellow (4000 prints) - $110
+		Toner Magenta (4000 prints) - $110
+		Toner Cyan (4000 prints) - $110
+		Transfer Belt (35000 prints) - $47
+	    </en> </comments>
+	    <partno>CLP-K600A</partno>
+	    <partno>CLP-Y600A</partno>
+	    <partno>CLP-M600A</partno>
+	    <partno>CLP-C600A</partno>
+	    <partno>CLP-T600A</partno>
+	</consumables>
+    </mechanism>
+    <url>http://www.samsung.com/Products/PrinterandMultifunction/ColorLaserPrinters/CLP_600NXAA.asp</url>
+    <lang>
+	<proprietary/>
+	<!--no pjl--><!--No "text"?-->
+    </lang>
+    <autodetect>
+    </autodetect>
+    <functionality>B</functionality>
+    <driver>foo2qpdl</driver>
+    <!--not "unverified"--><!--no "contrib_url"-->
+    <comments> <en>
+
+	The Samsung CLP-600 is a networked color laser printer with a
+	2007 street price of $450 USD.  This printer is supported
+	by the foo2qpdl open software printer driver.
+
+    </en> </comments>
+</printer>
diff --git a/foomatic-db/printer/Samsung-CLX-3160.xml b/foomatic-db/printer/Samsung-CLX-3160.xml
new file mode 100644
index 0000000..2d90b94
--- /dev/null
+++ b/foomatic-db/printer/Samsung-CLX-3160.xml
@@ -0,0 +1,59 @@
+<printer id="printer/Samsung-CLX-3160">
+    <make>Samsung</make>
+    <model>CLX-3160</model>
+    <mechanism>
+	<laser/>
+	<color/>
+	<resolution>
+	    <dpi>
+		<x>1200</x>
+		<y>1200</y>
+	    </dpi>
+	</resolution>
+	<margins>
+	    <general>
+		<unit>mm</unit>
+		<top>4.23164</top>
+		<bottom>4.23164</bottom>
+		<left>3.175</left>
+		<right>3.175</right>
+	    </general>
+	</margins>
+	<consumables>
+	    <comments> <en>
+		Toner Black (2000 prints) - $54
+		Toner Yellow (1000 prints) - $45
+		Toner Magenta (1000 prints) - $45
+		Toner Cyan (1000 prints) - $45
+		Waste Toner (5000 prints) - $10
+		Drum Kit (20000 prints) - $96
+	    </en> </comments>
+	    <partno>CLP-K300A</partno>
+	    <partno>CLP-Y300A</partno>
+	    <partno>CLP-M300A</partno>
+	    <partno>CLP-C300A</partno>
+	    <partno>CLP-W300A</partno>
+	    <partno>CLP-R300A</partno>
+	</consumables>
+    </mechanism>
+    <url>http://www.samsung.com/Products/PrinterandMultifunction/ColorLaserPrinters/CLX_3160FNXAA.asp</url>
+    <lang>
+	<proprietary/>
+	<!--no pjl--><!--No "text"?-->
+    </lang>
+    <autodetect>
+    </autodetect>
+    <functionality>B</functionality>
+    <driver>foo2qpdl</driver>
+    <!--not "unverified"--><!--no "contrib_url"-->
+    <comments> <en>
+
+	The Samsung CLX-3160 (USB) is color laser multifunction printer
+	with a 2007 street price of $590 USD.
+
+	This printer is supported by the foo2qpdl open software printer driver.
+
+	Only the printer function is supported by this driver.
+
+    </en> </comments>
+</printer>
diff --git a/foomatic-db/printer/Xerox-Phaser-6110.xml b/foomatic-db/printer/Xerox-Phaser-6110.xml
new file mode 100644
index 0000000..fb2bf29
--- /dev/null
+++ b/foomatic-db/printer/Xerox-Phaser-6110.xml
@@ -0,0 +1,67 @@
+<printer id="printer/Xerox-Phaser-6110">
+    <make>Xerox</make>
+    <model>Phaser 6110</model>
+    <mechanism>
+	<laser/>
+	<color/>
+	<resolution>
+	    <dpi>
+		<x>1200</x>
+		<y>1200</y>
+	    </dpi>
+	</resolution>
+	<margins>
+	    <general>
+		<unit>mm</unit>
+		<top>4.23164</top>
+		<bottom>4.23164</bottom>
+		<left>3.175</left>
+		<right>3.175</right>
+	    </general>
+	</margins>
+	<consumables>
+	    <comments> <en>
+		Toner Cyan (1000 prints) - $45
+		Toner Magenta (1000 prints) - $45
+		Toner Yellow (1000 prints) - $45
+		Toner Black (2000 prints) - $54
+		Waste Toner (5000 prints) - $10
+		Drum Kit (20000 prints) - $159
+	    </en> </comments>
+	    <partno>106R01271</partno>
+	    <partno>106R01272</partno>
+	    <partno>106R01273</partno>
+	    <partno>106R01274</partno>
+	    <partno>108R00722</partno>
+	    <partno>108R00744</partno>
+	</consumables>
+    </mechanism>
+    <url>http://www.office.xerox.com/printers/color-printers/phaser-6110/enus.html</url>
+    <lang>
+	<proprietary/>
+	<!--no pjl--><!--No "text"?-->
+    </lang>
+    <autodetect>
+        <parallel>
+            <ieee1284>MFG:Xerox;CMD:SPLC;MDL:Phaser 6110;CLS:PRINTER;STATUS:BUSY;</ieee1284>
+            <manufacturer>Xerox</manufacturer>
+            <model>Phaser 6110</model>
+            <commandset>SPLC</commandset>
+        </parallel>
+    </autodetect>
+    <functionality>B</functionality>
+    <driver>foo2qpdl</driver>
+    <!--not "unverified"--><!--no "contrib_url"-->
+    <comments> <en>
+
+	The Xerox Phaser 6110/B (USB) and Xerox Phaser 6110/N (Net) are color
+	laser printers with a 2007 street price of $249 USD and $269 USD.
+
+	The Xerox Phaser 6110MFP is a color multifunction printer with a 2007
+	street price of $579 USD.
+
+	These printers are supported by the foo2qpdl open software printer
+	driver.
+
+    </en> </comments>
+</printer>
diff --git a/foomatic-db/printer/Xerox-Phaser-6115MFP.xml b/foomatic-db/printer/Xerox-Phaser-6115MFP.xml
new file mode 100644
index 0000000..e69d3f2
--- /dev/null
+++ b/foomatic-db/printer/Xerox-Phaser-6115MFP.xml
@@ -0,0 +1,56 @@
+<printer id="printer/Xerox-Phaser-6115MFP">
+    <make>Xerox</make>
+    <model>Phaser 6115MFP</model>
+    <mechanism>
+	<laser/>
+	<color/>
+	<resolution>
+	    <dpi>
+		<x>2400</x>
+		<y>600</y>
+	    </dpi>
+	</resolution>
+	<margins>
+	    <general>
+		<unit>mm</unit>
+		<top>4</top>
+		<bottom>4</bottom>
+		<left>4</left>
+		<right>4</right>
+	    </general>
+	</margins>
+	<consumables>
+	    <comments> <en>
+		Toner Cyan (4500 prints) - $160
+		Toner Magenta (4500 prints) - $160
+		Toner Yellow (4500 prints) - $160
+		Toner Black (4500 prints) - $100
+		Imaging Unit (20000 prints) - $160
+	    </en> </comments>
+	    <partno>113R00693</partno>
+	    <partno>113R00694</partno>
+	    <partno>113R00695</partno>
+	    <partno>113R00692</partno>
+	    <partno>113R00691</partno>
+	</consumables>
+    </mechanism>
+    <url>http://www.office.xerox.com/multifunction-printer/color-multifunction/phaser-6115mfp/enus.html</url>
+    <lang>
+	<proprietary/>
+	<!--no pjl--><!--No "text"?-->
+    </lang>
+    <autodetect>
+    </autodetect>
+    <functionality>B</functionality>
+    <driver>foo2qpdl</driver>
+    <!--not "unverified"--><!--no "contrib_url"-->
+    <comments> <en>
+
+	The Xerox Phaser 6115MFP is a color multifunction printer with a 2007
+	street price of $799 USD.
+
+	This printer is supported by the foo2lava open software printer
+	driver.
+
+    </en> </comments>
+</printer>