[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=383e1d7

The following commit has been merged in the master branch:
commit 383e1d735e6719de273666e5b7b355781e5fdc34
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Wed Jan 1 07:17:34 2014 +0000

    Fix issues #942 and #943: Lens name consistency fixes. Thanks to Torsten Bronger for the reports.
---
 src/canonmn.cpp   | 4 ++--
 src/minoltamn.cpp | 2 +-
 src/nikonmn.cpp   | 2 +-
 src/pentaxmn.cpp  | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index e6d6551..a982576 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -614,7 +614,7 @@ namespace Exiv2 {
         {  28, "Canon EF 80-200mm f/4.5-5.6"                                }, // 0
         {  28, "Tamron SP AF 28-105mm f/2.8 LD Aspherical IF"               }, // 1
         {  28, "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical [IF] Macro"  }, // 2
-        {  28, "Tamron AF 70-300mm f/4.5-5.6 Di LD 1:2 Macro Zoom"          }, // 3
+        {  28, "Tamron AF 70-300mm f/4-5.6 Di LD 1:2 Macro"                 }, // 3
         {  28, "Tamron AF Aspherical 28-200mm f/3.8-5.6"                    }, // 4
         {  29, "Canon EF 50mm f/1.8 MkII"                                   },
         {  30, "Canon EF 35-105mm f/4.5-5.6"                                },
@@ -721,7 +721,7 @@ namespace Exiv2 {
         { 154, "Canon EF 20mm f/2.8 USM"                                    },
         { 155, "Canon EF 85mm f/1.8 USM"                                    },
         { 156, "Canon EF 28-105mm f/3.5-4.5 USM"                            }, // 0
-        { 156, "Tamron SP AF 70-300mm f/4-5.6 Di VC USD"                    }, // 1
+        { 156, "Tamron SP 70-300mm f/4-5.6 Di VC USD"                       }, // 1
         { 160, "Canon EF 20-35mm f/3.5-4.5 USM"                             }, // 0
         { 160, "Tamron AF 19-35mm f/3.5-4.5"                                }, // 1
         { 160, "Tokina AT-X 124 AF 12-24mm f/4 DX"                          }, // 2
diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index cf3eb29..877b204 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -1680,7 +1680,7 @@ namespace Exiv2 {
         { 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" },
+                 "Tamron SP 70-300mm F4-5.6 Di USD" },
         { 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)" },
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index 97d641b..fc90f25 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -2193,7 +2193,7 @@ fmountlens[] = {
 {0xF7,0x53,0x5C,0x80,0x24,0x24,0x84,0x06,0x01,0x00,0x02, "Tamron", "A001", "SP AF 70-200mm F/2.8 Di LD (IF) Macro"},
 {0xFE,0x53,0x5C,0x80,0x24,0x24,0x84,0x06,0x01,0x00,0x02, "Tamron", "A001", "SP AF 70-200mm F/2.8 Di LD (IF) Macro"},
 {0xF7,0x53,0x5C,0x80,0x24,0x24,0x40,0x06,0x01,0x00,0x02, "Tamron", "A001", "SP AF 70-200mm F/2.8 Di LD (IF) Macro"},
-{0xFE,0x54,0x5C,0x80,0x24,0x24,0xDF,0x0E,0x01,0x00,0x02, "Tamron", "A009", "SP AF 70-200mm F/2.8 Di VC USD"},
+{0xFE,0x54,0x5C,0x80,0x24,0x24,0xDF,0x0E,0x01,0x00,0x02, "Tamron", "A009", "SP 70-200mm F/2.8 Di VC USD"},
 //M                                         "Tamron" "67D"    "SP AF 70-210mm f/2.8 LD";
 //M                                         "Tamron" ""       "AF 70-210mm F/3.5-4.5";
 //M                                         "Tamron" "158D"   "AF 70-210mm F/4-5.6";
diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index 4b8cc98..bf77832 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -767,7 +767,7 @@ namespace Exiv2 {
         { 0x041d, "Tamron AF 28-200mm F/3.8-5.6 LD Super II Macro (371D)" },
         { 0x0422, "smc PENTAX-FA 24-90mm F3.5-4.5 AL[IF]" },
         { 0x0423, "smc PENTAX-FA 100-300mm F4.7-5.8" },
-        { 0x0424, "Tamron AF70-300mm F/4-5.6 LD Macro (572D/A17)" },
+        { 0x0424, "Tamron AF 70-300mm F/4-5.6 LD Macro 1:2 (572D/A17)" },
         { 0x0425, "Tamron SP AF 24-135mm F3.5-5.6 AD AL (190D)" },
         { 0x0426, "smc PENTAX-FA 28-105mm F3.2-4.5 AL[IF]" },
         { 0x0427, "smc PENTAX-FA 31mm F1.8AL Limited" },
@@ -779,7 +779,7 @@ namespace Exiv2 {
         { 0x042d, "Tamron AF 28-300mm F3.5-6.3 XR Di LD Aspherical [IF] Macro" },//2
         { 0x042e, "smc PENTAX-FA J 28-80mm F3.5-5.6 AL" },
         { 0x042f, "smc PENTAX-FA J 18-35mm F4-5.6 AL" },
-        { 0x0431, "Tamron SP AF 28-75mm F2.8 XR Di LD Aspherical [IF] Macro" },
+        { 0x0431, "Tamron SP AF 28-75mm F2.8 XR Di LD Aspherical [IF] Macro (A09)" },
         { 0x0433, "smc PENTAX-D FA 50mm F2.8 Macro" },
         { 0x0434, "smc PENTAX-D FA 100mm F2.8 Macro" },
         { 0x0437, "Samsung/Schneider D-XENOGON 35mm F2" },

-- 
exiv2 packaging