Imported Upstream version 20140209

17 files changed, 656 insertions, 69 deletions

diff --git a/foomatic-db/driver/foo2hbpl2.xml b/foomatic-db/driver/foo2hbpl2.xml
index 8019eb1..6e91d39 100644
--- a/foomatic-db/driver/foo2hbpl2.xml
+++ b/foomatic-db/driver/foo2hbpl2.xml
@@ -7,13 +7,17 @@
     </execution>
     <comments> <en>
 
-	This is a driver developed for the Dell 1355, Xerox WorkCentre
-	6015 Multifunction Printer (printer only), Fuji Xerox Docuprint
-	CM205 (printer only), and the Fuji Xerox DocuPrint P205.
+	This is a driver developed for the Dell 1355 MFP (printer only),
+	Dell C1765 MFP (printer only), Epson AcuLaser M1400,
+	Fuji Xerox Docuprint CM205 (printer only), Fuji Xerox DocuPrint P205,
+	Xerox WorkCentre 3045 and the Xerox WorkCentre 6015 MFP (printer only).
 
     </en> </comments>
     <printers>
 	<printer><id>printer/Dell-1355</id></printer>
+	<printer><id>printer/Dell-C1765</id></printer>
+	<printer><id>printer/Epson-AcuLaser_M1400</id></printer>
+	<printer><id>printer/Xerox-WorkCentre_3045</id></printer>
 	<printer><id>printer/Xerox-WorkCentre_6015</id></printer>
 	<printer><id>printer/Fuji_Xerox-DocuPrint_CM205</id></printer>
 	<printer><id>printer/Fuji_Xerox-DocuPrint_P205</id></printer>
diff --git a/foomatic-db/opt/foo2hbpl2-ColorMode.xml b/foomatic-db/opt/foo2hbpl2-ColorMode.xml
index 35e60ab..ed4691b 100644
--- a/foomatic-db/opt/foo2hbpl2-ColorMode.xml
+++ b/foomatic-db/opt/foo2hbpl2-ColorMode.xml
@@ -35,8 +35,14 @@
 	    <ev_driverval>-c</ev_driverval>
 	    <constraints>
 		<constraint sense="false">
+		    <make>Epson</make> <model>AcuLaser M1400</model>
+		</constraint>
+		<constraint sense="false">
 		    <make>Fuji Xerox</make> <model>DocuPrint P205</model>
 		</constraint>
+		<constraint sense="false">
+		    <make>Xerox</make> <model>WorkCentre 3045</model>
+		</constraint>
 	    </constraints>
 	</enum_val>
     </enum_vals>
diff --git a/foomatic-db/opt/foo2hbpl2-ICM.xml b/foomatic-db/opt/foo2hbpl2-ICM.xml
index 3cb036b..040ae31 100644
--- a/foomatic-db/opt/foo2hbpl2-ICM.xml
+++ b/foomatic-db/opt/foo2hbpl2-ICM.xml
@@ -51,8 +51,14 @@
 	    <arg_defval>ev/foo2qpdl-ICM-none</arg_defval>
 	</constraint>
 	<constraint sense="false">
+	    <make>Epson</make> <model>AcuLaser M1400</model>
+	</constraint>
+	<constraint sense="false">
 	    <make>Fuji Xerox</make> <model>DocuPrint P205</model>
 	</constraint>
+	<constraint sense="false">
+	    <make>Xerox</make> <model>WorkCentre 3045</model>
+	</constraint>
     </constraints>
     <enum_vals>
 	<enum_val id="ev/foo2hbpl2-ICM-none">
diff --git a/foomatic-db/opt/foo2hbpl2-Resolution.xml b/foomatic-db/opt/foo2hbpl2-Resolution.xml
index 8dc1d75..617a280 100644
--- a/foomatic-db/opt/foo2hbpl2-Resolution.xml
+++ b/foomatic-db/opt/foo2hbpl2-Resolution.xml
@@ -17,10 +17,20 @@
 	    <arg_defval>ev/foo2hbpl2-Resolution-1200x600</arg_defval>
 	</constraint>
 	<constraint sense="true">
