--- cups-1.3.9/ppd/epson24.ppd.orig	2007-11-27 01:09:24.000000000 +0100
+++ cups-1.3.9/ppd/epson24.ppd	2008-10-23 15:03:56.000000000 +0200
@@ -78,7 +78,6 @@
 *Resolution 120x60dpi: "<</HWResolution[120 60]/cupsBitsPerColor 1/cupsRowCount 8/cupsRowFeed 0/cupsRowStep 0/cupsColorSpace 3>>setpagedevice"
 *Resolution 180dpi: "<</HWResolution[180 180]/cupsBitsPerColor 1/cupsRowCount 24/cupsRowFeed 0/cupsRowStep 0/cupsColorSpace 3>>setpagedevice"
 *Resolution 360x180dpi: "<</HWResolution[360 180]/cupsBitsPerColor 1/cupsRowCount 24/cupsRowFeed 0/cupsRowStep 0/cupsColorSpace 3>>setpagedevice"
-*Resolution 360x180dpi: "<</HWResolution[360 180]/cupsBitsPerColor 1/cupsRowCount 48/cupsRowFeed 0/cupsRowStep 0/cupsColorSpace 3>>setpagedevice"
 *CloseUI: *Resolution
 *da.Translation Manufacturer/Epson: ""
 *da.Translation ModelName/Epson 24-Pin Series: ""
--- cups-1.3.9/ppd/stcolor.ppd.orig	2007-11-27 01:09:24.000000000 +0100
+++ cups-1.3.9/ppd/stcolor.ppd	2008-10-23 15:07:20.000000000 +0200
@@ -42,9 +42,6 @@
 *PageSize Legal/Legal - 8.5x14in: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
 *PageSize A4/A4 - 210x297mm: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
 *PageSize FanFoldUS/Fanfold - 14.875x11in: "<</PageSize[1071 792]/ImagingBBox null>>setpagedevice"
-*PageSize Letter/Letter - 8.5x11in: "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
-*PageSize Legal/Legal - 8.5x14in: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
-*PageSize A4/A4 - 210x297mm: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
 *CloseUI: *PageSize
 *OpenUI *PageRegion/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageRegion
@@ -53,26 +50,17 @@
 *PageRegion Legal/Legal - 8.5x14in: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
 *PageRegion A4/A4 - 210x297mm: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
 *PageRegion FanFoldUS/Fanfold - 14.875x11in: "<</PageSize[1071 792]/ImagingBBox null>>setpagedevice"
-*PageRegion Letter/Letter - 8.5x11in: "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
-*PageRegion Legal/Legal - 8.5x14in: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
-*PageRegion A4/A4 - 210x297mm: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
 *CloseUI: *PageRegion
 *DefaultImageableArea: Letter
 *ImageableArea Letter/Letter - 8.5x11in: "18.00 18.00 594.00 774.00"
 *ImageableArea Legal/Legal - 8.5x14in: "18.00 18.00 594.00 990.00"
 *ImageableArea A4/A4 - 210x297mm: "18.00 18.00 577.00 824.00"
 *ImageableArea FanFoldUS/Fanfold - 14.875x11in: "18.00 18.00 1053.00 774.00"
-*ImageableArea Letter/Letter - 8.5x11in: "8.60 39.60 603.40 766.49"
-*ImageableArea Legal/Legal - 8.5x14in: "8.60 39.60 603.40 982.49"
-*ImageableArea A4/A4 - 210x297mm: "8.60 39.60 586.40 816.49"
 *DefaultPaperDimension: Letter
 *PaperDimension Letter/Letter - 8.5x11in: "612.00 792.00"
 *PaperDimension Legal/Legal - 8.5x14in: "612.00 1008.00"
 *PaperDimension A4/A4 - 210x297mm: "595.00 842.00"
 *PaperDimension FanFoldUS/Fanfold - 14.875x11in: "1071.00 792.00"
-*PaperDimension Letter/Letter - 8.5x11in: "612.00 792.00"
-*PaperDimension Legal/Legal - 8.5x14in: "612.00 1008.00"
-*PaperDimension A4/A4 - 210x297mm: "595.00 842.00"
 *MaxMediaWidth: "1080.00"
 *MaxMediaHeight: "86400.00"
 *HWMargins: 8.60 39.60 8.60 25.51
@@ -105,9 +93,6 @@
 *da.PageSize Legal/Legal - 8.5x14in: ""
 *da.PageSize A4/A4 - 210x297mm: ""
 *da.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*da.PageSize Letter/Letter - 8.5x11in: ""
