[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=3b0d0d5

The following commit has been merged in the master branch:
commit 3b0d0d5945c769caa1286dc212af3aff307972ba
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sun Sep 21 11:03:03 2014 +0000

    Update camera and lens lists til match ExifTool version 9.71.
---
 src/canonmn.cpp   | 2 ++
 src/minoltamn.cpp | 3 ++-
 src/nikonmn.cpp   | 4 ++++
 src/samsungmn.cpp | 3 ++-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 9d9eff3..ebf748c 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -264,6 +264,7 @@ namespace Exiv2 {
         { (long int)0x3690000, N_("PowerShot ELPH 135 / IXUS 145 / IXY 120") },
         { (long int)0x3700000, N_("PowerShot ELPH 340 HS / IXUS 265 HS / IXY 630") },
         { (long int)0x3710000, N_("PowerShot ELPH 150 IS / IXUS 155 / IXY 140") },
+        { (long int)0x3780000, N_("PowerShot G7 X") },
         { (long int)0x4040000, N_("PowerShot G1") },
         { (long int)0x6040000, N_("PowerShot S100 / Digital IXUS / IXY Digital") },
         { (long int)0x4007d673, N_("DC19/DC21/DC22") },
@@ -328,6 +329,7 @@ namespace Exiv2 {
         { (long int)0x80000286, N_("EOS Rebel T3i / 600D / Kiss X5") },
         { (long int)0x80000287, N_("EOS 60D") },
         { (long int)0x80000288, N_("EOS Rebel T3 / 1100D / Kiss X50") },
+        { (long int)0x80000289, N_("EOS 7D Mark II") },
         { (long int)0x80000297, N_("WFT-E2 II") },
         { (long int)0x80000298, N_("WFT-E4 II") },
         { (long int)0x80000301, N_("EOS Rebel T4i / 650D / Kiss X6i") },
diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index 16b5706..87b40b4 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -1720,7 +1720,8 @@ namespace Exiv2 {
                  "Sigma 24-70mm F2.8 IF EX DG HSM | "
                  "Sigma 18-250mm F3.5-6.3 DC OS HSM | "
                  "Sigma 17-50mm F2.8 EX DC HSM | "
-                 "Sigma 17-50mm F2.8-4 DC Macro HSM" },
+                 "Sigma 17-70mm F2.8-4 DC Macro HSM | "
+                 "Sigma 150mm F2.8 EX DG OS HSM APO Macro" },
         { 129,   "Tamron 200-400mm F5.6 LD | "
                  "Tamron 70-300mm F4-5.6 LD" },
         { 131,   "Tamron 20-40mm F2.7-3.5 SP Aspherical IF" },
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index cd6848a..bf9e8f1 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -2105,6 +2105,7 @@ fmountlens[] = {
 {0x67,0x54,0x37,0x5C,0x24,0x24,0x1C,0x02,0x00,0x00,0x00, "Sigma", "548445", "24-70mm F2.8 EX DG Macro"},
 {0xE9,0x54,0x37,0x5C,0x24,0x24,0x1C,0x02,0x00,0x00,0x00, "Sigma", "548445", "24-70mm F2.8 EX DG Macro"},
 {0x26,0x40,0x37,0x5C,0x2C,0x3C,0x1C,0x02,0x00,0x00,0x00, "Sigma", "", "24-70mm F3.5-5.6 Aspherical HF"},
+{0x8A,0x3C,0x37,0x6A,0x30,0x30,0x4B,0x0E,0x00,0x00,0x00, "Sigma", "", "24-105mm F4 DG OS HSM"},
 {0x26,0x54,0x37,0x73,0x24,0x34,0x1C,0x02,0x00,0x00,0x00, "Sigma", "", "24-135mm F2.8-4.5"},
 {0x02,0x46,0x3C,0x5C,0x25,0x25,0x02,0x00,0x00,0x00,0x00, "Sigma", "", "28-70mm F2.8"},
 {0x26,0x54,0x3C,0x5C,0x24,0x24,0x1C,0x02,0x00,0x00,0x00, "Sigma", "", "28-70mm F2.8 EX"},
@@ -2318,6 +2319,8 @@ fmountlens[] = {
 {0x12,0x3B,0x68,0x8D,0x3D,0x43,0x09,0x02,0x00,0x00,0x00, "Cosina", "", "AF Zoom 100-300mm F5.6-6.7 MC Macro"},
 //M                                         "Cosina" "" "AF Zoom 100-400mm F5.6-6.7 MC";
 //
+{0x12,0x38,0x69,0x97,0x35,0x42,0x09,0x02,0x00,0x00,0x00, "Promaster", "", "Spectrum 7 100-400mm F4.5-6.7"},
+//
 {0x00,0x40,0x31,0x31,0x2C,0x2C,0x00,0x00,0x00,0x00,0x00, "Voigtlander", "BA295AN", "Color Skopar 20mm F3.5 SLII Aspherical"},
 {0x00,0x54,0x48,0x48,0x18,0x18,0x00,0x00,0x00,0x00,0x00, "Voigtlander", "BA229DN", "Ultron 40mm F2 SLII Aspherical"},
 {0x00,0x54,0x55,0x55,0x0C,0x0C,0x00,0x00,0x00,0x00,0x00, "Voigtlander", "BA239BN", "Nokton 58mm F1.4 SLII"},
@@ -2336,6 +2339,7 @@ fmountlens[] = {
 //
 {0x4A,0x40,0x11,0x11,0x2C,0x0C,0x4D,0x02,0x00,0x00,0x00, "Samyang", "", "8mm f/3.5 Fish-Eye CS"},
 {0x4A,0x48,0x24,0x24,0x24,0x0C,0x4D,0x02,0x00,0x00,0x00, "Samyang", "", "AE 14mm f/2.8 ED AS IF UMC"},
+{0x4A,0x54,0x29,0x29,0x18,0x0C,0x4D,0x02,0x00,0x00,0x00, "Samyang", "", "16mm F2.0 ED AS UMC CS"},
 {0x4A,0x60,0x44,0x44,0x0C,0x0C,0x4D,0x02,0x00,0x00,0x00, "Samyang", "", "35mm f/1.4 AS UMC"},
 {0x4A,0x60,0x62,0x62,0x0C,0x0C,0x4D,0x02,0x00,0x00,0x00, "Samyang", "", "AE 85mm f/1.4 AS IF UMC"},
 {0x4A,0x54,0x29,0x29,0x18,0x0C,0x4D,0x02,0x00,0x00,0x00, "Samyang", "", "Samyang 16mm F2.0 ED AS UMC CS"},
diff --git a/src/samsungmn.cpp b/src/samsungmn.cpp
index d789023..6de0df1 100644
--- a/src/samsungmn.cpp
+++ b/src/samsungmn.cpp
@@ -64,7 +64,8 @@ namespace Exiv2 {
         { 11, N_("Samsung NX 45mm F1.8 2D/3D")            },
         { 12, N_("Samsung NX 12-24mm F4-5.6 ED")          },
         { 14, N_("Samsung NX 10mm F3.5 Fisheye")          },
-        { 15, N_("Samsung NX 16-50mm F3.5-5.6 PZ ED OIS") }
+        { 15, N_("Samsung NX 16-50mm F3.5-5.6 PZ ED OIS") },
+        { 20, N_("Samsung NX 50-150mm F2.8 S ED OIS")     }
     };
 
     //! ColorSpace, tag 0xa011

-- 
exiv2 packaging