[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=9e9604c

The following commit has been merged in the master branch:
commit 9e9604ce613b8d98f36c7f8b118b89cc3bd6190c
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Thu May 23 00:59:14 2013 +0000

    Update lens names to match ExifTool version 9.29.
---
 Makefile          |  2 +-
 src/minoltamn.cpp | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index a7eb3c9..e77feff 100644
--- a/Makefile
+++ b/Makefile
@@ -99,7 +99,7 @@ tarball:
 
 configure:
 	make config
-	
+
 config:
 	cd config && $(MAKE) -f config.make $(MAKECMDGOALS)
 
diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index 9660aff..9d8c81d 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -1669,26 +1669,26 @@ namespace Exiv2 {
         { 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)" },

-- 
exiv2 packaging