#! /bin/sh /usr/share/dpatch/dpatch-run ## add-lidil-two-cartridge-modes.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: No description. @DPATCH@ Index: hplip-3.12.4/prnt/drv/hpijs.drv.in =================================================================== --- hplip-3.12.4.orig/prnt/drv/hpijs.drv.in 2012-05-26 10:21:29.000000000 +1000 +++ hplip-3.12.4/prnt/drv/hpijs.drv.in 2012-05-26 10:21:29.000000000 +1000 @@ -4376,16 +4376,16 @@ r="HEWLETT-PACKARD" -sDeviceModel="deskjet 3320"" Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=300DraftColorCM&& -Y" +YK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft.Gray" "Quality=300DraftGr&& ayscaleK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMY" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMYK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal.Gray" "Quality=300Graysc&& aleK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMY" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMYK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High.Gray" "Quality=600Grayscal&& eK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMY" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMYK" Attribute "FoomaticRIPOption" "PageSize" "enum CmdLine A" Attribute "FoomaticRIPOptionSetting" "PageSize=Letter" " -dDEVICEWIDTHPOINTS=612 -&& dDEVICEHEIGHTPOINTS=792" @@ -4844,13 +4844,13 @@ r="HEWLETT-PACKARD" -sDeviceModel="deskjet 3600"" Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=300DraftColorCM&& -Y" +YK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft.Gray" "Quality=300DraftGr&& ayscaleK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMY" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMYK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal.Gray" "Quality=300Graysc&& aleK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMY" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMYK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High.Gray" "Quality=600Grayscal&& eK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMYKFul&& @@ -5312,13 +5312,13 @@ " Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=600DraftColorCM&& -Y" +YK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft.Gray" "Quality=600DraftGr&& ayscaleK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=600ColorCMY" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=600ColorCMYK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal.Gray" "Quality=600Graysc&& aleK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMY" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMYK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High.Gray" "Quality=600Grayscal&& eK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMYKFul&& Index: hplip-3.12.4/prnt/drv/hpijs.drv.in.template =================================================================== --- hplip-3.12.4.orig/prnt/drv/hpijs.drv.in.template 2012-04-10 18:32:37.000000000 +1000 +++ hplip-3.12.4/prnt/drv/hpijs.drv.in.template 2012-05-26 10:21:29.000000000 +1000 @@ -2221,16 +2221,16 @@ r="HEWLETT-PACKARD" -sDeviceModel="deskjet 3320"" Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=300DraftColorCM&& -Y" +YK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft.Gray" "Quality=300DraftGr&& ayscaleK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMY" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMYK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal.Gray" "Quality=300Graysc&& aleK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMY" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMYK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High.Gray" "Quality=600Grayscal&& eK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMY" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMYK" Attribute "FoomaticRIPOption" "PageSize" "enum CmdLine A" Attribute "FoomaticRIPOptionSetting" "PageSize=Letter" " -dDEVICEWIDTHPOINTS=612 -&& dDEVICEHEIGHTPOINTS=792" @@ -2403,13 +2403,13 @@ r="HEWLETT-PACKARD" -sDeviceModel="deskjet 3600"" Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=300DraftColorCM&& -Y" +YK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft.Gray" "Quality=300DraftGr&& ayscaleK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMY" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=300ColorCMYK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal.Gray" "Quality=300Graysc&& aleK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMY" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMYK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High.Gray" "Quality=600Grayscal&& eK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMYKFul&& @@ -2599,13 +2599,13 @@ " Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=600DraftColorCM&& -Y" +YK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft.Gray" "Quality=600DraftGr&& ayscaleK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=600ColorCMY" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal" "Quality=600ColorCMYK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Normal.Gray" "Quality=600Graysc&& aleK" - Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMY" + Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High" "Quality=600ColorCMYK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High.Gray" "Quality=600Grayscal&& eK" Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMYKFul&&