--- cups-drivers/foomatic-db/db/source/opt/112.xml.orig 2006-08-17 20:01:18.000000000 +0200 +++ cups-drivers/foomatic-db/db/source/opt/112.xml 2007-07-31 18:43:33.000000000 +0200 @@ -18,7 +18,7 @@ lpstyl - ev/745 + ev/747 --- cups-drivers/foomatic-db/db/source/opt/121.xml.orig 2006-08-17 20:01:18.000000000 +0200 +++ cups-drivers/foomatic-db/db/source/opt/121.xml 2007-07-31 18:43:33.000000000 +0200 @@ -17,7 +17,7 @@ oki4drv - ev/796 + ev/792 --- cups-drivers/foomatic-db/db/source/opt/126.xml.orig 2006-08-17 20:01:18.000000000 +0200 +++ cups-drivers/foomatic-db/db/source/opt/126.xml 2007-07-31 18:43:33.000000000 +0200 @@ -17,95 +17,95 @@ okiibm - ev/798 + ev/801 tek4696 - ev/798 + ev/801 t4693d8 - ev/798 + ev/801 oki182 - ev/798 + ev/801 necp6 - ev/798 + ev/801 m8510 - ev/798 + ev/801 lq850 - ev/798 + ev/801 lp8000 - ev/798 + ev/801 la75plus - ev/798 + ev/801 la75 - ev/798 + ev/801 la70 - ev/798 + ev/801 la50 - ev/798 + ev/801 iwlq - ev/798 + ev/801 iwlo - ev/798 + ev/801 iwhi - ev/798 + ev/801 imagen - ev/798 + ev/801 ibmpro - ev/798 + ev/801 epsonc - ev/798 + ev/801 epson - ev/798 + ev/801 eps9mid - ev/798 + ev/801 eps9high - ev/798 + ev/801 cp50 - ev/798 + ev/801 appledmp - ev/798 + ev/801 --- cups-drivers/foomatic-db/db/source/opt/139.xml.orig 2006-08-17 20:01:18.000000000 +0200 +++ cups-drivers/foomatic-db/db/source/opt/139.xml 2007-07-31 18:43:33.000000000 +0200 @@ -17,11 +17,11 @@ md5k - ev/856 + ev/854 md2k - ev/856 + ev/854 --- cups-drivers/foomatic-db/db/source/opt/165.xml.orig 2006-08-17 20:01:19.000000000 +0200 +++ cups-drivers/foomatic-db/db/source/opt/165.xml 2007-07-31 18:43:33.000000000 +0200 @@ -18,7 +18,7 @@ ppmtocpva - ev/930 + ev/933 --- cups-drivers/foomatic-db/db/source/opt/drv_x125-PageSize.xml.orig 2006-08-17 20:01:20.000000000 +0200 +++ cups-drivers/foomatic-db/db/source/opt/drv_x125-PageSize.xml 2007-07-31 18:43:33.000000000 +0200 @@ -18,7 +18,7 @@ drv_x125 - ev/drv_x125-PageSize-Letter + ev/drv_x125-PageSize-A4 --- cups-drivers/foomatic-db/db/source/opt/drv_z42-PageSize.xml.orig 2006-08-17 20:01:20.000000000 +0200 +++ cups-drivers/foomatic-db/db/source/opt/drv_z42-PageSize.xml 2007-07-31 18:43:33.000000000 +0200 @@ -18,7 +18,7 @@ drv_z42 - ev/drv_z42-PageSize-Letter + ev/drv_z42-PageSize-A4 --- cups-drivers/foomatic-db/db/source/opt/gdi-PageSize.xml.orig 2006-08-17 20:01:20.000000000 +0200 +++ cups-drivers/foomatic-db/db/source/opt/gdi-PageSize.xml 2007-07-31 18:43:55.000000000 +0200 @@ -17,7 +17,7 @@ gdi - ev/gdi-PageSizeJCL-Letter + ev/gdi-PageSizeJCL-A4 --- cups-drivers/foomatic-db/db/source/opt/gdi-PageSizeJCL.xml.orig 2006-08-17 20:01:20.000000000 +0200 +++ cups-drivers/foomatic-db/db/source/opt/gdi-PageSizeJCL.xml 2007-07-31 18:43:55.000000000 +0200 @@ -17,7 +17,7 @@ gdi - ev/gdi-PageSizeJCL-Letter + ev/gdi-PageSizeJCL-A4 --- cups-drivers/foomatic-db/db/source/opt/gdi-PageSizePS.xml.orig 2006-08-17 20:01:20.000000000 +0200 +++ cups-drivers/foomatic-db/db/source/opt/gdi-PageSizePS.xml 2007-07-31 18:43:55.000000000 +0200 @@ -17,7 +17,7 @@ gdi - ev/gdi-PageSizePS-Letter + ev/gdi-PageSizePS-A4 --- cups-drivers/foomatic-db/db/source/opt/min12xxw-DriverPageSize.xml.orig 2006-08-17 20:01:21.000000000 +0200 +++ cups-drivers/foomatic-db/db/source/opt/min12xxw-DriverPageSize.xml 2007-07-31 18:43:55.000000000 +0200 @@ -17,7 +17,7 @@ min12xxw - ev/min12xxw-DriverPageSize-Letter + ev/min12xxw-DriverPageSize-A4 --- cups-drivers/foomatic-db/db/source/opt/min12xxw-GSPageSize.xml.orig 2006-08-17 20:01:21.000000000 +0200 +++ cups-drivers/foomatic-db/db/source/opt/min12xxw-GSPageSize.xml 2007-07-31 18:43:55.000000000 +0200 @@ -17,7 +17,7 @@ min12xxw - ev/min12xxw-GSPageSize-Letter + ev/min12xxw-GSPageSize-A4 --- cups-drivers/foomatic-db/db/source/opt/min12xxw-PageSize.xml.orig 2006-08-17 20:01:21.000000000 +0200 +++ cups-drivers/foomatic-db/db/source/opt/min12xxw-PageSize.xml 2007-07-31 18:43:55.000000000 +0200 @@ -17,7 +17,7 @@ min12xxw - ev/min12xxw-PageSize-Letter + ev/min12xxw-PageSize-A4 --- cups-drivers/foomatic-db/db/source/opt/oki4w-PageSize.xml.orig 2006-08-17 20:01:21.000000000 +0200 +++ cups-drivers/foomatic-db/db/source/opt/oki4w-PageSize.xml 2007-07-31 18:43:55.000000000 +0200 @@ -17,7 +17,7 @@ oki4w - ev/oki4w-PageSize-Letter + ev/oki4w-PageSize-A4 --- cups-drivers/foomatic-db/db/source/opt/pbmtozjs-PageSize.xml.orig 2006-08-17 20:01:21.000000000 +0200 +++ cups-drivers/foomatic-db/db/source/opt/pbmtozjs-PageSize.xml 2007-07-31 18:43:55.000000000 +0200 @@ -17,7 +17,7 @@ pbmtozjs - ev/pbmtozjs-PageSize-Letter + ev/pbmtozjs-PageSize-A4 --- cups-drivers/foomatic-db/db/source/opt/pentaxpj-PageSize.xml.orig 2006-08-17 20:01:21.000000000 +0200 +++ cups-drivers/foomatic-db/db/source/opt/pentaxpj-PageSize.xml 2007-07-31 18:43:55.000000000 +0200 @@ -19,12 +19,12 @@ pentaxpj printer/Pentax-PocketJet_200 - ev/pentaxpj-PageSize-200-Letter + ev/pentaxpj-PageSize-200-A4 pentaxpj printer/Pentax-PocketJet_II - ev/pentaxpj-PageSize-300-Letter + ev/pentaxpj-PageSize-300-A4 --- cups-drivers/foomatic-db/db/source/opt/ppmtomd-PageSize.xml.orig 2006-08-17 20:01:21.000000000 +0200 +++ cups-drivers/foomatic-db/db/source/opt/ppmtomd-PageSize.xml 2007-07-31 18:43:55.000000000 +0200 @@ -18,7 +18,7 @@ ppmtomd - ev/ppmtomd-PageSize-Letter + ev/ppmtomd-PageSize-A4 --- cups-drivers/foomatic-db/db/source/opt/sipixa6.upp-PageSize.xml.orig 2006-08-17 20:01:21.000000000 +0200 +++ cups-drivers/foomatic-db/db/source/opt/sipixa6.upp-PageSize.xml 2007-07-31 18:43:55.000000000 +0200 @@ -18,7 +18,7 @@ sipixa6.upp - ev/sipixa6.upp-PageSize-Letter + ev/sipixa6.upp-PageSize-A4 --- cups-drivers/foomatic-db/db/source/opt/2.xml.orig 2008-09-09 13:57:50.000000000 +0200 +++ cups-drivers/foomatic-db/db/source/opt/2.xml 2008-09-09 15:11:14.000000000 +0200 @@ -17,15 +17,15 @@ c2050 - ev/1 + ev/3 cZ11 - ev/1 + ev/3 cZ11somsom - ev/1 + ev/3 eplaser @@ -37,63 +37,63 @@ sharp.upp - ev/1 + ev/3 lex7000 - ev/1 + ev/3 lex5700 - ev/1 + ev/3 lbp8 - ev/1 + ev/3 laserjet - ev/1 + ev/3 jetp3852 - ev/1 + ev/3 hpdj - ev/1 + ev/3 hl7x0 - ev/1 + ev/3 hl1250 - ev/1 + ev/3 djet500 - ev/1 + ev/3 deskjet - ev/1 + ev/3 declj250 - ev/1 + ev/3 cljet5 - ev/1 + ev/3 cjet - ev/1 + ev/3 chp2200 - ev/1 + ev/3 chp2200 @@ -121,323 +121,323 @@ cdj970 - ev/1 + ev/3 cdj890 - ev/1 + ev/3 cdj880 - ev/1 + ev/3 cdj850 - ev/1 + ev/3 cdj670 - ev/1 + ev/3 cdj550.upp - ev/1 + ev/3 cdj550 - ev/1 + ev/3 cdj500 - ev/1 + ev/3 cdj1600 - ev/1 + ev/3 c2070 - ev/1 + ev/3 bjc800 - ev/1 + ev/3 bjc610a0.upp - ev/1 + ev/3 bjc6000a1.upp - ev/1 + ev/3 bj8pa06n.upp - ev/1 + ev/3 s400a1.upp - ev/1 + ev/3 bjc600 - ev/1 + ev/3 bjc250gs - ev/1 + ev/3 bj200 - ev/1 + ev/3 bj10e - ev/1 + ev/3 ap3250 - ev/1 + ev/3 Stp870p.upp - ev/1 + ev/3 Stp720p.upp - ev/1 + ev/3 Stc777p.upp - ev/1 + ev/3 Stc760p.upp - ev/1 + ev/3 Stc680p.upp - ev/1 + ev/3 Stc670p.upp - ev/1 + ev/3 PM820p.upp - ev/1 + ev/3 PM760p.upp - ev/1 + ev/3 xes - ev/1 + ev/3 stcolor - ev/1 + ev/3 stcany.upp - ev/1 + ev/3 stc300.upp - ev/1 + ev/3 stc800ih.upp - ev/1 + ev/3 stc740p.upp - ev/1 + ev/3 stc740ih.upp - ev/1 + ev/3 st640ih.upp - ev/1 + ev/3 stc600ih.upp - ev/1 + ev/3 stc500p.upp - ev/1 + ev/3 stc2.upp - ev/1 + ev/3 stc1520h.upp - ev/1 + ev/3 stc.upp - ev/1 + ev/3 st800 - ev/1 + ev/3 sj48 - ev/1 + ev/3 r4081 - ev/1 + ev/3 pxlmono - ev/1 + ev/3 pxlcolor - ev/1 + ev/3 pxl1010 - ev/1 + ev/3 pnm2ppa - ev/1 + ev/3 pjxl300 - ev/1 + ev/3 pjxl - ev/1 + ev/3 pjetxl - ev/1 + ev/3 pj - ev/1 + ev/3 pbm2l7k - ev/1 + ev/3 pbm2l2030 - ev/1 + ev/3 paintjet - ev/1 + ev/3 oce9050 - ev/1 + ev/3 necp2x.upp - ev/1 + ev/3 ml85p - ev/1 + ev/3 lxm5700m - ev/1 + ev/3 lxm3200c - ev/1 + ev/3 lxm3200 - ev/1 + ev/3 lxm3200-tweaked - ev/1 + ev/3 lx5000 - ev/1 + ev/3 lp2563 - ev/1 + ev/3 ln03 - ev/1 + ev/3 lm1100 - ev/1 + ev/3 ljetplus - ev/1 + ev/3 ljet4d - ev/1 + ev/3 ljet4 - ev/1 + ev/3 lj4dith - ev/1 + ev/3 ljet3d - ev/1 + ev/3 ljet3 - ev/1 + ev/3 ljet2p - ev/1 + ev/3 lj5mono - ev/1 + ev/3 lj5gray - ev/1 + ev/3 lj250 - ev/1 + ev/3 lips3 - ev/1 + ev/3 pcl3 - ev/1 + ev/3 lpstyl - ev/1 + ev/3 Postscript1 - ev/1 + ev/3 HP --- cups-drivers/foomatic-db/db/source/opt/jap-PageSize.xml.orig 2008-09-09 13:57:50.000000000 +0200 +++ cups-drivers/foomatic-db/db/source/opt/jap-PageSize.xml 2008-09-09 15:13:10.000000000 +0200 @@ -16,255 +16,255 @@ printer/Canon-BJ-10v bj10vh - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Canon-BJ-15v bj10vh - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Canon-BJ-35v bj10vh - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Canon-LBP-310 lbp310 - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Canon-BJC-680J bjc800j - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Alps-MD-5000 md50Mono - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Oki-DP_5000 md50Mono - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/NEC-MultiWriter npdl - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/NEC-PC-PR1000 npdl - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/NEC-PC-PR2000 npdl - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Alps-MD-1300 md1xMono - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Alps-MD-1500 md1xMono - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 lips4 - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Canon-LBP-320_Pro lbp320 - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Canon-LBP-350 lbp320 - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Star-JJ-100 jj100 - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Epson-LP-xx00 escpage - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Epson-LP-2000 lp2000 - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Epson-LP-3000 lp2000 - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Epson-LP-7000G lp2000 - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Epson-LP-7000 lp2000 - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Ricoh-RPDL_I_Laser_Printer rpdl - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Ricoh-RPDL_II_Laser_Printer rpdl - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Ricoh-RPDL_III_Laser_Printer rpdl - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Ricoh-RPDL_IV_Laser_Printer rpdl - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Canon-LIPS-IIplus lips2p - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/NEC-PC-PR150 pr150 - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Fujitsu-FMLBP2xx_Page_Printer fmlbp - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Epson-Stylus_Color_1500 mj500c - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Epson-Stylus_Color_200 mj500c - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Epson-Stylus_Color_IIs mj500c - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Alps-MD-5000 md50Eco - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Oki-DP_5000 md50Eco - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Epson-Stylus_Color_3000 mj8000c - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Canon-BJ-10v bj10v - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Canon-BJ-15v bj10v - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Oki-Microline_600CL ml600 - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Oki-Microline_620CL ml600 - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Fujitsu-FMPR fmpr - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Epson-Stylus_Color_1520 mj6000c - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Epson-Stylus_Color_400 mj6000c - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Epson-Stylus_Color_800 mj6000c - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 lips4v - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/NEC-PC-PR201 pr201 - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Canon-BJ-35v bj10 - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Canon-BJC-880J bjc880j - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/NEC-PICTY180 picty180 - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/HP-DeskJet_505J_Plus dj505j - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Epson-MachJet mj700v2c - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/Epson-Stylus mj700v2c - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 printer/HP-LaserJet_4V_4LJ_Pro lj4dithp - ev/jap-PageSize-Letter + ev/jap-PageSize-A4 --- cups-drivers/foomatic-db/db/source/opt/largeformat-PageSize.xml.orig 2008-09-09 13:57:51.000000000 +0200 +++ cups-drivers/foomatic-db/db/source/opt/largeformat-PageSize.xml 2008-09-09 15:14:05.000000000 +0200 @@ -17,55 +17,55 @@ dnj650c - ev/largeformat-PageSize-Letter + ev/largeformat-PageSize-A4 HP DesignJet 100 chp2200 - ev/largeformat-PageSize-Letter + ev/largeformat-PageSize-A4 HP DesignJet 100plus chp2200 - ev/largeformat-PageSize-Letter + ev/largeformat-PageSize-A4 HP DesignJet 500 chp2200 - ev/largeformat-PageSize-Letter + ev/largeformat-PageSize-A4 HP DesignJet 800 chp2200 - ev/largeformat-PageSize-Letter + ev/largeformat-PageSize-A4 HP DesignJet 5000 chp2200 - ev/largeformat-PageSize-Letter + ev/largeformat-PageSize-A4 HP DesignJet 5500 chp2200 - ev/largeformat-PageSize-Letter + ev/largeformat-PageSize-A4 HP DesignJet 3500CP Postscript1 - ev/largeformat-PageSize-Letter + ev/largeformat-PageSize-A4 HP DesignJet 5500ps Postscript1 - ev/largeformat-PageSize-Letter + ev/largeformat-PageSize-A4