-*da.PageSize Legal/Legal - 8.5x14in: ""
-*da.PageSize A4/A4 - 210x297mm: ""
 *da.Translation Resolution/Resolution: ""
 *da.Resolution 180dpi/180dpi: ""
 *da.Resolution 360dpi/360dpi: ""
@@ -124,9 +109,6 @@
 *de.PageSize Legal/Legal - 8.5x14in: ""
 *de.PageSize A4/A4 - 210x297mm: ""
 *de.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*de.PageSize Letter/Letter - 8.5x11in: ""
-*de.PageSize Legal/Legal - 8.5x14in: ""
-*de.PageSize A4/A4 - 210x297mm: ""
 *de.Translation Resolution/Resolution: ""
 *de.Resolution 180dpi/180dpi: ""
 *de.Resolution 360dpi/360dpi: ""
@@ -143,9 +125,6 @@
 *es.PageSize Legal/Legal - 8.5x14in: ""
 *es.PageSize A4/A4 - 210x297mm: ""
 *es.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*es.PageSize Letter/Letter - 8.5x11in: ""
-*es.PageSize Legal/Legal - 8.5x14in: ""
-*es.PageSize A4/A4 - 210x297mm: ""
 *es.Translation Resolution/Resolution: ""
 *es.Resolution 180dpi/180dpi: ""
 *es.Resolution 360dpi/360dpi: ""
@@ -162,9 +141,6 @@
 *fi.PageSize Legal/Legal - 8.5x14in: ""
 *fi.PageSize A4/A4 - 210x297mm: ""
 *fi.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*fi.PageSize Letter/Letter - 8.5x11in: ""
-*fi.PageSize Legal/Legal - 8.5x14in: ""
-*fi.PageSize A4/A4 - 210x297mm: ""
 *fi.Translation Resolution/Resolution: ""
 *fi.Resolution 180dpi/180dpi: ""
 *fi.Resolution 360dpi/360dpi: ""
@@ -181,9 +157,6 @@
 *fr.PageSize Legal/Legal - 8.5x14in: ""
 *fr.PageSize A4/A4 - 210x297mm: ""
 *fr.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*fr.PageSize Letter/Letter - 8.5x11in: ""
-*fr.PageSize Legal/Legal - 8.5x14in: ""
-*fr.PageSize A4/A4 - 210x297mm: ""
 *fr.Translation Resolution/Resolution: ""
 *fr.Resolution 180dpi/180dpi: ""
 *fr.Resolution 360dpi/360dpi: ""
@@ -200,9 +173,6 @@
 *it.PageSize Legal/Legal - 8.5x14in: ""
 *it.PageSize A4/A4 - 210x297mm: ""
 *it.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*it.PageSize Letter/Letter - 8.5x11in: ""
-*it.PageSize Legal/Legal - 8.5x14in: ""
-*it.PageSize A4/A4 - 210x297mm: ""
 *it.Translation Resolution/Resolution: ""
 *it.Resolution 180dpi/180dpi: ""
 *it.Resolution 360dpi/360dpi: ""
@@ -219,9 +189,6 @@
 *ja.PageSize Legal/Legal - 8.5x14in: ""
 *ja.PageSize A4/A4 - 210x297mm: ""
 *ja.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*ja.PageSize Letter/Letter - 8.5x11in: ""
-*ja.PageSize Legal/Legal - 8.5x14in: ""
-*ja.PageSize A4/A4 - 210x297mm: ""
 *ja.Translation Resolution/Resolution: ""
 *ja.Resolution 180dpi/180dpi: ""
 *ja.Resolution 360dpi/360dpi: ""
@@ -238,9 +205,6 @@
 *ko.PageSize Legal/Legal - 8.5x14in: ""
 *ko.PageSize A4/A4 - 210x297mm: ""
 *ko.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*ko.PageSize Letter/Letter - 8.5x11in: ""
-*ko.PageSize Legal/Legal - 8.5x14in: ""
-*ko.PageSize A4/A4 - 210x297mm: ""
 *ko.Translation Resolution/Resolution: ""
 *ko.Resolution 180dpi/180dpi: ""
 *ko.Resolution 360dpi/360dpi: ""
@@ -257,9 +221,6 @@
 *nl.PageSize Legal/Legal - 8.5x14in: ""
 *nl.PageSize A4/A4 - 210x297mm: ""
 *nl.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*nl.PageSize Letter/Letter - 8.5x11in: ""
