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

The following commit has been merged in the master branch:
commit f46e505c97ac52acca23bd5c9370e0227e222807
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sun Oct 20 06:13:35 2013 +0000

    Update camera and lens lists to match ExifTool version 9.39.
---
 src/nikonmn.cpp  | 2 +-
 src/pentaxmn.cpp | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index 9d603d1..8893826 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -2048,8 +2048,8 @@ fmountlens[] = {
 {0x7F,0x48,0x2B,0x5C,0x24,0x34,0x1C,0x06,0x00,0x00,0x05, "Sigma", "", "17-70mm F2.8-4.5 DC Macro Asp. IF"},
 {0x8E,0x3C,0x2B,0x5C,0x24,0x30,0x4B,0x0E,0x00,0x00,0x05, "Sigma", "", "17-70mm F2.8-4 DC MACRO OS HSM Contemporary"},
 {0xA0,0x48,0x2A,0x5C,0x24,0x30,0x4B,0x0E,0x00,0x00,0x05, "Sigma", "", "17-70mm F2.8-4 DC Macro OS HSM"},
-{0x8B,0x4C,0x2D,0x44,0x14,0x14,0x4B,0x06,0x00,0x00,0x05, "Sigma", "", "18-35mm F1.8 DC HSM"},
 {0x26,0x40,0x2D,0x44,0x2B,0x34,0x1C,0x02,0x00,0x00,0x05, "Sigma", "", "18-35mm F3.5-4.5 Aspherical"},
+{0x8B,0x4C,0x2D,0x44,0x14,0x14,0x4B,0x06,0x00,0x00,0x05, "Sigma", "", "18-35mm F1.8 DC HSM"},
 {0x26,0x48,0x2D,0x50,0x24,0x24,0x1C,0x06,0x00,0x00,0x05, "Sigma", "", "18-50mm F2.8 EX DC"},
 {0x7F,0x48,0x2D,0x50,0x24,0x24,0x1C,0x06,0x00,0x00,0x05, "Sigma", "", "18-50mm F2.8 EX DC Macro"},
 {0x7A,0x48,0x2D,0x50,0x24,0x24,0x4B,0x06,0x01,0x00,0x05, "Sigma", "582593", "18-50mm F2.8 EX DC Macro"},
diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index b95b60d..c58266a 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -180,6 +180,7 @@ namespace Exiv2 {
         {    0x12f98, N_("WG-3") },
         {    0x12fa2, N_("WG-10") },
         {    0x12fb6, N_("K-50") },
+        {    0x12fc0, N_("K-3") },
         {    0x12fca, N_("K-500") },
     };
 
@@ -836,6 +837,11 @@ namespace Exiv2 {
         { 0x073a, "smc PENTAX-D FA Macro 100mm F2.8 WR" },
         { 0x074b, "Tamron SP AF 70-200mm F2.8 Di LD [IF] Macro (A001)" },
         { 0x07ca, "smc PENTAX-DA L 18-55mm F3.5-5.6 AL WR" },
+        { 0x07cc, "HD PENTAX-DA 15mm F4 ED AL Limited" },
+        { 0x07cd, "HD PENTAX-DA 35mm F2.8 Macro Limited" },
+        { 0x07ce, "HD PENTAX-DA 70mm F2.4 Limited" },
+        { 0x07cf, "HD PENTAX-DA 21mm F3.2 ED AL Limited" },
+        { 0x07d0, "HD PENTAX-DA 40mm F2.8 Limited" },
         { 0x07d4, "smc PENTAX-DA 50mm F1.8" },
         { 0x07d5, "smc PENTAX-DA 40mm F2.8 XS" },
         { 0x07d6, "smc PENTAX-DA 35mm F2.4 AL" },

-- 
exiv2 packaging