[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:44:07 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=2c9c7da
The following commit has been merged in the master branch:
commit 2c9c7da919d11d8d90442c0ee54dd524c1f9506f
Author: nkbj <nkbj1970 at hotmail.com>
Date: Sun Jan 19 02:53:58 2014 +0000
Update lens lists to match ExifTool version 9.47.
---
src/minoltamn.cpp | 9 +++++----
src/nikonmn.cpp | 8 +++++---
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index 877b204..9261fb7 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -1648,7 +1648,7 @@ namespace Exiv2 {
{ 27, "Minolta AF 85mm F1.4 G (D)" },
{ 28, "Minolta/Sony AF 100mm F2.8 Macro (D) | "
"Tamron SP AF 90mm F2.8 Di Macro | "
- "Tamron AF 180mm F3.5 SP Di LD [IF] Macro" },
+ "Tamron SP AF 180mm F3.5 SP Di LD [IF] Macro" },
{ 29, "Minolta/Sony AF 75-300mm F4.5-5.6 (D) " },
{ 30, "Minolta AF 28-80mm F3.5-5.6 (D) | "
"Sigma AF 10-20mm F4-5.6 EX DC | "
@@ -1701,8 +1701,8 @@ namespace Exiv2 {
{ 69, "Sony 70-400mm F4-5.6 G SSM II (SAL70400G2)" },
{ 70, "Sony Carl Zeiss Planar T* 50mm F1.4 ZA SSM (SALF0F14Z)" },
{ 128, "Sigma 70-200mm F2.8 APO EX DG MACRO | "
- "Tamron 18-200mm F3.5-6.3 | "
- "Tamron 28-300mm F3.5-6.3 | "
+ "Tamron AF 18-200mm F3.5-6.3 XR Di II LD Aspherical [IF] Macro | "
+ "Tamron AF 28-300mm F3.5-6.3 XR Di LD Aspherical [IF] Macro | "
"Tamron 80-300mm F3.5-6.3 | "
"Tamron AF 28-200mm F3.8-5.6 XR Di Aspherical [IF] MACRO | "
"Tamron SP AF 17-35mm F2.8-4 Di LD Aspherical IF | "
@@ -1727,9 +1727,10 @@ namespace Exiv2 {
{ 146, "Voigtlander Macro APO-Lanthar 125mm F2.5 SL" },
{ 193, "Minolta AF 1.4x APO II" },
{ 194, "Tamron SP AF 17-50mm F2.8 XR Di II LD Aspherical [IF]" },
+ { 203, "Tamron SP 70-200mm F2.8 Di USD" },
{ 255, "Tamron SP AF 17-50mm F2.8 XR Di II LD Aspherical | "
"Tamron AF 18-250mm F3.5-6.3 XR Di II LD | "
- "Tamron AF 55-200mm F4-5.6 Di II | "
+ "Tamron AF 55-200mm F4-5.6 Di II LD Macro | "
"Tamron AF 70-300mm F4-5.6 Di LD Macro 1:2 | "
"Tamron SP AF 200-500mm F5.0-6.3 Di LD IF | "
"Tamron SP AF 10-24mm F3.5-4.5 Di II LD Aspherical IF | "
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index c7d4aac..d683ae4 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -1956,10 +1956,8 @@ fmountlens[] = {
{0x9D,0x00,0x62,0x62,0x24,0x24,0x9F,0x06,0x40,0x00,0x00, "Nikon", "JAA634DA", "PC-E Micro Nikkor 85mm f/2.8D"},
{0x9E,0x40,0x2D,0x6A,0x2C,0x3C,0xA0,0x0E,0x01,0x00,0x00, "Nikon", "JAA805DA", "AF-S DX VR Zoom-Nikkor 18-105mm f/3.5-5.6G ED"},
{0x9F,0x58,0x44,0x44,0x14,0x14,0xA1,0x06,0x01,0x00,0x00, "Nikon", "JAA132DA", "AF-S DX Nikkor 35mm f/1.8G"},
-{0xA0,0x40,0x2D,0x74,0x2C,0x3C,0xBB,0x0E,0x01,0x00,0x00, "Nikon", "", "AF-S DX Nikkor 18-140mm f/3.5-5.6G ED VR"},
{0xA0,0x54,0x50,0x50,0x0C,0x0C,0xA2,0x06,0x01,0x00,0x00, "Nikon", "JAA014DA", "AF-S Nikkor 50mm f/1.4G"},
{0xA1,0x40,0x18,0x37,0x2C,0x34,0xA3,0x06,0x01,0x00,0x00, "Nikon", "JAA804DA", "AF-S DX Nikkor 10-24mm f/3.5-4.5G ED"},
-{0xA1,0x54,0x55,0x55,0x0C,0x0C,0xBC,0x06,0x01,0x00,0x00, "Nikon", "", "AF-S Nikkor 58mm f/1.4G"},
{0xA2,0x48,0x5C,0x80,0x24,0x24,0xA4,0x0E,0x13,0x00,0x00, "Nikon", "JAA807DA", "AF-S Nikkor 70-200mm f/2.8G ED VR II"},
{0xA3,0x3C,0x29,0x44,0x30,0x30,0xA5,0x0E,0x01,0x00,0x00, "Nikon", "JAA806DA", "AF-S Nikkor 16-35mm f/4G ED VR"},
{0xA4,0x54,0x37,0x37,0x0C,0x0C,0xA6,0x06,0x01,0x00,0x00, "Nikon", "JAA131DA", "AF-S Nikkor 24mm f/1.4G ED"},
@@ -1983,6 +1981,9 @@ fmountlens[] = {
//B6 B8
{0xB7,0x44,0x60,0x98,0x34,0x3C,0xB9,0x0E,0x01,0x00,0x00, "Nikon", "JAA817DA", "AF-S Nikkor 80-400mm f/4.5-5.6G ED VR"},
{0xB8,0x40,0x2D,0x44,0x2C,0x34,0xBA,0x06,0x01,0x00,0x00, "Nikon", "JAA818DA", "AF-S Nikkor 18-35mm f/3.5-4.5G ED"},
+{0xA0,0x40,0x2D,0x74,0x2C,0x3C,0xBB,0x0E,0x01,0x00,0x00, "Nikon", "", "AF-S DX Nikkor 18-140mm f/3.5-5.6G ED VR"},
+{0xA1,0x54,0x55,0x55,0x0C,0x0C,0xBC,0x06,0x01,0x00,0x00, "Nikon", "", "AF-S Nikkor 58mm f/1.4G"},
+{0xA2,0x40,0x2D,0x53,0x2C,0x3C,0xBD,0x0E,0x01,0x00,0x00, "Nikon", "", "AF-S DX VR Nikkor 18-55mm f/3.5-5.6G II"},
//
{0x01,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00, "Nikon", "JAA90701", "TC-16A"},
{0x01,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x00, "Nikon", "JAA90701", "TC-16A"},
@@ -2080,7 +2081,7 @@ fmountlens[] = {
{0x02,0x46,0x3C,0x5C,0x25,0x25,0x02,0x00,0x00,0x00,0x05, "Sigma", "", "28-70mm F2.8"},
{0x26,0x54,0x3C,0x5C,0x24,0x24,0x1C,0x02,0x00,0x00,0x05, "Sigma", "", "28-70mm F2.8 EX"},
{0x26,0x48,0x3C,0x5C,0x24,0x24,0x1C,0x06,0x00,0x00,0x05, "Sigma", "549442", "28-70mm F2.8 EX DG"},
-{0x79,0x48,0x3C,0x5C,0x24,0x24,0x1C,0x06,0x00,0x00,0x05, "Sigma", "", "28-70mm F2.8 EX DG D"},
+{0x79,0x48,0x3C,0x5C,0x24,0x24,0x1C,0x06,0x00,0x00,0x05, "Sigma", "", "28-70mm F2.8 EX DG"},
{0x26,0x48,0x3C,0x5C,0x24,0x30,0x1C,0x02,0x00,0x00,0x05, "Sigma", "634445", "28-70mm F2.8-4 DG"},
{0x02,0x3F,0x3C,0x5C,0x2D,0x35,0x02,0x00,0x00,0x00,0x05, "Sigma", "", "28-70mm F3.5-4.5 UC"},
{0x26,0x40,0x3C,0x60,0x2C,0x3C,0x1C,0x02,0x00,0x00,0x05, "Sigma", "", "28-80mm F3.5-5.6 Mini Zoom Macro II Aspherical"},
@@ -2107,6 +2108,7 @@ fmountlens[] = {
{0xEE,0x48,0x5C,0x80,0x24,0x24,0x4B,0x06,0x03,0x00,0x05, "Sigma", "579555", "70-200mm F2.8 EX APO DG Macro HSM II"},
{0x9C,0x48,0x5C,0x80,0x24,0x24,0x4B,0x0E,0x03,0x00,0x05, "Sigma", "", "70-200mm F2.8 EX DG OS HSM"},
{0x02,0x46,0x5C,0x82,0x25,0x25,0x02,0x00,0x00,0x00,0x05, "Sigma", "", "70-210mm F2.8 APO"},
+{0x02,0x40,0x5C,0x82,0x2C,0x35,0x02,0x00,0x00,0x00,0x05, "Sigma", "", "Sigma APO 70-210mm F3.5-4.5"},
{0x26,0x3C,0x5C,0x82,0x30,0x3C,0x1C,0x02,0x00,0x00,0x05, "Sigma", "", "70-210mm F4-5.6 UC-II"},
{0x26,0x3C,0x5C,0x8E,0x30,0x3C,0x1C,0x02,0x00,0x00,0x05, "Sigma", "", "70-300mm F4-5.6 DG Macro"},
{0x56,0x3C,0x5C,0x8E,0x30,0x3C,0x1C,0x02,0x00,0x00,0x05, "Sigma", "", "70-300mm F4-5.6 APO Macro Super II"},
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list