-*nl.PageSize Legal/Legal - 8.5x14in: ""
-*nl.PageSize A4/A4 - 210x297mm: ""
 *nl.Translation Resolution/Resolution: ""
 *nl.Resolution 180dpi/180dpi: ""
 *nl.Resolution 360dpi/360dpi: ""
@@ -276,9 +237,6 @@
 *no.PageSize Legal/Legal - 8.5x14in: ""
 *no.PageSize A4/A4 - 210x297mm: ""
 *no.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*no.PageSize Letter/Letter - 8.5x11in: ""
-*no.PageSize Legal/Legal - 8.5x14in: ""
-*no.PageSize A4/A4 - 210x297mm: ""
 *no.Translation Resolution/Resolution: ""
 *no.Resolution 180dpi/180dpi: ""
 *no.Resolution 360dpi/360dpi: ""
@@ -295,9 +253,6 @@
 *pt.PageSize Legal/Legal - 8.5x14in: ""
 *pt.PageSize A4/A4 - 210x297mm: ""
 *pt.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*pt.PageSize Letter/Letter - 8.5x11in: ""
-*pt.PageSize Legal/Legal - 8.5x14in: ""
-*pt.PageSize A4/A4 - 210x297mm: ""
 *pt.Translation Resolution/Resolution: ""
 *pt.Resolution 180dpi/180dpi: ""
 *pt.Resolution 360dpi/360dpi: ""
@@ -314,9 +269,6 @@
 *pt_BR.PageSize Legal/Legal - 8.5x14in: ""
 *pt_BR.PageSize A4/A4 - 210x297mm: ""
 *pt_BR.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
-*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
-*pt_BR.PageSize A4/A4 - 210x297mm: ""
 *pt_BR.Translation Resolution/Resolution: ""
 *pt_BR.Resolution 180dpi/180dpi: ""
 *pt_BR.Resolution 360dpi/360dpi: ""
@@ -333,9 +285,6 @@
 *sv.PageSize Legal/Legal - 8.5x14in: ""
 *sv.PageSize A4/A4 - 210x297mm: ""
 *sv.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*sv.PageSize Letter/Letter - 8.5x11in: ""
-*sv.PageSize Legal/Legal - 8.5x14in: ""
-*sv.PageSize A4/A4 - 210x297mm: ""
 *sv.Translation Resolution/Resolution: ""
 *sv.Resolution 180dpi/180dpi: ""
 *sv.Resolution 360dpi/360dpi: ""
@@ -352,9 +301,6 @@
 *zh.PageSize Legal/Legal - 8.5x14in: ""
 *zh.PageSize A4/A4 - 210x297mm: ""
 *zh.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*zh.PageSize Letter/Letter - 8.5x11in: ""
-*zh.PageSize Legal/Legal - 8.5x14in: ""
-*zh.PageSize A4/A4 - 210x297mm: ""
 *zh.Translation Resolution/Resolution: ""
 *zh.Resolution 180dpi/180dpi: ""
 *zh.Resolution 360dpi/360dpi: ""
@@ -371,9 +317,6 @@
 *zh_TW.PageSize Legal/Legal - 8.5x14in: ""
 *zh_TW.PageSize A4/A4 - 210x297mm: ""
 *zh_TW.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*zh_TW.PageSize Letter/Letter - 8.5x11in: ""
-*zh_TW.PageSize Legal/Legal - 8.5x14in: ""
-*zh_TW.PageSize A4/A4 - 210x297mm: ""
 *zh_TW.Translation Resolution/Resolution: ""
 *zh_TW.Resolution 180dpi/180dpi: ""
 *zh_TW.Resolution 360dpi/360dpi: ""
--- cups-1.3.9/ppd/stphoto.ppd.orig	2007-11-27 01:09:24.000000000 +0100
+++ cups-1.3.9/ppd/stphoto.ppd	2008-10-23 15:09:11.000000000 +0200
@@ -42,9 +42,6 @@
 *PageSize Legal/Legal - 8.5x14in: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
 *PageSize A4/A4 - 210x297mm: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
 *PageSize FanFoldUS/Fanfold - 14.875x11in: "<</PageSize[1071 792]/ImagingBBox null>>setpagedevice"
