[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=7c2d28c

The following commit has been merged in the master branch:
commit 7c2d28c3d8c9bae9a042944207c2ac5184f11665
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Jan 29 17:22:43 2013 +0000

    Forum topic 1411.  Thanks Niels for the patch.  Thanks Paul for providing a test file.
---
 src/pentaxmn.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index 7e0410d..5f0ad9d 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -687,7 +687,8 @@ namespace Exiv2 {
         { 0x031a, "smc PENTAX-F* 250-600mm F5.6 ED[IF]" },
         { 0x031b, "smc PENTAX-F 28-80mm F3.5-4.5" },                    //0
         { 0x031b, "Tokina AT-X Pro AF 28-70mm F2.6-2.8" },              //1
-        { 0x031c, "smc PENTAX-F 35-70mm F3.5-4.5" },
+        { 0x031c, "smc PENTAX-F 35-70mm F3.5-4.5 or Tokina Lens" },     //0
+        { 0x031c, "Tokina AT-X AF 400mm F5.6" },			            //1
         { 0x031d, "PENTAX-F 28-80mm F3.5-4.5 or SIGMA AF 18-125mm F3.5-5.6 DC" },
         { 0x031e, "PENTAX-F 70-200mm F4-5.6" },
         { 0x031f, "smc PENTAX-F 70-210mm F4-5.6 or Tokina or Takumar Lens" }, //0

-- 
exiv2 packaging