Hello community, here is the log from the commit of package exiv2 for openSUSE:Factory checked in at 2013-07-30 11:29:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/exiv2 (Old) and /work/SRC/openSUSE:Factory/.exiv2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "exiv2" Changes: -------- --- /work/SRC/openSUSE:Factory/exiv2/exiv2.changes 2013-06-06 14:52:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.exiv2.new/exiv2.changes 2013-07-30 11:29:23.000000000 +0200 @@ -1,0 +2,29 @@ +Fri Jul 26 16:37:53 UTC 2013 - [email protected] + +- Backport patches from upstream (cherry-picking courtesy of Pascal + de Bruijn): + * 90_changeset_r3036.diff: Canon EF-S 55-250mm f/4-5.6 IS II + * 90_changeset_r3037.diff: A few more Pentax lenses + * 90_changeset_r3038.diff: Updates for the Minolta Bodies + * 90_changeset_r3039.diff: Added 18-55mm f/3.5-5.6 IS STM + * 90_changeset_r3047.diff: Added Sigma 60mm to the Olympus list + * 90_changeset_r3048.diff: Added Sigma 19 and 30m to the Olympus + list + * 90_changeset_r3051.diff: Added a lot more canon compacts + * 90_changeset_r3052.diff: Sigma 17-50mm F2.8 EX DC HSM + * 90_changeset_r3053.diff: Removed Optio M30 from the Pentax list + * 90_changeset_r3054.diff: Added Samsung NX 45mm F1.8 + * 90_changeset_r3055.diff: Added Samsung NX 45mm F1.8 2D/3D + * 90_changeset_r3060.diff: Renamed LensModel to LensType in the + Olympus struct. + * 90_changeset_r3061.diff: Fixes Issue# 908 + * 90_changeset_r3062.diff: More entries for Pentax + * 90_changeset_r3063.diff: Do not try to guess lenses when it is + undefined + * 90_changeset_r3066.diff: Lumix G Vario 14-140mm F3.5-5.6 Asph. + Power OIS + * 90_changeset_r3067.diff: Lumix G Vario 14-42mm F3.5-5.6 II + Asph. Mega OIS + * 90_changeset_r3068.diff: Added EOS 70D + +------------------------------------------------------------------- New: ---- 90_changeset_r3036.diff 90_changeset_r3037.diff 90_changeset_r3038.diff 90_changeset_r3039.diff 90_changeset_r3047.diff 90_changeset_r3048.diff 90_changeset_r3051.diff 90_changeset_r3052.diff 90_changeset_r3053.diff 90_changeset_r3054.diff 90_changeset_r3055.diff 90_changeset_r3060.diff 90_changeset_r3061.diff 90_changeset_r3062.diff 90_changeset_r3063.diff 90_changeset_r3066.diff 90_changeset_r3067.diff 90_changeset_r3068.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ exiv2.spec ++++++ --- /var/tmp/diff_new_pack.S1G7Cp/_old 2013-07-30 11:29:25.000000000 +0200 +++ /var/tmp/diff_new_pack.S1G7Cp/_new 2013-07-30 11:29:25.000000000 +0200 @@ -66,7 +66,24 @@ Patch37: 90_changeset_r3023.diff Patch38: 90_changeset_r3026.diff Patch39: 95_post_r3026_cleanup.diff - +Patch40: 90_changeset_r3036.diff +Patch41: 90_changeset_r3037.diff +Patch42: 90_changeset_r3038.diff +Patch43: 90_changeset_r3039.diff +Patch44: 90_changeset_r3047.diff +Patch45: 90_changeset_r3048.diff +Patch46: 90_changeset_r3051.diff +Patch47: 90_changeset_r3052.diff +Patch48: 90_changeset_r3053.diff +Patch49: 90_changeset_r3054.diff +Patch50: 90_changeset_r3055.diff +Patch51: 90_changeset_r3060.diff +Patch52: 90_changeset_r3061.diff +Patch53: 90_changeset_r3062.diff +Patch54: 90_changeset_r3063.diff +Patch55: 90_changeset_r3066.diff +Patch56: 90_changeset_r3067.diff +Patch57: 90_changeset_r3068.diff BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ @@ -146,6 +163,24 @@ %patch37 -p1 %patch38 -p1 %patch39 -p1 +%patch40 -p1 +%patch41 -p1 +%patch42 -p1 +%patch43 -p1 +%patch44 -p1 +%patch45 -p1 +%patch46 -p1 +%patch47 -p1 +%patch48 -p1 +%patch49 -p1 +%patch50 -p1 +%patch51 -p1 +%patch52 -p1 +%patch53 -p1 +%patch54 -p0 +%patch55 -p1 +%patch56 -p1 +%patch57 -p1 %build %configure --disable-static --with-pic ++++++ 90_changeset_r3036.diff ++++++ Index: trunk/src/canonmn.cpp =================================================================== --- trunk/src/canonmn.cpp (revision 3035) +++ trunk/src/canonmn.cpp (revision 3036) @@ -510,6 +510,7 @@ { 51, "Canon EF-S 18-135mm f/3.5-5.6 IS" }, { 52, "Canon EF-S 18-55mm f/3.5-5.6 IS II" }, { 53, "Canon EF-S 18-55mm f/3.5-5.6 III" }, + { 54, "Canon EF-S 55-250mm f/4-5.6 IS II" }, { 94, "Canon TS-E 17mm f/4L" }, { 95, "Canon TS-E 24.0mm f/3.5 L II" }, { 124, "Canon MP-E 65mm f/2.8 1-5x Macro Photo" }, ++++++ 90_changeset_r3037.diff ++++++ Index: trunk/src/pentaxmn.cpp =================================================================== --- trunk/src/pentaxmn.cpp (revision 3036) +++ trunk/src/pentaxmn.cpp (revision 3037) @@ -906,9 +906,9 @@ { 0x1500, "Pentax Q Manual Lens" }, { 0x1501, "01 Standard Prime 8.5mm F1.9" }, { 0x1502, "02 Standard Zoom 5-15mm F2.8-4.5" }, - { 0x1503, "03 Fish-eye 3.2mm F5.6" }, - { 0x1504, "04 Toy Lens Wide 6.3mm F7.1" }, - { 0x1505, "05 Toy Lens Telephoto 18mm F8" }, + { 0x1603, "03 Fish-eye 3.2mm F5.6" }, + { 0x1604, "04 Toy Lens Wide 6.3mm F7.1" }, + { 0x1605, "05 Toy Lens Telephoto 18mm F8" }, { 0x1506, "06 Telephoto Zoom 15-45mm F2.8" }, }; ++++++ 90_changeset_r3038.diff ++++++ Index: trunk/src/minoltamn.cpp =================================================================== --- trunk/src/minoltamn.cpp (revision 3037) +++ trunk/src/minoltamn.cpp (revision 3038) @@ -1669,26 +1669,26 @@ { 41, "Minolta/Sony AF DT 11-18mm F4.5-5.6 (D) | " "Tamron SP AF 11-18mm F4.5-5.6 Di II LD Aspherical IF" }, { 42, "Minolta/Sony AF DT 18-200mm F3.5-6.3 (D)" }, - { 43, "Sony 35mm F1.4 G (SAL-35F14G)" }, - { 44, "Sony 50mm F1.4 (SAL-50F14)" }, - { 45, "Carl Zeiss Planar T* 85mm F1.4 ZA" }, - { 46, "Carl Zeiss Vario-Sonnar T* DT 16-80mm F3.5-4.5 ZA" }, - { 47, "Carl Zeiss Sonnar T* 135mm F1.8 ZA" }, - { 48, "Carl Zeiss Vario-Sonnar T* 24-70mm F2.8 ZA SSM (SAL-2470Z)" }, - { 49, "Sony AF DT 55-200mm F4-5.6" }, - { 50, "Sony AF DT 18-250mm F3.5-6.3" }, - { 51, "Sony AF DT 16-105mm F3.5-5.6 | " - "Sony AF DT 55-200mm F4-5.5" }, + { 43, "Sony 35mm F1.4 G (SAL35F14G)" }, + { 44, "Sony 50mm F1.4 (SAL50F14)" }, + { 45, "Carl Zeiss Planar T* 85mm F1.4 ZA (SAL85F14Z)" }, + { 46, "Carl Zeiss Vario-Sonnar T* DT 16-80mm F3.5-4.5 ZA (SAL1680Z)" }, + { 47, "Carl Zeiss Sonnar T* 135mm F1.8 ZA (SAL135F18Z)" }, + { 48, "Carl Zeiss Vario-Sonnar T* 24-70mm F2.8 ZA SSM (SAL2470Z)" }, + { 49, "Sony AF DT 55-200mm F4-5.6 (SAL55200)" }, + { 50, "Sony AF DT 18-250mm F3.5-6.3 (SAL18250)" }, + { 51, "Sony AF DT 16-105mm F3.5-5.6 (SAL16105)" }, +// { 51, "Sony AF DT 55-200mm F4-5.5" }, // Anomaly? - unconfirmed. { 52, "Sony 70-300mm F4.5-5.6 G SSM (SAL70300G) | " "Tamron SP 70-300mm F4-5.6 Di VC USD" }, - { 53, "Sony AF 70-400mm F4.5-5.6 G SSM (SAL-70400G)" }, - { 54, "Carl Zeiss Vario-Sonnar T* 16-35mm F2.8 ZA SSM (SAL-1635Z)" }, - { 55, "Sony DT 18-55mm F3.5-5.6 SAM (SAL-1855)" }, - { 56, "Sony AF DT 55-200mm F4-5.6 SAM" }, + { 53, "Sony AF 70-400mm F4.5-5.6 G SSM (SAL70400G)" }, + { 54, "Carl Zeiss Vario-Sonnar T* 16-35mm F2.8 ZA SSM (SAL1635Z)" }, + { 55, "Sony DT 18-55mm F3.5-5.6 SAM [II] (SAL1855)" }, + { 56, "Sony AF DT 55-200mm F4-5.6 SAM (SAL55200-2)" }, { 57, "Sony DT 50mm F1.8 SAM (SAL50F18) | " "Tamron SP AF 60mm F2 Di II LD [IF] Macro 1:1 | " "Tamron 18-270mm F3.5-6.3 Di II PZD" }, - { 58, "Sony AF DT 30mm F2.8 SAM Macro" }, + { 58, "Sony AF DT 30mm F2.8 SAM Macro (SAL30M28)" }, { 59, "Sony 28-75mm F2.8 SAM (SAL2875)" }, { 60, "Carl Zeiss Distagon T* 24mm F2 ZA SSM (SAL24F20Z)" }, { 61, "Sony 85mm F2.8 SAM (SAL85F28)" }, ++++++ 90_changeset_r3039.diff ++++++ Index: trunk/src/canonmn.cpp =================================================================== --- trunk/src/canonmn.cpp (revision 3038) +++ trunk/src/canonmn.cpp (revision 3039) @@ -696,7 +696,8 @@ { 4142,"Canon EF-S 18-135mm f/3.5-5.6 IS STM" }, { 4143,"Canon EF-M 18-55mm f/3.5-5.6 IS STM" }, { 4144,"Canon EF 40mm f/2.8 STM" }, - { 4145,"Canon EF-M 22mm f/2 STM" } + { 4145,"Canon EF-M 22mm f/2 STM" }, + { 4146,"Canon EF-M 18-55mm f/3.5-5.6 IS STM" } }; //! A lens id and a pretty-print function for special treatment of the id. ++++++ 90_changeset_r3047.diff ++++++ Index: trunk/src/olympusmn.cpp =================================================================== --- trunk/src/olympusmn.cpp (revision 3046) +++ trunk/src/olympusmn.cpp (revision 3047) @@ -1288,6 +1288,7 @@ { { 1, 3, 0 }, N_("Sigma 18-125mm F3.5-5.6 DC") }, { { 1, 4, 0 }, N_("Sigma 18-125mm F3.5-5.6") }, { { 1, 5, 0 }, N_("Sigma 30mm F1.4") }, + { { 1, 5, 16 }, N_("Sigma 60mm F2.8 DN | A") }, { { 1, 6, 0 }, N_("Sigma 50-500mm F4.0-6.3 EX DG APO HSM RF") }, { { 1, 7, 0 }, N_("Sigma 105mm F2.8 DG") }, { { 1, 8, 0 }, N_("Sigma 150mm F2.8 DG HSM") }, ++++++ 90_changeset_r3048.diff ++++++ Index: trunk/src/olympusmn.cpp =================================================================== --- trunk/src/olympusmn.cpp (revision 3047) +++ trunk/src/olympusmn.cpp (revision 3048) @@ -1286,7 +1286,9 @@ { { 1, 2, 0 }, N_("Sigma 55-200mm F4.0-5.6 DC") }, { { 1, 2, 16 }, N_("Sigma 19mm F2.8 EX DN") }, { { 1, 3, 0 }, N_("Sigma 18-125mm F3.5-5.6 DC") }, + { { 1, 3, 16 }, N_("Sigma 30mm F2.8 DN | A") }, { { 1, 4, 0 }, N_("Sigma 18-125mm F3.5-5.6") }, + { { 1, 4, 16 }, N_("Sigma 19mm F2.8 DN | A") }, { { 1, 5, 0 }, N_("Sigma 30mm F1.4") }, { { 1, 5, 16 }, N_("Sigma 60mm F2.8 DN | A") }, { { 1, 6, 0 }, N_("Sigma 50-500mm F4.0-6.3 EX DG APO HSM RF") }, ++++++ 90_changeset_r3051.diff ++++++ Index: trunk/src/canonmn.cpp =================================================================== --- trunk/src/canonmn.cpp (revision 3050) +++ trunk/src/canonmn.cpp (revision 3051) @@ -148,12 +148,131 @@ { 0x2160000, N_("PowerShot SD1000 / Digital IXUS 70 / IXY Digital 10") }, { 0x2180000, N_("PowerShot A550") }, { 0x2190000, N_("PowerShot A450") }, + { 0x2230000, N_("PowerShot G9") }, + { 0x2240000, N_("PowerShot A650 IS") }, + { 0x2260000, N_("PowerShot A720 IS") }, + { 0x2290000, N_("PowerShot SX100 IS") }, + { 0x2300000, N_("PowerShot SD950 IS / Digital IXUS 960 IS / IXY Digital 2000 IS") }, + { 0x2310000, N_("PowerShot SD870 IS / Digital IXUS 860 IS / IXY Digital 910 IS") }, + { 0x2320000, N_("PowerShot SD890 IS / Digital IXUS 970 IS / IXY Digital 820 IS") }, + { 0x2360000, N_("PowerShot SD790 IS / Digital IXUS 90 IS / IXY Digital 95 IS") }, + { 0x2370000, N_("PowerShot SD770 IS / Digital IXUS 85 IS / IXY Digital 25 IS") }, + { 0x2380000, N_("PowerShot A590 IS") }, + { 0x2390000, N_("PowerShot A580") }, + { 0x2420000, N_("PowerShot A470") }, + { 0x2430000, N_("PowerShot SD1100 IS / Digital IXUS 80 IS / IXY Digital 20 IS") }, + { 0x2460000, N_("PowerShot SX1 IS") }, + { 0x2470000, N_("PowerShot SX10 IS") }, + { 0x2480000, N_("PowerShot A1000 IS") }, + { 0x2490000, N_("PowerShot G10") }, + { 0x2510000, N_("PowerShot A2000 IS") }, + { 0x2520000, N_("PowerShot SX110 IS") }, + { 0x2530000, N_("PowerShot SD990 IS / Digital IXUS 980 IS / IXY Digital 3000 IS") }, + { 0x2540000, N_("PowerShot SD880 IS / Digital IXUS 870 IS / IXY Digital 920 IS") }, + { 0x2550000, N_("PowerShot E1") }, + { 0x2560000, N_("PowerShot D10") }, + { 0x2570000, N_("PowerShot SD960 IS / Digital IXUS 110 IS / IXY Digital 510 IS") }, + { 0x2580000, N_("PowerShot A2100 IS") }, + { 0x2590000, N_("PowerShot A480") }, + { 0x2600000, N_("PowerShot SX200 IS") }, + { 0x2610000, N_("PowerShot SD970 IS / Digital IXUS 990 IS / IXY Digital 830 IS") }, + { 0x2620000, N_("PowerShot SD780 IS / Digital IXUS 100 IS / IXY Digital 210 IS") }, + { 0x2630000, N_("PowerShot A1100 IS") }, + { 0x2640000, N_("PowerShot SD1200 IS / Digital IXUS 95 IS / IXY Digital 110 IS") }, + { 0x2700000, N_("PowerShot G11") }, + { 0x2710000, N_("PowerShot SX120 IS") }, + { 0x2720000, N_("PowerShot S90") }, + { 0x2750000, N_("PowerShot SX20 IS") }, + { 0x2760000, N_("PowerShot SD980 IS / Digital IXUS 200 IS / IXY Digital 930 IS") }, + { 0x2770000, N_("PowerShot SD940 IS / Digital IXUS 120 IS / IXY Digital 220 IS") }, + { 0x2800000, N_("PowerShot A495") }, + { 0x2810000, N_("PowerShot A490") }, + { 0x2820000, N_("PowerShot A3100 IS / A3150 IS") }, + { 0x2830000, N_("PowerShot A3000 IS") }, + { 0x2840000, N_("PowerShot SD1400 IS / IXUS 130 / IXY 400F") }, + { 0x2850000, N_("PowerShot SD1300 IS / IXUS 105 / IXY 200F") }, + { 0x2860000, N_("PowerShot SD3500 IS / IXUS 210 / IXY 10S") }, + { 0x2870000, N_("PowerShot SX210 IS") }, + { 0x2880000, N_("PowerShot SD4000 IS / IXUS 300 HS / IXY 30S") }, + { 0x2890000, N_("PowerShot SD4500 IS / IXUS 1000 HS / IXY 50S") }, + { 0x2920000, N_("PowerShot G12") }, + { 0x2930000, N_("PowerShot SX30 IS") }, + { 0x2940000, N_("PowerShot SX130 IS") }, + { 0x2950000, N_("PowerShot S95") }, + { 0x2980000, N_("PowerShot A3300 IS") }, + { 0x2990000, N_("PowerShot A3200 IS") }, + { 0x3000000, N_("PowerShot ELPH 500 HS / IXUS 310 HS / IXY 31S") }, { 0x3010000, N_("PowerShot Pro90 IS") }, + { 0x3010001, N_("PowerShot A800") }, + { 0x3020000, N_("PowerShot ELPH 100 HS / IXUS 115 HS / IXY 210F") }, + { 0x3030000, N_("PowerShot SX230 HS") }, + { 0x3040000, N_("PowerShot ELPH 300 HS / IXUS 220 HS / IXY 410F") }, + { 0x3050000, N_("PowerShot A2200") }, + { 0x3060000, N_("PowerShot A1200") }, + { 0x3070000, N_("PowerShot SX220 HS") }, + { 0x3080000, N_("PowerShot G1 X") }, + { 0x3090000, N_("PowerShot SX150 IS") }, + { 0x3100000, N_("PowerShot ELPH 510 HS / IXUS 1100 HS / IXY 51S") }, + { 0x3110000, N_("PowerShot S100 (new)") }, + { 0x3130000, N_("PowerShot SX40 HS") }, + { 0x3120000, N_("PowerShot ELPH 310 HS / IXUS 230 HS / IXY 600F") }, + { 0x3140000, N_("PowerShot ELPH 500 HS / IXUS 320 HS / IXY 32S") }, + { 0x3160000, N_("PowerShot A1300") }, + { 0x3170000, N_("PowerShot A810") }, + { 0x3180000, N_("PowerShot ELPH 320 HS / IXUS 240 HS / IXY 420F") }, + { 0x3190000, N_("PowerShot ELPH 110 HS / IXUS 125 HS / IXY 220F") }, + { 0x3200000, N_("PowerShot D20") }, + { 0x3210000, N_("PowerShot A4000 IS") }, + { 0x3220000, N_("PowerShot SX260 HS") }, + { 0x3230000, N_("PowerShot SX240 HS") }, + { 0x3240000, N_("PowerShot ELPH 530 HS / IXUS 510 HS / IXY 1") }, + { 0x3250000, N_("PowerShot ELPH 520 HS / IXUS 500 HS / IXY 3") }, + { 0x3260000, N_("PowerShot A3400 IS") }, + { 0x3270000, N_("PowerShot A2400 IS") }, + { 0x3280000, N_("PowerShot A2300") }, + { 0x3330000, N_("PowerShot G15") }, + { 0x3340000, N_("PowerShot SX50") }, + { 0x3350000, N_("PowerShot SX160 IS") }, + { 0x3360000, N_("PowerShot S110 (new)") }, + { 0x3370000, N_("PowerShot SX500 IS") }, + { 0x3380000, N_("PowerShot N") }, + { 0x3390000, N_("IXUS 245 HS / IXY 430F") }, + { 0x3400000, N_("PowerShot SX280 HS") }, + { 0x3430000, N_("PowerShot A2600") }, + { 0x3450000, N_("PowerShot A1400") }, + { 0x3460000, N_("PowerShot ELPH 130 IS / IXUS 140 / IXY 110F") }, + { 0x3470000, N_("PowerShot ELPH 115 IS / IXUS 132 / IXY 90F") }, + { 0x3490000, N_("PowerShot ELPH 330 HS / IXUS 255 HS / IXY 610F") }, { 0x4040000, N_("PowerShot G1") }, { 0x6040000, N_("PowerShot S100 / Digital IXUS / IXY Digital") }, + { 0x4007d673, N_("DC19/DC21/DC22") }, + { 0x4007d674, N_("XH A1") }, { 0x4007d675, N_("HV10") }, - { 0x4007d777, N_("iVIS DC50") }, - { 0x4007d778, N_("iVIS HV20") }, + { 0x4007d676, N_("MD130/MD140/MD150/MD160/ZR850") }, + { 0x4007d777, N_("DC50") }, + { 0x4007d778, N_("HV20") }, + { 0x4007d779, N_("DC211") }, + { 0x4007d77a, N_("HG10") }, + { 0x4007d77b, N_("HR10") }, + { 0x4007d77c, N_("MD255/ZR950") }, + { 0x4007d81c, N_("HF11") }, + { 0x4007d878, N_("HV30") }, + { 0x4007d87c, N_("XH A1S") }, + { 0x4007d87e, N_("DC301/DC310/DC311/DC320/DC330") }, + { 0x4007d87f, N_("FS100") }, + { 0x4007d880, N_("HF10") }, + { 0x4007d882, N_("HG20/HG21") }, + { 0x4007d925, N_("HF21") }, + { 0x4007d926, N_("HF S11") }, + { 0x4007d978, N_("HV40") }, + { 0x4007d987, N_("DC410/DC411/DC420") }, + { 0x4007d988, N_("FS19/FS20/FS21/FS22/FS200") }, + { 0x4007d989, N_("HF20/HF200") }, + { 0x4007d98a, N_("HF S10/S100") }, + { 0x4007da8e, N_("HF R10/R16/R17/R18/R100/R106") }, + { 0x4007da8f, N_("HF M30/M31/M36/M300/M306") }, + { 0x4007da90, N_("HF S20/S21/S200") }, + { 0x4007da92, N_("FS31/FS36/FS37/FS300/FS305/FS306/FS307") }, { 0x80000001, N_("EOS-1D") }, { 0x80000167, N_("EOS-1DS") }, { 0x80000168, N_("EOS 10D") }, @@ -161,17 +280,27 @@ { 0x80000170, N_("EOS Digital Rebel / 300D / Kiss Digital") }, { 0x80000174, N_("EOS-1D Mark II") }, { 0x80000175, N_("EOS 20D") }, + { 0x80000176, N_("EOS Digital Rebel XSi / 450D / Kiss X2") }, { 0x80000188, N_("EOS-1Ds Mark II") }, { 0x80000189, N_("EOS Digital Rebel XT / 350D / Kiss Digital N") }, + { 0x80000190, N_("EOS 40D") }, { 0x80000213, N_("EOS 5D") }, + { 0x80000215, N_("EOS-1Ds Mark III") }, + { 0x80000218, N_("EOS 5D Mark II") }, + { 0x80000219, N_("WFT-E1") }, { 0x80000232, N_("EOS-1D Mark II N") }, { 0x80000234, N_("EOS 30D") }, { 0x80000236, N_("EOS Digital Rebel XTi / 400D / Kiss Digital X") }, + { 0x80000241, N_("WFT-E2") }, + { 0x80000246, N_("WFT-E3") }, { 0x80000250, N_("EOS 7D") }, { 0x80000252, N_("EOS Rebel T1i / 500D / Kiss X3") }, { 0x80000254, N_("EOS Rebel XS / 1000D / Kiss F") }, { 0x80000261, N_("EOS 50D") }, + { 0x80000269, N_("EOS-1D X") }, { 0x80000270, N_("EOS Rebel T2i / 550D / Kiss X4") }, + { 0x80000271, N_("WFT-E4") }, + { 0x80000273, N_("WFT-E5") }, { 0x80000281, N_("EOS-1D Mark IV") }, { 0x80000285, N_("EOS 5D Mark III") }, { 0x80000286, N_("EOS Rebel T3i / 600D / Kiss X5") }, @@ -181,6 +310,10 @@ { 0x80000298, N_("WFT-E4 II") }, { 0x80000301, N_("EOS Rebel T4i / 650D / Kiss X6i") }, { 0x80000302, N_("EOS 6D") }, + { 0x80000324, N_("EOS-1D C") }, + { 0x80000326, N_("EOS Rebel T5i / 700D / Kiss X7i") }, + { 0x80000331, N_("EOS M") }, + { 0x80000346, N_("EOS Rebel SL1 / 100D / Kiss X7") }, }; //! SerialNumberFormat, tag 0x0015 ++++++ 90_changeset_r3052.diff ++++++ Index: trunk/src/minoltamn.cpp =================================================================== --- trunk/src/minoltamn.cpp (revision 3051) +++ trunk/src/minoltamn.cpp (revision 3052) @@ -1713,7 +1713,8 @@ "Sigma 50mm F1.4 EX DG HSM | " "Sigma 85mm F1.4 EX DG HSM | " "Sigma 24-70mm F2.8 IF EX DG HSM | " - "Sigma 18-250mm F3.5-6.3 DC OS HSM" }, + "Sigma 18-250mm F3.5-6.3 DC OS HSM | " + "Sigma 17-50mm F2.8 EX DC HSM" }, { 129, "Tamron 200-400mm F5.6 LD | " "Tamron 70-300mm F4-5.6 LD" }, { 131, "Tamron 20-40mm F2.7-3.5 SP Aspherical IF" }, ++++++ 90_changeset_r3053.diff ++++++ Index: trunk/src/pentaxmn.cpp =================================================================== --- trunk/src/pentaxmn.cpp (revision 3052) +++ trunk/src/pentaxmn.cpp (revision 3053) @@ -112,7 +112,6 @@ { 0x12c32, N_("Optio M20") }, { 0x12c3c, N_("Optio W20") }, { 0x12c46, N_("Optio A20") }, - { 0x12c8c, N_("Optio M30") }, { 0x12c78, N_("Optio E30") }, { 0x12c7d, N_("Optio E35") }, { 0x12c82, N_("Optio T30") }, ++++++ 90_changeset_r3054.diff ++++++ Index: trunk/src/samsungmn.cpp =================================================================== --- trunk/src/samsungmn.cpp (revision 3053) +++ trunk/src/samsungmn.cpp (revision 3054) @@ -60,6 +60,7 @@ { 7, N_("Samsung NX 60mm F2.8 Macro ED OIS SSA") }, { 8, N_("Samsung NX 16mm F2.4 Pancake") }, { 9, N_("Samsung NX 85mm F1.4 ED SSA") }, + { 10, N_("Samsung NX 45mm F1.8") }, { 12, N_("Samsung NX 12-24mm F4-5.6 ED") } }; ++++++ 90_changeset_r3055.diff ++++++ Index: trunk/src/samsungmn.cpp =================================================================== --- trunk/src/samsungmn.cpp (revision 3054) +++ trunk/src/samsungmn.cpp (revision 3055) @@ -61,6 +61,7 @@ { 8, N_("Samsung NX 16mm F2.4 Pancake") }, { 9, N_("Samsung NX 85mm F1.4 ED SSA") }, { 10, N_("Samsung NX 45mm F1.8") }, + { 11, N_("Samsung NX 45mm F1.8 2D/3D") }, { 12, N_("Samsung NX 12-24mm F4-5.6 ED") } }; ++++++ 90_changeset_r3060.diff ++++++ Index: trunk/src/easyaccess.cpp =================================================================== --- trunk/src/easyaccess.cpp (revision 3059) +++ trunk/src/easyaccess.cpp (revision 3060) @@ -269,7 +269,7 @@ "Exif.SonyMinolta.LensID", "Exif.Sony1.LensID", "Exif.Sony2.LensID", - "Exif.OlympusEq.LensModel", + "Exif.OlympusEq.LensType", "Exif.Panasonic.LensType", "Exif.Samsung2.LensType" }; ++++++ 90_changeset_r3061.diff ++++++ Index: trunk/src/futils.cpp =================================================================== --- trunk/src/futils.cpp (revision 3060) +++ trunk/src/futils.cpp (revision 3061) @@ -69,7 +69,7 @@ bool fileExists(const std::string& path, bool ct) { struct stat buf; - int ret = ::stat(path.c_str(), &buf); + int ret = ::stat(path.c_str(), &buf); if (0 != ret) return false; if (ct && !S_ISREG(buf.st_mode)) return false; return true; @@ -104,6 +104,9 @@ strerror_r(error, buf, n); # endif os << buf; + // Issue# 908. + // report strerror() if strerror_r() returns empty + if ( !buf[0] ) os << strerror(error); #else os << std::strerror(error); #endif ++++++ 90_changeset_r3062.diff ++++++ Index: trunk/src/pentaxmn.cpp =================================================================== --- trunk/src/pentaxmn.cpp (revision 3061) +++ trunk/src/pentaxmn.cpp (revision 3062) @@ -174,7 +174,10 @@ { 0x12f66, N_("Q10") }, { 0x12f70, N_("K-5 II") }, { 0x12f71, N_("K-5 II s") }, + { 0x12f7a, N_("Q7") }, { 0x12f84, N_("MX-1") }, + { 0x12fb6, N_("K-50") }, + { 0x12fca, N_("K-500") }, }; //! Quality, tag 0x0008 ++++++ 90_changeset_r3063.diff ++++++ Index: src/minoltamn.cpp =================================================================== --- src/minoltamn.cpp.orig +++ src/minoltamn.cpp @@ -1895,7 +1895,7 @@ namespace Exiv2 { { 45751, "1.4x Teleconverter " }, { 45851, "Tamron SP AF 300mm F2.8 LD IF" }, { 45871, "Tamron AF 70-210mm F2.8 SP LD" }, - { 65535, "Manual Lens or No Lens" } + { 65535, "E-Mount, T-Mount, Other Lens or No Lens" } }; std::ostream& printMinoltaSonyLensID(std::ostream& os, const Value& value, const ExifData* metadata) ++++++ 90_changeset_r3066.diff ++++++ Index: trunk/src/olympusmn.cpp =================================================================== --- trunk/src/olympusmn.cpp (revision 3065) +++ trunk/src/olympusmn.cpp (revision 3066) @@ -1325,6 +1325,7 @@ { { 2, 21, 16 }, N_("Lumix G X Vario 12-35mm F2.8 Asph. Power OIS") }, { { 2, 22, 16 }, N_("Lumix G Vario 45-150mm F4.0-5.6 Asph. Mega OIS") }, { { 2, 23, 16 }, N_("Lumix G X Vario 35-100mm F2.8 Power OIS") }, + { { 2, 25, 16 }, N_("Lumix G Vario 14-140mm F3.5-5.6 Asph. Power OIS") }, { { 3, 1, 0 }, N_("Leica D Vario Elmarit 14-50mm F2.8-3.5 Asph.") }, { { 3, 2, 0 }, N_("Leica D Summilux 25mm F1.4 Asph.") }, // End of list marker ++++++ 90_changeset_r3067.diff ++++++ Index: trunk/src/olympusmn.cpp =================================================================== --- trunk/src/olympusmn.cpp (revision 3066) +++ trunk/src/olympusmn.cpp (revision 3067) @@ -1325,6 +1325,7 @@ { { 2, 21, 16 }, N_("Lumix G X Vario 12-35mm F2.8 Asph. Power OIS") }, { { 2, 22, 16 }, N_("Lumix G Vario 45-150mm F4.0-5.6 Asph. Mega OIS") }, { { 2, 23, 16 }, N_("Lumix G X Vario 35-100mm F2.8 Power OIS") }, + { { 2, 24, 16 }, N_("Lumix G Vario 14-42mm F3.5-5.6 II Asph. Mega OIS") }, { { 2, 25, 16 }, N_("Lumix G Vario 14-140mm F3.5-5.6 Asph. Power OIS") }, { { 3, 1, 0 }, N_("Leica D Vario Elmarit 14-50mm F2.8-3.5 Asph.") }, { { 3, 2, 0 }, N_("Leica D Summilux 25mm F1.4 Asph.") }, ++++++ 90_changeset_r3068.diff ++++++ Index: trunk/src/canonmn.cpp =================================================================== --- trunk/src/canonmn.cpp (revision 3067) +++ trunk/src/canonmn.cpp (revision 3068) @@ -311,6 +311,7 @@ { 0x80000301, N_("EOS Rebel T4i / 650D / Kiss X6i") }, { 0x80000302, N_("EOS 6D") }, { 0x80000324, N_("EOS-1D C") }, + { 0x80000325, N_("EOS 70D") }, { 0x80000326, N_("EOS Rebel T5i / 700D / Kiss X7i") }, { 0x80000331, N_("EOS M") }, { 0x80000346, N_("EOS Rebel SL1 / 100D / Kiss X7") }, -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