-*PageSize Letter/Letter - 8.5x11in: "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
-*PageSize Legal/Legal - 8.5x14in: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
-*PageSize A4/A4 - 210x297mm: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
 *CloseUI: *PageSize
 *OpenUI *PageRegion/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageRegion
@@ -53,26 +50,17 @@
 *PageRegion Legal/Legal - 8.5x14in: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
 *PageRegion A4/A4 - 210x297mm: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
 *PageRegion FanFoldUS/Fanfold - 14.875x11in: "<</PageSize[1071 792]/ImagingBBox null>>setpagedevice"
-*PageRegion Letter/Letter - 8.5x11in: "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
-*PageRegion Legal/Legal - 8.5x14in: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
-*PageRegion A4/A4 - 210x297mm: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
 *CloseUI: *PageRegion
 *DefaultImageableArea: Letter
 *ImageableArea Letter/Letter - 8.5x11in: "18.00 18.00 594.00 774.00"
 *ImageableArea Legal/Legal - 8.5x14in: "18.00 18.00 594.00 990.00"
 *ImageableArea A4/A4 - 210x297mm: "18.00 18.00 577.00 824.00"
 *ImageableArea FanFoldUS/Fanfold - 14.875x11in: "18.00 18.00 1053.00 774.00"
-*ImageableArea Letter/Letter - 8.5x11in: "8.60 39.60 603.40 766.49"
-*ImageableArea Legal/Legal - 8.5x14in: "8.60 39.60 603.40 982.49"
-*ImageableArea A4/A4 - 210x297mm: "8.60 39.60 586.40 816.49"
 *DefaultPaperDimension: Letter
 *PaperDimension Letter/Letter - 8.5x11in: "612.00 792.00"
 *PaperDimension Legal/Legal - 8.5x14in: "612.00 1008.00"
 *PaperDimension A4/A4 - 210x297mm: "595.00 842.00"
 *PaperDimension FanFoldUS/Fanfold - 14.875x11in: "1071.00 792.00"
-*PaperDimension Letter/Letter - 8.5x11in: "612.00 792.00"
-*PaperDimension Legal/Legal - 8.5x14in: "612.00 1008.00"
-*PaperDimension A4/A4 - 210x297mm: "595.00 842.00"
 *MaxMediaWidth: "1080.00"
 *MaxMediaHeight: "86400.00"
 *HWMargins: 8.60 39.60 8.60 25.51
@@ -105,9 +93,6 @@
 *da.PageSize Legal/Legal - 8.5x14in: ""
 *da.PageSize A4/A4 - 210x297mm: ""
 *da.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*da.PageSize Letter/Letter - 8.5x11in: ""
-*da.PageSize Legal/Legal - 8.5x14in: ""
-*da.PageSize A4/A4 - 210x297mm: ""
 *da.Translation Resolution/Resolution: ""
 *da.Resolution 180dpi/180dpi: ""
 *da.Resolution 360dpi/360dpi: ""
@@ -124,9 +109,6 @@
 *de.PageSize Legal/Legal - 8.5x14in: ""
 *de.PageSize A4/A4 - 210x297mm: ""
 *de.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*de.PageSize Letter/Letter - 8.5x11in: ""
-*de.PageSize Legal/Legal - 8.5x14in: ""
-*de.PageSize A4/A4 - 210x297mm: ""
 *de.Translation Resolution/Resolution: ""
 *de.Resolution 180dpi/180dpi: ""
 *de.Resolution 360dpi/360dpi: ""
@@ -143,9 +125,6 @@
 *es.PageSize Legal/Legal - 8.5x14in: ""
 *es.PageSize A4/A4 - 210x297mm: ""
 *es.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*es.PageSize Letter/Letter - 8.5x11in: ""
-*es.PageSize Legal/Legal - 8.5x14in: ""
-*es.PageSize A4/A4 - 210x297mm: ""
 *es.Translation Resolution/Resolution: ""
 *es.Resolution 180dpi/180dpi: ""
 *es.Resolution 360dpi/360dpi: ""
@@ -162,9 +141,6 @@
 *fi.PageSize Legal/Legal - 8.5x14in: ""
 *fi.PageSize A4/A4 - 210x297mm: ""
 *fi.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*fi.PageSize Letter/Letter - 8.5x11in: ""
-*fi.PageSize Legal/Legal - 8.5x14in: ""
-*fi.PageSize A4/A4 - 210x297mm: ""
 *fi.Translation Resolution/Resolution: ""
 *fi.Resolution 180dpi/180dpi: ""
 *fi.Resolution 360dpi/360dpi: ""
