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

The following commit has been merged in the master branch:
commit 9d9e7cb53bf79f4bf7bb7f0da6000435e499f08d
Author: Robin Mills <robin at clanmills.com>
Date:   Sat Jun 23 07:59:34 2012 +0000

    Patch.  Thanks to Fabien: http://dev.exiv2.org/boards/3/topics/1172
---
 src/canonmn.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 601e019..83e1eeb 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -525,7 +525,8 @@ namespace Exiv2 {
         { 137, "Sigma 17-70mm f/2.8-4 DC Macro OS HSM"                      }, // 6
         { 137, "Sigma 17-50mm f/2.8 OS HSM"                                 }, // 7
         { 137, "Sigma 18-200mm f/3.5-6.3 II DC OS HSM"                      }, // 8
-        { 137, "Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD"                  }, // 9
+        { 137, "Sigma 12-24mm f/4.5-5.6 DG HSM II"                          }, // 9
+        { 137, "Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD"                  }, // 10
         { 138, "Canon EF 28-80mm f/2.8-4L"                                  },
         { 139, "Canon EF 400mm f/2.8L"                                      },
         { 140, "Canon EF 500mm f/4.5L"                                      },

-- 
exiv2 packaging