← Back to branch summary

~ubuntu-branches/ubuntu/raring/hplip/raring

« back to all changes in this revision

Viewing changes to debian/patches/add-lidil-two-cartridge-modes.dpatch

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2012-10-06 15:03:44 UTC
  • mfrom: (1.6.1) (20.1.16 quantal)
  • Revision ID: package-import@ubuntu.com-20121006150344-2p3xz26br0t3hu2q
Tags: 3.12.10-1
http://bugs.debian.org/683033
http://bugs.debian.org/687129
* New upstream release
  - Fixes "Network scanning fails (Closes: #683033)
* quilt refresh hplip-syslog-fix-debug-messages-to-error.dpatch
* Fix "error in clean build env" updated debian/rules (Closes: #687129)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/add-lidil-two-cartridge-modes.dpatch
5
5
## DP: No description.
6
6
 
7
7
@DPATCH@
8
 
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' hplip-3.10.6~/prnt/drv/hpcups.drv.in hplip-3.10.6/prnt/drv/hpcups.drv.in
9
 
--- hplip-3.10.6~/prnt/drv/hpcups.drv.in        2010-09-14 16:08:45.926316041 +0200
10
 
+++ hplip-3.10.6/prnt/drv/hpcups.drv.in 2010-09-14 16:08:46.496315327 +0200
11
 
@@ -4778,51 +4778,95 @@
12
 
 
13
 
   // cupsCompression values map to QUALITY_MODE from global_types.h
14
 
   Option "OutputMode/Print Quality" PickOne AnySetup 10.0
15
 
-    *Choice "NormalRGB/Normal Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1/OutputType(0)/cupsString0(PlainNormalColor)/HWResolution[600 600]>>setpagedevice"
16
 
+    *Choice "NormalRGB/Normal Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(0)/cupsString0(PlainNormalKColor)/HWResolution[600 600]>>setpagedevice"
17
 
+    Choice "NormalRGBC/Normal Color (Only Color Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1/OutputType(0)/cupsString0(PlainNormalColor)/HWResolution[600 600]>>setpagedevice"
18
 
+    Choice "NormalRGBP/Normal Color (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(0)/cupsString0(PlainNormalPhotoColor)/HWResolution[600 600]>>setpagedevice"
19
 
     Choice "NormalGray/Normal Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2/OutputType(0)/cupsString0(PlainNormalGrayK)/HWResolution[600 600]>>setpagedevice"
20
 
-    Choice "DraftRGB/Draft Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(-1)/cupsString0(PlainDraftColor)/HWResolution[600 600]>>setpagedevice"
21
 
+    Choice "NormalGrayP/Normal Grayscale (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(0)/cupsString0(PlainNormalPhotoGrayK)/HWResolution[600 600]>>setpagedevice"
22
 
+    Choice "DraftRGB/Draft Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(-1)/cupsString0(PlainDraftKColor)/HWResolution[600 600]>>setpagedevice"
23
 
+    Choice "DraftRGBC/Draft Color (Only Color Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1/OutputType(-1)/cupsString0(PlainDraftColor)/HWResolution[600 600]>>setpagedevice"
24
 
+    Choice "DraftRGBP/Draft Color (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(-1)/cupsString0(PlainDraftPhotoColor)/HWResolution[600 600]>>setpagedevice"
25
 
     Choice "DraftGray/Draft Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2/OutputType(-1)/cupsString0(PlainDraftGrayK)/HWResolution[600 600]>>setpagedevice"
26
 
-    Choice "Photo/High-Resolution Photo" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(2)/cupsString0(PhotoBestPhotoColor)/HWResolution[600 600]>>setpagedevice"
27
 
+    Choice "Photo/High-Resolution Photo" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(2)/cupsString0(PhotoBest)/HWResolution[600 600]>>setpagedevice"
28
 
+    Choice "PhotoP/High-Resolution Photo (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(2)/cupsString0(PhotoBestPhotoColor)/HWResolution[600 600]>>setpagedevice"
29
 
 
30
 
   // Constraints
31
 
   UIConstraints "*MediaType Glossy *OutputMode DraftRGB"
32
 
+  UIConstraints "*MediaType Glossy *OutputMode DraftRGBC"
33
 
+  UIConstraints "*MediaType Glossy *OutputMode DraftRGBP"
34
 
   UIConstraints "*MediaType Glossy *OutputMode DraftGray"
35
 
   UIConstraints "*MediaType TransparencyFilm *OutputMode DraftRGB"
36
 
+  UIConstraints "*MediaType TransparencyFilm *OutputMode DraftRGBC"
37
 
+  UIConstraints "*MediaType TransparencyFilm *OutputMode DraftRGBP"
38
 
   UIConstraints "*MediaType TransparencyFilm *OutputMode DraftGray"
39
 
   UIConstraints "*MediaType Plain *OutputMode Photo"
40
 
+  UIConstraints "*MediaType Plain *OutputMode PhotoP"
41
 
   UIConstraints "*MediaType TransparencyFilm *OutputMode Photo"
42
 
+  UIConstraints "*MediaType TransparencyFilm *OutputMode PhotoP"
43
 
 
44
 
   UIConstraints "*PageSize L.FB *OutputMode DraftRGB"
45
 
+  UIConstraints "*PageSize L.FB *OutputMode DraftRGBC"
46
 
+  UIConstraints "*PageSize L.FB *OutputMode DraftRGBP"
47
 
   UIConstraints "*PageSize L.FB *OutputMode DraftGray"
48
 
   UIConstraints "*PageSize PhotoL.FB *OutputMode DraftRGB"
49
 
+  UIConstraints "*PageSize PhotoL.FB *OutputMode DraftRGBC"
50
 
+  UIConstraints "*PageSize PhotoL.FB *OutputMode DraftRGBP"
51
 
   UIConstraints "*PageSize PhotoL.FB *OutputMode DraftGray"
52
 
+  UIConstraints "*PageSize Hagaki.FB *OutputMode DraftRGBC"
53
 
+  UIConstraints "*PageSize Hagaki.FB *OutputMode DraftRGBP"
54
 
   UIConstraints "*PageSize Hagaki.FB *OutputMode DraftRGB"
55
 
   UIConstraints "*PageSize Hagaki.FB *OutputMode DraftGray"
56
 
   UIConstraints "*PageSize Photo4x6.FB *OutputMode DraftRGB"
57
 
+  UIConstraints "*PageSize Photo4x6.FB *OutputMode DraftRGBC"
58
 
+  UIConstraints "*PageSize Photo4x6.FB *OutputMode DraftRGBP"
59
 
   UIConstraints "*PageSize Photo4x6.FB *OutputMode DraftGray"
60
 
   UIConstraints "*PageSize A6.FB *OutputMode DraftRGB"
61
 
+  UIConstraints "*PageSize A6.FB *OutputMode DraftRGBC"
62
 
+  UIConstraints "*PageSize A6.FB *OutputMode DraftRGBP"
63
 
   UIConstraints "*PageSize A6.FB *OutputMode DraftGray"
64
 
   UIConstraints "*PageSize Cabinet.FB *OutputMode DraftRGB"
65
 
+  UIConstraints "*PageSize Cabinet.FB *OutputMode DraftRGBC"
66
 
+  UIConstraints "*PageSize Cabinet.FB *OutputMode DraftRGBP"
67
 
   UIConstraints "*PageSize Cabinet.FB *OutputMode DraftGray"
68
 
   UIConstraints "*PageSize Photo5x7.FB *OutputMode DraftRGB"
69
 
+  UIConstraints "*PageSize Photo5x7.FB *OutputMode DraftRGBC"
70
 
+  UIConstraints "*PageSize Photo5x7.FB *OutputMode DraftRGBP"
71
 
   UIConstraints "*PageSize Photo5x7.FB *OutputMode DraftGray"
72
 
   UIConstraints "*PageSize 2L.FB *OutputMode DraftRGB"
73
 
+  UIConstraints "*PageSize 2L.FB *OutputMode DraftRGBC"
74
 
+  UIConstraints "*PageSize 2L.FB *OutputMode DraftRGBP"
75
 
   UIConstraints "*PageSize 2L.FB *OutputMode DraftGray"
76
 
   UIConstraints "*PageSize A5.FB *OutputMode DraftRGB"
77
 
+  UIConstraints "*PageSize A5.FB *OutputMode DraftRGBC"
78
 
+  UIConstraints "*PageSize A5.FB *OutputMode DraftRGBP"
79
 
   UIConstraints "*PageSize A5.FB *OutputMode DraftGray"
80
 
   UIConstraints "*PageSize 8x10.FB *OutputMode DraftRGB"
81
 
+  UIConstraints "*PageSize 8x10.FB *OutputMode DraftRGBC"
82
 
+  UIConstraints "*PageSize 8x10.FB *OutputMode DraftRGBP"
83
 
   UIConstraints "*PageSize 8x10.FB *OutputMode DraftGray"
84
 
   UIConstraints "*PageSize Letter.FB *OutputMode DraftRGB"
85
 
+  UIConstraints "*PageSize Letter.FB *OutputMode DraftRGBC"
86
 
+  UIConstraints "*PageSize Letter.FB *OutputMode DraftRGBP"
87
 
   UIConstraints "*PageSize Letter.FB *OutputMode DraftGray"
88
 
   UIConstraints "*PageSize A4.FB *OutputMode DraftRGB"
89
 
+  UIConstraints "*PageSize A4.FB *OutputMode DraftRGBC"
90
 
+  UIConstraints "*PageSize A4.FB *OutputMode DraftRGBP"
91
 
   UIConstraints "*PageSize A4.FB *OutputMode DraftGray"
92
 
   UIConstraints "*PageSize B5.FB *OutputMode DraftRGB"
93
 
+  UIConstraints "*PageSize B5.FB *OutputMode DraftRGBC"
94
 
+  UIConstraints "*PageSize B5.FB *OutputMode DraftRGBP"
95
 
   UIConstraints "*PageSize B5.FB *OutputMode DraftGray"
96
 
   UIConstraints "*PageSize JB5.FB *OutputMode DraftRGB"
97
 
+  UIConstraints "*PageSize JB5.FB *OutputMode DraftRGBC"
98
 
+  UIConstraints "*PageSize JB5.FB *OutputMode DraftRGBP"
99
 
   UIConstraints "*PageSize JB5.FB *OutputMode DraftGray"
100
 
   UIConstraints "*PageSize HV.FB *OutputMode DraftRGB"
101
 
+  UIConstraints "*PageSize HV.FB *OutputMode DraftRGBC"
102
 
+  UIConstraints "*PageSize HV.FB *OutputMode DraftRGBP"
103
 
   UIConstraints "*PageSize HV.FB *OutputMode DraftGray"
104
 
   UIConstraints "*PageSize Mutsugiri.FB *OutputMode DraftRGB"
105
 
+  UIConstraints "*PageSize Mutsugiri.FB *OutputMode DraftRGBC"
106
 
+  UIConstraints "*PageSize Mutsugiri.FB *OutputMode DraftRGBP"
107
 
   UIConstraints "*PageSize Mutsugiri.FB *OutputMode DraftGray"
108
 
 
109
 
 // 4x6 or smaller
110
 
@@ -4988,21 +5032,35 @@
111
 
 
112
 
   // cupsCompression values map to QUALITY_MODE from global_types.h
113
 
   Option "OutputMode/Print Quality" PickOne AnySetup 10.0
114
 
-    *Choice "NormalRGB/Normal Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1/OutputType(0)/cupsString0(PlainNormalColor)/HWResolution[600 600]>>setpagedevice"
115
 
+    *Choice "NormalRGB/Normal Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(0)/cupsString0(PlainNormalKColor)/HWResolution[600 600]>>setpagedevice"
116
 
+    Choice "NormalRGBC/Normal Color (Only Color Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1/OutputType(0)/cupsString0(PlainNormalColor)/HWResolution[600 600]>>setpagedevice"
117
 
+    Choice "NormalRGBP/Normal Color (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(0)/cupsString0(PlainNormalPhotoColor)/HWResolution[600 600]>>setpagedevice"
118
 
     Choice "NormalGray/Normal Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2/OutputType(0)/cupsString0(PlainNormalGrayK)/HWResolution[600 600]>>setpagedevice"
119
 
-    Choice "DraftRGB/Draft Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(-1)/cupsString0(PlainDraftColor)/HWResolution[600 600]>>setpagedevice"
120
 
+    Choice "NormalGrayP/Normal Grayscale (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(0)/cupsString0(PlainNormalPhotoGrayK)/HWResolution[600 600]>>setpagedevice"
121
 
+    Choice "DraftRGB/Draft Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(-1)/cupsString0(PlainDraftKColor)/HWResolution[600 600]>>setpagedevice"
122
 
+    Choice "DraftRGBC/Draft Color (Only Color Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1/OutputType(-1)/cupsString0(PlainDraftColor)/HWResolution[600 600]>>setpagedevice"
123
 
+    Choice "DraftRGBP/Draft Color (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(-1)/cupsString0(PlainDraftPhotoColor)/HWResolution[600 600]>>setpagedevice"
124
 
     Choice "DraftGray/Draft Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2/OutputType(-1)/cupsString0(PlainDraftGrayK)/HWResolution[600 600]>>setpagedevice"
125
 
-    Choice "Photo/High-Resolution Photo" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(2)/cupsString0(PhotoBestPhotoColor)/HWResolution[600 600]>>setpagedevice"
126
 
+    Choice "Photo/High-Resolution Photo" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(2)/cupsString0(PhotoBest)/HWResolution[600 600]>>setpagedevice"
127
 
+    Choice "PhotoP/High-Resolution Photo (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(2)/cupsString0(PhotoBestPhotoColor)/HWResolution[600 600]>>setpagedevice"
128
 
 
129
 
   // Constraints
130
 
   UIConstraints "*MediaType Glossy *OutputMode DraftRGB"
131
 
+  UIConstraints "*MediaType Glossy *OutputMode DraftRGBC"
132
 
+  UIConstraints "*MediaType Glossy *OutputMode DraftRGBP"
133
 
   UIConstraints "*MediaType Glossy *OutputMode DraftGray"
134
 
   UIConstraints "*MediaType TransparencyFilm *OutputMode DraftRGB"
135
 
+  UIConstraints "*MediaType TransparencyFilm *OutputMode DraftRGBC"
136
 
+  UIConstraints "*MediaType TransparencyFilm *OutputMode DraftRGBP"
137
 
   UIConstraints "*MediaType TransparencyFilm *OutputMode DraftGray"
138
 
   UIConstraints "*MediaType Plain *OutputMode Photo"
139
 
+  UIConstraints "*MediaType Plain *OutputMode PhotoP"
140
 
   UIConstraints "*MediaType TransparencyFilm *OutputMode Photo"
141
 
+  UIConstraints "*MediaType TransparencyFilm *OutputMode PhotoP"
142
 
 
143
 
   UIConstraints "*PageSize Photo4x6tab.FB *OutputMode DraftRGB"
144
 
+  UIConstraints "*PageSize Photo4x6tab.FB *OutputMode DraftRGBC"
145
 
+  UIConstraints "*PageSize Photo4x6tab.FB *OutputMode DraftRGBP"
146
 
   UIConstraints "*PageSize Photo4x6tab.FB *OutputMode DraftGray"
147
 
 
148
 
 // 4x6 or smaller
149
 
@@ -7480,11 +7538,17 @@
150
 
 
151
 
   // cupsCompression values map to QUALITY_MODE from global_types.h
152
 
   Option "OutputMode/Print Quality" PickOne AnySetup 10.0
153
 
-    *Choice "NormalRGB/Normal Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1/OutputType(0)/cupsString0(PlainNormalColor)/HWResolution[600 600]>>setpagedevice"
154
 
+    *Choice "NormalRGB/Normal Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(0)/cupsString0(PlainNormalKColor)/HWResolution[600 600]>>setpagedevice"
155
 
+    Choice "NormalRGBC/Normal Color (Only Color Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1/OutputType(0)/cupsString0(PlainNormalColor)/HWResolution[600 600]>>setpagedevice"
156
 
+    Choice "NormalRGBP/Normal Color (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(0)/cupsString0(PlainNormalColorPhoto)/HWResolution[600 600]>>setpagedevice"
157
 
     Choice "NormalGray/Normal Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2/OutputType(0)/cupsString0(PlainNormalGrayK)/HWResolution[600 600]>>setpagedevice"
158
 
-    Choice "DraftRGB/Draft Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(-1)/cupsString0(PlainDraftColor)/HWResolution[300 300]>>setpagedevice"
159
 
+    Choice "NormalGrayP/Normal Grayscale (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(0)/cupsString0(PlainGrayPhotoColor)/HWResolution[600 600]>>setpagedevice"
160
 
+    Choice "DraftRGB/Draft Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(-1)/cupsString0(PlainDraftKColor)/HWResolution[300 300]>>setpagedevice"
161
 
+    Choice "DraftRGBC/Draft Color (Only Color Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1/OutputType(-1)/cupsString0(PlainDraftColor)/HWResolution[300 300]>>setpagedevice"
162
 
+    Choice "DraftRGBP/Draft Color (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(-1)/cupsString0(PlainDraftColorPhoto)/HWResolution[300 300]>>setpagedevice"
163
 
     Choice "DraftGray/Draft Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2/OutputType(-1)/cupsString0(PlainDraftGrayK)/HWResolution[300 300]>>setpagedevice"
164
 
-    Choice "Photo/High-Resolution Photo" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(2)/cupsString0(PhotoBestPhotoColor)/HWResolution[600 600]>>setpagedevice"
165
 
+    Choice "Photo/High-Resolution Photo" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(2)/cupsString0(PhotoBest)/HWResolution[600 600]>>setpagedevice"
166
 
+    Choice "PhotoP/High-Resolution Photo (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(2)/cupsString0(PhotoBestPhotoColor)/HWResolution[600 600]>>setpagedevice"
167
 
 
168
 
   // Duplexer is optional...
169
 
   Installable "OptionDuplex/Duplexer Installed"
170
 
@@ -7492,8 +7556,11 @@
171
 
   // Constraints
172
 
   UIConstraints "*Duplex *OptionDuplex False"
173
 
   UIConstraints "*MediaType Glossy *OutputMode DraftRGB"
174
 
+  UIConstraints "*MediaType Glossy *OutputMode DraftRGBC"
175
 
+  UIConstraints "*MediaType Glossy *OutputMode DraftRGBP"
176
 
   UIConstraints "*MediaType Glossy *OutputMode DraftGray"
177
 
   UIConstraints "*MediaType Plain *OutputMode Photo"
178
 
+  UIConstraints "*MediaType Plain *OutputMode PhotoP"
179
 
 
180
 
   Attribute "cupsModelName" "" "deskjet 3320"     // APDK device class 
181
 
 
182
 
@@ -7891,11 +7958,17 @@
183
 
 
184
 
   // cupsCompression values map to QUALITY_MODE from global_types.h
185
 
   Option "OutputMode/Print Quality" PickOne AnySetup 10.0
186
 
-    *Choice "NormalRGB/Normal Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1/OutputType(0)/cupsString0(PlainNormalColor)/HWResolution[600 600]>>setpagedevice"
187
 
+    *Choice "NormalRGB/Normal Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(0)/cupsString0(PlainNormalKColor)/HWResolution[600 600]>>setpagedevice"
188
 
+    Choice "NormalRGBC/Normal Color (Only Color Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1/OutputType(0)/cupsString0(PlainNormalColor)/HWResolution[600 600]>>setpagedevice"
189
 
+    Choice "NormalRGBP/Normal Color (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(0)/cupsString0(PlainNormalColorPhoto)/HWResolution[600 600]>>setpagedevice"
190
 
     Choice "NormalGray/Normal Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2/OutputType(0)/cupsString0(PlainNormalGrayK)/HWResolution[600 600]>>setpagedevice"
191
 
-    Choice "DraftRGB/Draft Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(-1)/cupsString0(PlainDraftColor)/HWResolution[300 300]>>setpagedevice"
192
 
+    Choice "NormalGrayP/Normal Grayscale (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(0)/cupsString0(PlainGrayPhotoColor)/HWResolution[600 600]>>setpagedevice"
193
 
+    Choice "DraftRGB/Draft Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(-1)/cupsString0(PlainDraftKColor)/HWResolution[300 300]>>setpagedevice"
194
 
+    Choice "DraftRGBC/Draft Color (Only Color Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1/OutputType(-1)/cupsString0(PlainDraftColor)/HWResolution[300 300]>>setpagedevice"
195
 
+    Choice "DraftRGBP/Draft Color (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(-1)/cupsString0(PlainDraftColorPhoto)/HWResolution[300 300]>>setpagedevice"
196
 
     Choice "DraftGray/Draft Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2/OutputType(-1)/cupsString0(PlainDraftGrayK)/HWResolution[300 300]>>setpagedevice"
197
 
-    Choice "Photo/High-Resolution Photo" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(2)/cupsString0(PhotoBestPhotoColor)/HWResolution[600 600]>>setpagedevice"
198
 
+    Choice "Photo/High-Resolution Photo" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(2)/cupsString0(PhotoBest)/HWResolution[600 600]>>setpagedevice"
199
 
+    Choice "PhotoP/High-Resolution Photo (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(2)/cupsString0(PhotoBestPhotoColor)/HWResolution[600 600]>>setpagedevice"
200
 
 
201
 
   // Duplexer is optional...
202
 
   Installable "OptionDuplex/Duplexer Installed"
203
 
@@ -7903,8 +7976,11 @@
204
 
   // Constraints
205
 
   UIConstraints "*Duplex *OptionDuplex False"
206
 
   UIConstraints "*MediaType Glossy *OutputMode DraftRGB"
207
 
+  UIConstraints "*MediaType Glossy *OutputMode DraftRGBC"
208
 
+  UIConstraints "*MediaType Glossy *OutputMode DraftRGBP"
209
 
   UIConstraints "*MediaType Glossy *OutputMode DraftGray"
210
 
   UIConstraints "*MediaType Plain *OutputMode Photo"
211
 
+  UIConstraints "*MediaType Plain *OutputMode PhotoP"
212
 
 
213
 
   Attribute "cupsModelName" "" "deskjet 3600"     // APDK device class 
214
 
 
215
 
@@ -8286,11 +8362,17 @@
216
 
 
217
 
   // cupsCompression values map to QUALITY_MODE from global_types.h
218
 
   Option "OutputMode/Print Quality" PickOne AnySetup 10.0
219
 
-    *Choice "NormalRGB/Normal Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1/OutputType(0)/cupsString0(PlainNormalColor)/HWResolution[600 600]>>setpagedevice"
220
 
+    *Choice "NormalRGB/Normal Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(0)/cupsString0(PlainNormalKColor)/HWResolution[600 600]>>setpagedevice"
221
 
+    Choice "NormalRGBC/Normal Color (Only Color Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1/OutputType(0)/cupsString0(PlainNormalColor)/HWResolution[600 600]>>setpagedevice"
222
 
+    Choice "NormalRGBP/Normal Color (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(0)/cupsString0(PlainNormalPhotoColor)/HWResolution[600 600]>>setpagedevice"
223
 
     Choice "NormalGray/Normal Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2/OutputType(0)/cupsString0(PlainNormalGrayK)/HWResolution[600 600]>>setpagedevice"
224
 
-    Choice "DraftRGB/Draft Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(-1)/cupsString0(PlainDraftColor)/HWResolution[600 600]>>setpagedevice"
225
 
+    Choice "NormalGrayP/Normal Grayscale (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(0)/cupsString0(PlainNormalPhotoGrayK)/HWResolution[600 600]>>setpagedevice"
226
 
+    Choice "DraftRGB/Draft Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(-1)/cupsString0(PlainDraftKColor)/HWResolution[600 600]>>setpagedevice"
227
 
+    Choice "DraftRGBC/Draft Color (Only Color Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 1/OutputType(-1)/cupsString0(PlainDraftColor)/HWResolution[600 600]>>setpagedevice"
228
 
+    Choice "DraftRGBP/Draft Color (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(-1)/cupsString0(PlainDraftPhotoColor)/HWResolution[600 600]>>setpagedevice"
229
 
     Choice "DraftGray/Draft Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2/OutputType(-1)/cupsString0(PlainDraftGrayK)/HWResolution[600 600]>>setpagedevice"
230
 
-    Choice "Photo/High-Resolution Photo" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(2)/cupsString0(PhotoBestPhotoColor)/HWResolution[600 600]>>setpagedevice"
231
 
+    Choice "Photo/High-Resolution Photo" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(2)/cupsString0(PhotoBest)/HWResolution[600 600]>>setpagedevice"
232
 
+    Choice "PhotoP/High-Resolution Photo (With Photo Cartridge)" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(2)/cupsString0(PhotoBestPhotoColor)/HWResolution[600 600]>>setpagedevice"
233
 
 
234
 
   // Duplexer is optional...
235
 
   Installable "OptionDuplex/Duplexer Installed"
236
 
@@ -8298,8 +8380,11 @@
237
 
   // Constraints
238
 
   UIConstraints "*Duplex *OptionDuplex False"
239
 
   UIConstraints "*MediaType Glossy *OutputMode DraftRGB"
240
 
+  UIConstraints "*MediaType Glossy *OutputMode DraftRGBC"
241
 
+  UIConstraints "*MediaType Glossy *OutputMode DraftRGBP"
242
 
   UIConstraints "*MediaType Glossy *OutputMode DraftGray"
243
 
   UIConstraints "*MediaType Plain *OutputMode Photo"
244
 
+  UIConstraints "*MediaType Plain *OutputMode PhotoP"
245
 
 
246
 
   {
247
 
 // 4x6 or smaller
248
 
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
249
 
--- hplip-3.10.6~/prnt/drv/hpijs.drv.in 2010-09-14 16:08:45.936316029 +0200
250
 
+++ hplip-3.10.6/prnt/drv/hpijs.drv.in  2010-09-14 16:08:46.506315314 +0200
251
 
@@ -4411,16 +4411,16 @@
 
8
Index: hplip-3.12.4/prnt/drv/hpijs.drv.in
 
9
===================================================================
 
10
--- hplip-3.12.4.orig/prnt/drv/hpijs.drv.in     2012-05-26 10:21:29.000000000 +1000
 
11
+++ hplip-3.12.4/prnt/drv/hpijs.drv.in  2012-05-26 10:21:29.000000000 +1000
 
12
@@ -4376,16 +4376,16 @@
252
13
 r=&quot;HEWLETT-PACKARD&quot; -sDeviceModel=&quot;deskjet 3320&quot;"
253
14
   Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B"
254
15
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=300DraftColorCM&&
269
30
   Attribute "FoomaticRIPOption" "PageSize" "enum CmdLine A"
270
31
   Attribute "FoomaticRIPOptionSetting" "PageSize=Letter" " -dDEVICEWIDTHPOINTS=612 -&&
271
32
 dDEVICEHEIGHTPOINTS=792"
272
 
@@ -4879,13 +4879,13 @@
 
33
@@ -4844,13 +4844,13 @@
273
34
 r=&quot;HEWLETT-PACKARD&quot; -sDeviceModel=&quot;deskjet 3600&quot;"
274
35
   Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B"
275
36
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=300DraftColorCM&&
286
47
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High.Gray" "Quality=600Grayscal&&
287
48
 eK"
288
49
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMYKFul&&
289
 
@@ -5347,13 +5347,13 @@
 
50
@@ -5312,13 +5312,13 @@
290
51
 "
291
52
   Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B"
292
53
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Draft" "Quality=600DraftColorCM&&
303
64
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=High.Gray" "Quality=600Grayscal&&
304
65
 eK"
305
66
   Attribute "FoomaticRIPOptionSetting" "PrintoutMode=Photo" "Quality=600PhotoCMYKFul&&
306
 
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
307
 
--- hplip-3.10.6~/prnt/drv/hpijs.drv.in.template        2010-07-19 04:15:11.000000000 +0200
308
 
+++ hplip-3.10.6/prnt/drv/hpijs.drv.in.template 2010-09-14 16:08:57.346301718 +0200
 
67
Index: hplip-3.12.4/prnt/drv/hpijs.drv.in.template
 
68
===================================================================
 
69
--- hplip-3.12.4.orig/prnt/drv/hpijs.drv.in.template    2012-04-10 18:32:37.000000000 +1000
 
70
+++ hplip-3.12.4/prnt/drv/hpijs.drv.in.template 2012-05-26 10:21:29.000000000 +1000
309
71
@@ -2221,16 +2221,16 @@
310
72
 r=&quot;HEWLETT-PACKARD&quot; -sDeviceModel=&quot;deskjet 3320&quot;"
311
73
   Attribute "FoomaticRIPOption" "PrintoutMode" "enum Composite B"