#! /bin/sh /usr/share/dpatch/dpatch-run ## add-lidil-two-cartridge-modes.dpatch by <till.kamppeter@gmail.com> ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: No description. @DPATCH@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' hplip-3.10.6~/prnt/drv/hpijs.drv.in hplip-3.10.6/prnt/drv/hpijs.drv.in --- hplip-3.10.6~/prnt/drv/hpijs.drv.in 2010-09-14 16:08:45.936316029 +0200 +++ hplip-3.10.6/prnt/drv/hpijs.drv.in 2010-09-14 16:08:46.506315314 +0200 @@ -4411,16 +4411,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" @@ -4879,13 +4879,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&& @@ -5347,13 +5347,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&& diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' hplip-3.10.6~/prnt/drv/hpijs.drv.in.template hplip-3.10.6/prnt/drv/hpijs.drv.in.template --- hplip-3.10.6~/prnt/drv/hpijs.drv.in.template 2010-07-19 04:15:11.000000000 +0200 +++ hplip-3.10.6/prnt/drv/hpijs.drv.in.template 2010-09-14 16:08:57.346301718 +0200 @@ -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&&