@@ -181,9 +157,6 @@
 *fr.PageSize Legal/Legal - 8.5x14in: ""
 *fr.PageSize A4/A4 - 210x297mm: ""
 *fr.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*fr.PageSize Letter/Letter - 8.5x11in: ""
-*fr.PageSize Legal/Legal - 8.5x14in: ""
-*fr.PageSize A4/A4 - 210x297mm: ""
 *fr.Translation Resolution/Resolution: ""
 *fr.Resolution 180dpi/180dpi: ""
 *fr.Resolution 360dpi/360dpi: ""
@@ -200,9 +173,6 @@
 *it.PageSize Legal/Legal - 8.5x14in: ""
 *it.PageSize A4/A4 - 210x297mm: ""
 *it.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*it.PageSize Letter/Letter - 8.5x11in: ""
-*it.PageSize Legal/Legal - 8.5x14in: ""
-*it.PageSize A4/A4 - 210x297mm: ""
 *it.Translation Resolution/Resolution: ""
 *it.Resolution 180dpi/180dpi: ""
 *it.Resolution 360dpi/360dpi: ""
@@ -219,9 +189,6 @@
 *ja.PageSize Legal/Legal - 8.5x14in: ""
 *ja.PageSize A4/A4 - 210x297mm: ""
 *ja.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*ja.PageSize Letter/Letter - 8.5x11in: ""
-*ja.PageSize Legal/Legal - 8.5x14in: ""
-*ja.PageSize A4/A4 - 210x297mm: ""
 *ja.Translation Resolution/Resolution: ""
 *ja.Resolution 180dpi/180dpi: ""
 *ja.Resolution 360dpi/360dpi: ""
@@ -238,9 +205,6 @@
 *ko.PageSize Legal/Legal - 8.5x14in: ""
 *ko.PageSize A4/A4 - 210x297mm: ""
 *ko.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*ko.PageSize Letter/Letter - 8.5x11in: ""
-*ko.PageSize Legal/Legal - 8.5x14in: ""
-*ko.PageSize A4/A4 - 210x297mm: ""
 *ko.Translation Resolution/Resolution: ""
 *ko.Resolution 180dpi/180dpi: ""
 *ko.Resolution 360dpi/360dpi: ""
@@ -257,9 +221,6 @@
 *nl.PageSize Legal/Legal - 8.5x14in: ""
 *nl.PageSize A4/A4 - 210x297mm: ""
 *nl.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*nl.PageSize Letter/Letter - 8.5x11in: ""
-*nl.PageSize Legal/Legal - 8.5x14in: ""
-*nl.PageSize A4/A4 - 210x297mm: ""
 *nl.Translation Resolution/Resolution: ""
 *nl.Resolution 180dpi/180dpi: ""
 *nl.Resolution 360dpi/360dpi: ""
@@ -276,9 +237,6 @@
 *no.PageSize Legal/Legal - 8.5x14in: ""
 *no.PageSize A4/A4 - 210x297mm: ""
 *no.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*no.PageSize Letter/Letter - 8.5x11in: ""
-*no.PageSize Legal/Legal - 8.5x14in: ""
-*no.PageSize A4/A4 - 210x297mm: ""
 *no.Translation Resolution/Resolution: ""
 *no.Resolution 180dpi/180dpi: ""
 *no.Resolution 360dpi/360dpi: ""
@@ -295,9 +253,6 @@
 *pt.PageSize Legal/Legal - 8.5x14in: ""
 *pt.PageSize A4/A4 - 210x297mm: ""
 *pt.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*pt.PageSize Letter/Letter - 8.5x11in: ""
-*pt.PageSize Legal/Legal - 8.5x14in: ""
-*pt.PageSize A4/A4 - 210x297mm: ""
 *pt.Translation Resolution/Resolution: ""
 *pt.Resolution 180dpi/180dpi: ""
 *pt.Resolution 360dpi/360dpi: ""
@@ -314,9 +269,6 @@
 *pt_BR.PageSize Legal/Legal - 8.5x14in: ""
 *pt_BR.PageSize A4/A4 - 210x297mm: ""
 *pt_BR.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
-*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
-*pt_BR.PageSize A4/A4 - 210x297mm: ""
 *pt_BR.Translation Resolution/Resolution: ""
 *pt_BR.Resolution 180dpi/180dpi: ""
 *pt_BR.Resolution 360dpi/360dpi: ""