+	    <make>Epson</make> <model>AcuLaser M1400</model>
+	    <driver>foo2hbpl2</driver>
+	    <arg_defval>ev/foo2hbpl2-Resolution-600x600</arg_defval>
+	</constraint>
+	<constraint sense="true">
 	    <make>Fuji Xerox</make> <model>DocuPrint P205</model>
 	    <driver>foo2hbpl2</driver>
 	    <arg_defval>ev/foo2hbpl2-Resolution-600x600</arg_defval>
 	</constraint>
+	<constraint sense="true">
+	    <make>Xerox</make> <model>WorkCentre 3045</model>
+	    <driver>foo2hbpl2</driver>
+	    <arg_defval>ev/foo2hbpl2-Resolution-600x600</arg_defval>
+	</constraint>
     </constraints>
     <enum_vals>
 	<enum_val id="ev/foo2hbpl2-Resolution-600x600">
@@ -34,8 +44,14 @@
 		    <driver>foo2hbpl2</driver>
 	        </constraint>
 	        <constraint sense="true">
+		    <make>Epson</make> <model>AcuLaser M1400</model>
+	        </constraint>
+	        <constraint sense="true">
 		    <make>Fuji Xerox</make> <model>DocuPrint P205</model>
 	        </constraint>
+	        <constraint sense="true">
+		    <make>Xerox</make> <model>WorkCentre 3045</model>
+	        </constraint>
 	    </constraints>
 	</enum_val>
 	<enum_val id="ev/foo2hbpl2-Resolution-1200x600">
@@ -46,8 +62,14 @@
 	    <ev_driverval>1200x600</ev_driverval>
 	    <constraints>
 	        <constraint sense="false">
+		    <make>Epson</make> <model>AcuLaser M1400</model>
+	        </constraint>
+	        <constraint sense="false">
 		    <make>Fuji Xerox</make> <model>DocuPrint P205</model>
 	        </constraint>
+	        <constraint sense="false">
+		    <make>Xerox</make> <model>WorkCentre 3045</model>
+	        </constraint>
             </constraints>
 	</enum_val>
 	<enum_val id="ev/foo2hbpl2-Resolution-1200x1200">
@@ -61,8 +83,14 @@
 		    <driver>foo2hbpl2</driver>
 	        </constraint>
 	        <constraint sense="true">
+		    <make>Epson</make> <model>AcuLaser M1400</model>
+	        </constraint>
+	        <constraint sense="true">
 		    <make>Fuji Xerox</make> <model>DocuPrint P205</model>
 	        </constraint>
+	        <constraint sense="true">
+		    <make>Xerox</make> <model>WorkCentre 3045</model>
+	        </constraint>
             </constraints>
 	</enum_val>
     </enum_vals>