@@ -333,9 +285,6 @@
 *sv.PageSize Legal/Legal - 8.5x14in: ""
 *sv.PageSize A4/A4 - 210x297mm: ""
 *sv.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*sv.PageSize Letter/Letter - 8.5x11in: ""
-*sv.PageSize Legal/Legal - 8.5x14in: ""
-*sv.PageSize A4/A4 - 210x297mm: ""
 *sv.Translation Resolution/Resolution: ""
 *sv.Resolution 180dpi/180dpi: ""
 *sv.Resolution 360dpi/360dpi: ""
@@ -352,9 +301,6 @@
 *zh.PageSize Legal/Legal - 8.5x14in: ""
 *zh.PageSize A4/A4 - 210x297mm: ""
 *zh.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*zh.PageSize Letter/Letter - 8.5x11in: ""
-*zh.PageSize Legal/Legal - 8.5x14in: ""
-*zh.PageSize A4/A4 - 210x297mm: ""
 *zh.Translation Resolution/Resolution: ""
 *zh.Resolution 180dpi/180dpi: ""
 *zh.Resolution 360dpi/360dpi: ""
@@ -371,9 +317,6 @@
 *zh_TW.PageSize Legal/Legal - 8.5x14in: ""
 *zh_TW.PageSize A4/A4 - 210x297mm: ""
 *zh_TW.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*zh_TW.PageSize Letter/Letter - 8.5x11in: ""
-*zh_TW.PageSize Legal/Legal - 8.5x14in: ""
-*zh_TW.PageSize A4/A4 - 210x297mm: ""
 *zh_TW.Translation Resolution/Resolution: ""
 *zh_TW.Resolution 180dpi/180dpi: ""
 *zh_TW.Resolution 360dpi/360dpi: ""
--- cups-1.3.9/ppd/stphoto2.ppd.orig	2007-11-27 01:09:24.000000000 +0100
+++ cups-1.3.9/ppd/stphoto2.ppd	2008-10-23 15:10:16.000000000 +0200
@@ -42,9 +42,6 @@
 *PageSize Legal/Legal - 8.5x14in: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
 *PageSize A4/A4 - 210x297mm: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
 *PageSize FanFoldUS/Fanfold - 14.875x11in: "<</PageSize[1071 792]/ImagingBBox null>>setpagedevice"
-*PageSize Letter/Letter - 8.5x11in: "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
-*PageSize Legal/Legal - 8.5x14in: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
-*PageSize A4/A4 - 210x297mm: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
 *CloseUI: *PageSize
 *OpenUI *PageRegion/Media Size: PickOne
 *OrderDependency: 10 AnySetup *PageRegion
@@ -53,26 +50,17 @@
 *PageRegion Legal/Legal - 8.5x14in: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
 *PageRegion A4/A4 - 210x297mm: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
 *PageRegion FanFoldUS/Fanfold - 14.875x11in: "<</PageSize[1071 792]/ImagingBBox null>>setpagedevice"
-*PageRegion Letter/Letter - 8.5x11in: "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
-*PageRegion Legal/Legal - 8.5x14in: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
-*PageRegion A4/A4 - 210x297mm: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
 *CloseUI: *PageRegion
 *DefaultImageableArea: Letter
 *ImageableArea Letter/Letter - 8.5x11in: "18.00 18.00 594.00 774.00"
 *ImageableArea Legal/Legal - 8.5x14in: "18.00 18.00 594.00 990.00"
 *ImageableArea A4/A4 - 210x297mm: "18.00 18.00 577.00 824.00"
 *ImageableArea FanFoldUS/Fanfold - 14.875x11in: "18.00 18.00 1053.00 774.00"
-*ImageableArea Letter/Letter - 8.5x11in: "8.60 39.60 603.40 766.49"
-*ImageableArea Legal/Legal - 8.5x14in: "8.60 39.60 603.40 982.49"
-*ImageableArea A4/A4 - 210x297mm: "8.60 39.60 586.40 816.49"
 *DefaultPaperDimension: Letter
 *PaperDimension Letter/Letter - 8.5x11in: "612.00 792.00"
 *PaperDimension Legal/Legal - 8.5x14in: "612.00 1008.00"
 *PaperDimension A4/A4 - 210x297mm: "595.00 842.00"
 *PaperDimension FanFoldUS/Fanfold - 14.875x11in: "1071.00 792.00"
-*PaperDimension Letter/Letter - 8.5x11in: "612.00 792.00"
-*PaperDimension Legal/Legal - 8.5x14in: "612.00 1008.00"
-*PaperDimension A4/A4 - 210x297mm: "595.00 842.00"
 *MaxMediaWidth: "1080.00"
 *MaxMediaHeight: "86400.00"
 *HWMargins: 8.60 39.60 8.60 25.51
@@ -105,9 +93,6 @@
 *da.PageSize Legal/Legal - 8.5x14in: ""
 *da.PageSize A4/A4 - 210x297mm: ""
 *da.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*da.PageSize Letter/Letter - 8.5x11in: ""
-*da.PageSize Legal/Legal - 8.5x14in: ""
-*da.PageSize A4/A4 - 210x297mm: ""
 *da.Translation Resolution/Resolution: ""
 *da.Resolution 180dpi/180dpi: ""
 *da.Resolution 360dpi/360dpi: ""
@@ -124,9 +109,6 @@
 *de.PageSize Legal/Legal - 8.5x14in: ""
 *de.PageSize A4/A4 - 210x297mm: ""
 *de.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*de.PageSize Letter/Letter - 8.5x11in: ""
-*de.PageSize Legal/Legal - 8.5x14in: ""
-*de.PageSize A4/A4 - 210x297mm: ""
 *de.Translation Resolution/Resolution: ""
 *de.Resolution 180dpi/180dpi: ""
 *de.Resolution 360dpi/360dpi: ""
@@ -143,9 +125,6 @@
 *es.PageSize Legal/Legal - 8.5x14in: ""
 *es.PageSize A4/A4 - 210x297mm: ""
 *es.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*es.PageSize Letter/Letter - 8.5x11in: ""
-*es.PageSize Legal/Legal - 8.5x14in: ""
-*es.PageSize A4/A4 - 210x297mm: ""
 *es.Translation Resolution/Resolution: ""
 *es.Resolution 180dpi/180dpi: ""
 *es.Resolution 360dpi/360dpi: ""
@@ -162,9 +141,6 @@
 *fi.PageSize Legal/Legal - 8.5x14in: ""
 *fi.PageSize A4/A4 - 210x297mm: ""
 *fi.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*fi.PageSize Letter/Letter - 8.5x11in: ""
-*fi.PageSize Legal/Legal - 8.5x14in: ""
-*fi.PageSize A4/A4 - 210x297mm: ""
 *fi.Translation Resolution/Resolution: ""
 *fi.Resolution 180dpi/180dpi: ""
 *fi.Resolution 360dpi/360dpi: ""
@@ -181,9 +157,6 @@
 *fr.PageSize Legal/Legal - 8.5x14in: ""
 *fr.PageSize A4/A4 - 210x297mm: ""
 *fr.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*fr.PageSize Letter/Letter - 8.5x11in: ""
-*fr.PageSize Legal/Legal - 8.5x14in: ""
-*fr.PageSize A4/A4 - 210x297mm: ""
 *fr.Translation Resolution/Resolution: ""
 *fr.Resolution 180dpi/180dpi: ""
 *fr.Resolution 360dpi/360dpi: ""
@@ -200,9 +173,6 @@
 *it.PageSize Legal/Legal - 8.5x14in: ""
 *it.PageSize A4/A4 - 210x297mm: ""
 *it.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*it.PageSize Letter/Letter - 8.5x11in: ""
-*it.PageSize Legal/Legal - 8.5x14in: ""
-*it.PageSize A4/A4 - 210x297mm: ""
 *it.Translation Resolution/Resolution: ""
 *it.Resolution 180dpi/180dpi: ""
 *it.Resolution 360dpi/360dpi: ""
@@ -219,9 +189,6 @@
 *ja.PageSize Legal/Legal - 8.5x14in: ""
 *ja.PageSize A4/A4 - 210x297mm: ""
 *ja.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*ja.PageSize Letter/Letter - 8.5x11in: ""
-*ja.PageSize Legal/Legal - 8.5x14in: ""
-*ja.PageSize A4/A4 - 210x297mm: ""
 *ja.Translation Resolution/Resolution: ""
 *ja.Resolution 180dpi/180dpi: ""
 *ja.Resolution 360dpi/360dpi: ""
@@ -238,9 +205,6 @@
 *ko.PageSize Legal/Legal - 8.5x14in: ""
 *ko.PageSize A4/A4 - 210x297mm: ""
 *ko.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*ko.PageSize Letter/Letter - 8.5x11in: ""