diff --git a/foomatic-db/opt/foo2hp-AlignC.xml b/foomatic-db/opt/foo2hp-AlignC.xml
new file mode 100644
index 0000000..ba96e23
--- /dev/null
+++ b/foomatic-db/opt/foo2hp-AlignC.xml
@@ -0,0 +1,22 @@
+<option type="int" id="opt/foo2hp-AlignC">
+    <!-- A multilingual <comments> block can appear here, too;
+       it should be treated as documentation for the user. -->
+    <arg_longname> <en>Alignment Offset Cyan</en> </arg_longname>
+    <arg_shortname> <en>alignc</en> </arg_shortname>
+    <arg_execution>
+        <arg_group>Alignment (in rows)</arg_group>
+	<arg_order>220</arg_order>
+	<arg_spot>A</arg_spot>
+	<arg_required />
+	<arg_substitution />
+	<arg_proto>-Oc=%s </arg_proto>
+    </arg_execution>
+    <constraints>
+	<constraint sense="true">
+	<driver>foo2hp</driver>
+	<arg_defval>0</arg_defval>
+	</constraint>
+    </constraints>
+    <arg_max>100</arg_max>
+    <arg_min>-100</arg_min>
+</option>
diff --git a/foomatic-db/opt/foo2hp-AlignCMYK.xml b/foomatic-db/opt/foo2hp-AlignCMYK.xml
deleted file mode 100644
index 7c8f29d..0000000
--- a/foomatic-db/opt/foo2hp-AlignCMYK.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<option type="int" id="opt/foo2hp-AlignC">
-    <!-- A multilingual <comments> block can appear here, too;
-       it should be treated as documentation for the user. -->
-    <arg_longname> <en>Alignment Offset Cyan</en> </arg_longname>
-    <arg_shortname> <en>alignc</en> </arg_shortname>
-    <arg_execution>
-        <arg_group>Alignment (in rows)</arg_group>
-	<arg_order>220</arg_order>
-	<arg_spot>A</arg_spot>
-	<arg_required />
-	<arg_substitution />
-	<arg_proto>-Oc=%s </arg_proto>
-    </arg_execution>
-    <constraints>
-	<constraint sense="true">
-	<driver>foo2hp</driver>
-	<arg_defval>0</arg_defval>
-	</constraint>
-    </constraints>
-    <arg_max>100</arg_max>
-    <arg_min>-100</arg_min>
-</option>
-<option type="int" id="opt/foo2hp-AlignM">
-    <!-- A multilingual <comments> block can appear here, too;
-       it should be treated as documentation for the user. -->
-    <arg_longname> <en>Alignment Offset Magenta</en> </arg_longname>
-    <arg_shortname> <en>alignm</en> </arg_shortname>
-    <arg_execution>
-        <arg_group>Alignment (in rows)</arg_group>
-	<arg_order>220</arg_order>
-	<arg_spot>A</arg_spot>
-	<arg_required />
-	<arg_substitution />
-	<arg_proto>-Om=%s </arg_proto>
-    </arg_execution>
-    <constraints>
-	<constraint sense="true">
-	<driver>foo2hp</driver>
-	<arg_defval>0</arg_defval>
-	</constraint>
-    </constraints>
-    <arg_max>100</arg_max>
-    <arg_min>-100</arg_min>
-</option>
-<option type="int" id="opt/foo2hp-AlignY">
-    <!-- A multilingual <comments> block can appear here, too;
-       it should be treated as documentation for the user. -->
-    <arg_longname> <en>Alignment Offset Yellow</en> </arg_longname>
-    <arg_shortname> <en>aligny</en> </arg_shortname>
-    <arg_execution>
-        <arg_group>Alignment (in rows)</arg_group>
-	<arg_order>220</arg_order>
-	<arg_spot>A</arg_spot>
-	<arg_required />
-	<arg_substitution />
-	<arg_proto>-Oy=%s </arg_proto>
-    </arg_execution>
-    <constraints>
-	<constraint sense="true">
-	<driver>foo2hp</driver>
-	<arg_defval>0</arg_defval>
-	</constraint>
-    </constraints>
-    <arg_max>100</arg_max>
-    <arg_min>-100</arg_min>
-</option>
diff --git a/foomatic-db/opt/foo2hp-AlignM.xml b/foomatic-db/opt/foo2hp-AlignM.xml
new file mode 100644
index 0000000..dfa5eff
--- /dev/null
+++ b/foomatic-db/opt/foo2hp-AlignM.xml
@@ -0,0 +1,22 @@
+<option type="int" id="opt/foo2hp-AlignM">
+    <!-- A multilingual <comments> block can appear here, too;
+       it should be treated as documentation for the user. -->
+    <arg_longname> <en>Alignment Offset Magenta</en> </arg_longname>
+    <arg_shortname> <en>alignm</en> </arg_shortname>
+    <arg_execution>
+        <arg_group>Alignment (in rows)</arg_group>
+	<arg_order>220</arg_order>
+	<arg_spot>A</arg_spot>
+	<arg_required />
+	<arg_substitution />
+	<arg_proto>-Om=%s </arg_proto>
+    </arg_execution>
+    <constraints>
+	<constraint sense="true">
+	<driver>foo2hp</driver>
+	<arg_defval>0</arg_defval>
+	</constraint>
+    </constraints>
+    <arg_max>100</arg_max>
+    <arg_min>-100</arg_min>
+</option>
diff --git a/foomatic-db/opt/foo2hp-AlignY.xml b/foomatic-db/opt/foo2hp-AlignY.xml
new file mode 100644
index 0000000..6dfcf35
--- /dev/null
+++ b/foomatic-db/opt/foo2hp-AlignY.xml
@@ -0,0 +1,22 @@
+<option type="int" id="opt/foo2hp-AlignY">
+    <!-- A multilingual <comments> block can appear here, too;
+       it should be treated as documentation for the user. -->
+    <arg_longname> <en>Alignment Offset Yellow</en> </arg_longname>
+    <arg_shortname> <en>aligny</en> </arg_shortname>
+    <arg_execution>
+        <arg_group>Alignment (in rows)</arg_group>
+	<arg_order>220</arg_order>
+	<arg_spot>A</arg_spot>
+	<arg_required />
+	<arg_substitution />
+	<arg_proto>-Oy=%s </arg_proto>
+    </arg_execution>
+    <constraints>
+	<constraint sense="true">
+	<driver>foo2hp</driver>
+	<arg_defval>0</arg_defval>
+	</constraint>
+    </constraints>
+    <arg_max>100</arg_max>
+    <arg_min>-100</arg_min>
+</option>
diff --git a/foomatic-db/opt/foo2qpdl-ColorAdjustB.xml b/foomatic-db/opt/foo2qpdl-ColorAdjustB.xml
new file mode 100644
index 0000000..7383225
--- /dev/null
+++ b/foomatic-db/opt/foo2qpdl-ColorAdjustB.xml
@@ -0,0 +1,55 @@
+<option type="int" id="opt/foo2qpdl-ColorAdjustB">
+    <!-- A multilingual <comments> block can appear here, too;
+       it should be treated as documentation for the user. -->
+    <arg_longname> <en>Mono or Color Adjust Brightness</en> </arg_longname>
+    <arg_shortname> <en>cab</en> </arg_shortname>
+    <arg_execution>
+        <arg_group>Color Adjust</arg_group>
+	<arg_order>211</arg_order>
+	<arg_spot>A</arg_spot>
+	<arg_required />
+	<arg_substitution />
+	<arg_proto>-ab=%s </arg_proto>
+    </arg_execution>
+    <constraints>
+	<constraint sense="true">
+	    <driver>foo2qpdl</driver>
+	    <arg_defval>50</arg_defval>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-300</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-310</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-315</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-325</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-600</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-610</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLX-2160</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLX-3160</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLX-3175</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLX-3185</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Xerox</make> <model>Phaser 6110</model>
+	</constraint>
+    </constraints>
+    <arg_max>100</arg_max>
+    <arg_min>0</arg_min>
+</option>
diff --git a/foomatic-db/opt/foo2qpdl-ColorAdjustC.xml b/foomatic-db/opt/foo2qpdl-ColorAdjustC.xml
new file mode 100644
index 0000000..a5c0eb4
--- /dev/null
+++ b/foomatic-db/opt/foo2qpdl-ColorAdjustC.xml
@@ -0,0 +1,55 @@
+<option type="int" id="opt/foo2qpdl-ColorAdjustC">
+    <!-- A multilingual <comments> block can appear here, too;
+       it should be treated as documentation for the user. -->
+    <arg_longname> <en>Mono or Color Adjust Contrast</en> </arg_longname>
+    <arg_shortname> <en>cac</en> </arg_shortname>
+    <arg_execution>
+        <arg_group>Color Adjust</arg_group>
+	<arg_order>212</arg_order>
+	<arg_spot>A</arg_spot>
+	<arg_required />
+	<arg_substitution />
+	<arg_proto>-ac=%s </arg_proto>
+    </arg_execution>
+    <constraints>
+	<constraint sense="true">
+	    <driver>foo2qpdl</driver>
+	    <arg_defval>50</arg_defval>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-300</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-310</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-315</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-325</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-600</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-610</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLX-2160</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLX-3160</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLX-3175</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLX-3185</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Xerox</make> <model>Phaser 6110</model>
+	</constraint>
+    </constraints>
+    <arg_max>100</arg_max>
+    <arg_min>0</arg_min>
+</option>
diff --git a/foomatic-db/opt/foo2qpdl-ColorAdjustCR.xml b/foomatic-db/opt/foo2qpdl-ColorAdjustCR.xml
new file mode 100644
index 0000000..0d3b98b
--- /dev/null
+++ b/foomatic-db/opt/foo2qpdl-ColorAdjustCR.xml
@@ -0,0 +1,55 @@
+<option type="int" id="opt/foo2qpdl-ColorAdjustCR">
+    <!-- A multilingual <comments> block can appear here, too;
+       it should be treated as documentation for the user. -->
+    <arg_longname> <en>Color Adjust Cyan-Red</en> </arg_longname>
+    <arg_shortname> <en>cacr</en> </arg_shortname>
+    <arg_execution>
+        <arg_group>Color Adjust</arg_group>
+	<arg_order>220</arg_order>
+	<arg_spot>A</arg_spot>
+	<arg_required />
+	<arg_substitution />
+	<arg_proto>-acr=%s </arg_proto>
+    </arg_execution>
+    <constraints>
+	<constraint sense="true">
+	    <driver>foo2qpdl</driver>
+	    <arg_defval>50</arg_defval>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-300</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-310</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-315</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-325</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-600</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-610</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLX-2160</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLX-3160</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLX-3175</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLX-3185</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Xerox</make> <model>Phaser 6110</model>
+	</constraint>
+    </constraints>
+    <arg_max>100</arg_max>
+    <arg_min>0</arg_min>
+</option>
diff --git a/foomatic-db/opt/foo2qpdl-ColorAdjustMG.xml b/foomatic-db/opt/foo2qpdl-ColorAdjustMG.xml
new file mode 100644
index 0000000..8bb3a09
--- /dev/null
+++ b/foomatic-db/opt/foo2qpdl-ColorAdjustMG.xml
@@ -0,0 +1,55 @@
+<option type="int" id="opt/foo2qpdl-ColorAdjustMG">
+    <!-- A multilingual <comments> block can appear here, too;
+       it should be treated as documentation for the user. -->
+    <arg_longname> <en>Color Adjust Magenta-Green</en> </arg_longname>
+    <arg_shortname> <en>camg</en> </arg_shortname>
+    <arg_execution>
+        <arg_group>Color Adjust</arg_group>
+	<arg_order>220</arg_order>
+	<arg_spot>A</arg_spot>
+	<arg_required />
+	<arg_substitution />
+	<arg_proto>-amg=%s </arg_proto>
+    </arg_execution>
+    <constraints>
+	<constraint sense="true">
+	    <driver>foo2qpdl</driver>
+	    <arg_defval>50</arg_defval>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-300</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-310</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-315</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-325</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-600</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-610</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLX-2160</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLX-3160</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLX-3175</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLX-3185</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Xerox</make> <model>Phaser 6110</model>
+	</constraint>
+    </constraints>
+    <arg_max>100</arg_max>
+    <arg_min>0</arg_min>
+</option>
diff --git a/foomatic-db/opt/foo2qpdl-ColorAdjustS.xml b/foomatic-db/opt/foo2qpdl-ColorAdjustS.xml
new file mode 100644
index 0000000..380ed3d
--- /dev/null
+++ b/foomatic-db/opt/foo2qpdl-ColorAdjustS.xml
@@ -0,0 +1,55 @@
+<option type="int" id="opt/foo2qpdl-ColorAdjustS">
+    <!-- A multilingual <comments> block can appear here, too;
+       it should be treated as documentation for the user. -->
+    <arg_longname> <en>Color Adjust Saturation</en> </arg_longname>
+    <arg_shortname> <en>cas</en> </arg_shortname>
+    <arg_execution>
+        <arg_group>Color Adjust</arg_group>
+	<arg_order>213</arg_order>
+	<arg_spot>A</arg_spot>
+	<arg_required />
+	<arg_substitution />
+	<arg_proto>-as=%s </arg_proto>
+    </arg_execution>
+    <constraints>
+	<constraint sense="true">
+	    <driver>foo2qpdl</driver>
+	    <arg_defval>50</arg_defval>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-300</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-310</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-315</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-325</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-600</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-610</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLX-2160</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLX-3160</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLX-3175</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLX-3185</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Xerox</make> <model>Phaser 6110</model>
+	</constraint>
+    </constraints>
+    <arg_max>100</arg_max>
+    <arg_min>0</arg_min>
+</option>
diff --git a/foomatic-db/opt/foo2qpdl-ColorAdjustYB.xml b/foomatic-db/opt/foo2qpdl-ColorAdjustYB.xml
new file mode 100644
index 0000000..cd3448c
--- /dev/null
+++ b/foomatic-db/opt/foo2qpdl-ColorAdjustYB.xml
@@ -0,0 +1,55 @@
+<option type="int" id="opt/foo2qpdl-ColorAdjustYB">
+    <!-- A multilingual <comments> block can appear here, too;
+       it should be treated as documentation for the user. -->
+    <arg_longname> <en>Color Adjust Yellow-Blue</en> </arg_longname>
+    <arg_shortname> <en>cayb</en> </arg_shortname>
+    <arg_execution>
+        <arg_group>Color Adjust</arg_group>
+	<arg_order>220</arg_order>
+	<arg_spot>A</arg_spot>
+	<arg_required />
+	<arg_substitution />
+	<arg_proto>-ayb=%s </arg_proto>
+    </arg_execution>
+    <constraints>
+	<constraint sense="true">
+	    <driver>foo2qpdl</driver>
+	    <arg_defval>50</arg_defval>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-300</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-310</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-315</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-325</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-600</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLP-610</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLX-2160</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLX-3160</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLX-3175</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Samsung</make> <model>CLX-3185</model>
+	</constraint>
+	<constraint sense="false">
+	    <make>Xerox</make> <model>Phaser 6110</model>
+	</constraint>
+    </constraints>
+    <arg_max>100</arg_max>
+    <arg_min>0</arg_min>
+</option>
diff --git a/foomatic-db/printer/Dell-C1765.xml b/foomatic-db/printer/Dell-C1765.xml
new file mode 100644
index 0000000..ac0ea9c
--- /dev/null
+++ b/foomatic-db/printer/Dell-C1765.xml
@@ -0,0 +1,71 @@
+<printer id="printer/Dell-C1765">
+    <make>Dell</make>
+    <model>C1765</model>
+    <mechanism>
+	<laser/>
+	<color/>
+	<resolution>
+	    <dpi>
+		<x>1200</x>
+		<y>600</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://accessories.us.dell.com/sna/productdetail.aspx?c=us&amp;cs=04&amp;l=en&amp;sku=225-4113</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>
+-->
+	<snmp>
+	    <description>Xerox WorkCentre 6015</description>
+	</snmp>
+    </autodetect>
+    <functionality>C</functionality>
+    <driver>foo2hbpl2</driver>
+    <!--not "unverified"--><!--no "contrib_url"-->
+    <comments> <en>
+
+	The Dell C1765nf/nfw is color multifunction printer with a 2014 street
+	price of $170.
+
+	These printers are supported by the foo2hbpl2 open software printer
+	driver.
+
+    </en> </comments>
+</printer>
diff --git a/foomatic-db/printer/Epson-AcuLaser_M1400.xml b/foomatic-db/printer/Epson-AcuLaser_M1400.xml
new file mode 100644
index 0000000..e117ca5
--- /dev/null
+++ b/foomatic-db/printer/Epson-AcuLaser_M1400.xml
@@ -0,0 +1,71 @@
+<printer id="printer/Epson-AcuLaser_M1400">
+    <make>Epson</make>
+    <model>AcuLaser M1400</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.epson.co.uk/gb/en/viewcon/corporatesite/products/mainunits/overview/9538</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>
+-->
+	<snmp>
+	    <description>Epson AcuLaser M1400</description>
+	</snmp>
+    </autodetect>
+    <functionality>C</functionality>
+    <driver>foo2hbpl2</driver>
+    <!--not "unverified"--><!--no "contrib_url"-->
+    <comments> <en>
+
+	The Epson AcuLaser M1400 (USB)
+	is a monochrome printer with a 2013 street price of $150.
+
+	These printers are supported by the foo2hbpl2 open software printer
+	driver.
+
+    </en> </comments>
+</printer>
diff --git a/foomatic-db/printer/Xerox-WorkCentre_3045.xml b/foomatic-db/printer/Xerox-WorkCentre_3045.xml
new file mode 100644
index 0000000..72ceb69
--- /dev/null
+++ b/foomatic-db/printer/Xerox-WorkCentre_3045.xml
@@ -0,0 +1,71 @@
+<printer id="printer/Xerox-WorkCentre_3045">
+    <make>Xerox</make>
+    <model>WorkCentre 3045</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/multifunction-printer/multifunction-under-30ppm/workcentre-3045/enae.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>
+-->
+	<snmp>
+	    <description>Xerox WorkCentre 3045</description>
+	</snmp>
+    </autodetect>
+    <functionality>C</functionality>
+    <driver>foo2hbpl2</driver>
+    <!--not "unverified"--><!--no "contrib_url"-->
+    <comments> <en>
+
+	The Xerox WorkCentre 3045(USB) and 3045ni (network)
+	is a monochrome MFP printer with a 2013 street price of $150.
+
+	These printers are supported by the foo2hbpl2 open software printer
+	driver.
+
+    </en> </comments>
+</printer>