-*ko.PageSize Legal/Legal - 8.5x14in: ""
-*ko.PageSize A4/A4 - 210x297mm: ""
 *ko.Translation Resolution/Resolution: ""
 *ko.Resolution 180dpi/180dpi: ""
 *ko.Resolution 360dpi/360dpi: ""
@@ -257,9 +221,6 @@
 *nl.PageSize Legal/Legal - 8.5x14in: ""
 *nl.PageSize A4/A4 - 210x297mm: ""
 *nl.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*nl.PageSize Letter/Letter - 8.5x11in: ""
-*nl.PageSize Legal/Legal - 8.5x14in: ""
-*nl.PageSize A4/A4 - 210x297mm: ""
 *nl.Translation Resolution/Resolution: ""
 *nl.Resolution 180dpi/180dpi: ""
 *nl.Resolution 360dpi/360dpi: ""
@@ -276,9 +237,6 @@
 *no.PageSize Legal/Legal - 8.5x14in: ""
 *no.PageSize A4/A4 - 210x297mm: ""
 *no.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*no.PageSize Letter/Letter - 8.5x11in: ""
-*no.PageSize Legal/Legal - 8.5x14in: ""
-*no.PageSize A4/A4 - 210x297mm: ""
 *no.Translation Resolution/Resolution: ""
 *no.Resolution 180dpi/180dpi: ""
 *no.Resolution 360dpi/360dpi: ""
@@ -295,9 +253,6 @@
 *pt.PageSize Legal/Legal - 8.5x14in: ""
 *pt.PageSize A4/A4 - 210x297mm: ""
 *pt.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*pt.PageSize Letter/Letter - 8.5x11in: ""
-*pt.PageSize Legal/Legal - 8.5x14in: ""
-*pt.PageSize A4/A4 - 210x297mm: ""
 *pt.Translation Resolution/Resolution: ""
 *pt.Resolution 180dpi/180dpi: ""
 *pt.Resolution 360dpi/360dpi: ""
@@ -314,9 +269,6 @@
 *pt_BR.PageSize Legal/Legal - 8.5x14in: ""
 *pt_BR.PageSize A4/A4 - 210x297mm: ""
 *pt_BR.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*pt_BR.PageSize Letter/Letter - 8.5x11in: ""
-*pt_BR.PageSize Legal/Legal - 8.5x14in: ""
-*pt_BR.PageSize A4/A4 - 210x297mm: ""
 *pt_BR.Translation Resolution/Resolution: ""
 *pt_BR.Resolution 180dpi/180dpi: ""
 *pt_BR.Resolution 360dpi/360dpi: ""
@@ -333,9 +285,6 @@
 *sv.PageSize Legal/Legal - 8.5x14in: ""
 *sv.PageSize A4/A4 - 210x297mm: ""
 *sv.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*sv.PageSize Letter/Letter - 8.5x11in: ""
-*sv.PageSize Legal/Legal - 8.5x14in: ""
-*sv.PageSize A4/A4 - 210x297mm: ""
 *sv.Translation Resolution/Resolution: ""
 *sv.Resolution 180dpi/180dpi: ""
 *sv.Resolution 360dpi/360dpi: ""
@@ -352,9 +301,6 @@
 *zh.PageSize Legal/Legal - 8.5x14in: ""
 *zh.PageSize A4/A4 - 210x297mm: ""
 *zh.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*zh.PageSize Letter/Letter - 8.5x11in: ""
-*zh.PageSize Legal/Legal - 8.5x14in: ""
-*zh.PageSize A4/A4 - 210x297mm: ""
 *zh.Translation Resolution/Resolution: ""
 *zh.Resolution 180dpi/180dpi: ""
 *zh.Resolution 360dpi/360dpi: ""
@@ -371,9 +317,6 @@
 *zh_TW.PageSize Legal/Legal - 8.5x14in: ""
 *zh_TW.PageSize A4/A4 - 210x297mm: ""
 *zh_TW.PageSize FanFoldUS/Fanfold - 14.875x11in: ""
-*zh_TW.PageSize Letter/Letter - 8.5x11in: ""
-*zh_TW.PageSize Legal/Legal - 8.5x14in: ""
-*zh_TW.PageSize A4/A4 - 210x297mm: ""
 *zh_TW.Translation Resolution/Resolution: ""
 *zh_TW.Resolution 180dpi/180dpi: ""
 *zh_TW.Resolution 360dpi/360dpi: ""