[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:43:53 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=9d114fb
The following commit has been merged in the master branch:
commit 9d114fbffdb62b143cf1b623f3dc86c0d2bd3f32
Author: nkbj <nkbj1970 at hotmail.com>
Date: Tue Jul 30 05:08:19 2013 +0000
Update camera, flash and lens lists to match ExifTool version 9.34.
---
src/canonmn.cpp | 8 ++++++--
src/nikonmn.cpp | 7 ++++++-
src/pentaxmn.cpp | 3 +++
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 6317301..bf4acdd 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -238,11 +238,14 @@ namespace Exiv2 {
{ 0x3380000, N_("PowerShot N") },
{ 0x3390000, N_("IXUS 245 HS / IXY 430F") },
{ 0x3400000, N_("PowerShot SX280 HS") },
+ { 0x3410000, N_("PowerShot SX270 HS") },
+ { 0x3420000, N_("PowerShot A3500 IS") },
{ 0x3430000, N_("PowerShot A2600") },
{ 0x3450000, N_("PowerShot A1400") },
{ 0x3460000, N_("PowerShot ELPH 130 IS / IXUS 140 / IXY 110F") },
- { 0x3470000, N_("PowerShot ELPH 115 IS / IXUS 132 / IXY 90F") },
+ { 0x3470000, N_("PowerShot ELPH 115 IS / IXUS 132/135 / IXY 90F") },
{ 0x3490000, N_("PowerShot ELPH 330 HS / IXUS 255 HS / IXY 610F") },
+ { 0x3510000, N_("PowerShot A2500") },
{ 0x4040000, N_("PowerShot G1") },
{ 0x6040000, N_("PowerShot S100 / Digital IXUS / IXY Digital") },
{ 0x4007d673, N_("DC19/DC21/DC22") },
@@ -831,7 +834,8 @@ namespace Exiv2 {
{ 4143,"Canon EF-M 18-55mm f/3.5-5.6 IS STM" },
{ 4144,"Canon EF 40mm f/2.8 STM" },
{ 4145,"Canon EF-M 22mm f/2 STM" },
- { 4146,"Canon EF-M 18-55mm f/3.5-5.6 IS STM" }
+ { 4146,"Canon EF-M 18-55mm f/3.5-5.6 IS STM" },
+ { 4147,"Canon EF-M 11-22mm f/4-5.6 IS STM" }
};
//! A lens id and a pretty-print function for special treatment of the id.
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index 2f3dc97..330fd45 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -918,7 +918,9 @@ namespace Exiv2 {
{ 0x0402, N_("4.02 (SB-400)") },
{ 0x0404, N_("4.04 (SB-400)") },
{ 0x0501, N_("5.01 (SB-900)") },
- { 0x0502, N_("5.02 (SB-900)") }
+ { 0x0502, N_("5.02 (SB-900)") },
+ { 0x0601, N_("6.01 (SB-700)") },
+ { 0x0701, N_("7.01 (SB-910)") }
};
//! FlashGNDistance
@@ -1978,6 +1980,7 @@ fmountlens[] = {
{0xB4,0x40,0x37,0x62,0x2C,0x34,0xB6,0x0E,0x01,0x00,0x00, "Nikon", "", "AF-S VR Zoom-Nikkor 24-85mm f/3.5-4.5G IF-ED"},
{0xB5,0x4C,0x3C,0x3C,0x14,0x14,0xB7,0x06,0x01,0x00,0x00, "Nikon", "", "AF-S Nikkor 28mm f/1.8G"},
{0xB7,0x44,0x60,0x98,0x34,0x3C,0xB9,0x0E,0x01,0x00,0x00, "Nikon", "", "AF-S Nikkor 80-400mm f/4.5-5.6G ED VR"},
+{0xB8,0x40,0x2D,0x44,0x2C,0x34,0xBA,0x06,0x01,0x00,0x00, "Nikon", "", "AF-S Nikkor 18-35mm f/3.5-4.5G ED"},
//
{0x00,0x00,0x00,0x00,0x00,0x00,0xE1,0x12,0x00,0x00,0x00, "Nikon", "", "TC-17E II"},
{0x00,0x00,0x00,0x00,0x00,0x00,0xF1,0x0C,0x00,0x00,0x00, "Nikon", "", "TC-14E II"},
@@ -2045,6 +2048,7 @@ fmountlens[] = {
{0x7A,0x47,0x2B,0x5C,0x24,0x34,0x4B,0x06,0x00,0x00,0x05, "Sigma", "689599", "17-70mm F2.8-4.5 DC Macro Asp. IF HSM"},
{0x7A,0x48,0x2B,0x5C,0x24,0x34,0x4B,0x06,0x00,0x00,0x05, "Sigma", "689599", "17-70mm F2.8-4.5 DC Macro Asp. IF HSM"},
{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"},
{0x26,0x40,0x2D,0x44,0x2B,0x34,0x1C,0x02,0x00,0x00,0x05, "Sigma", "", "18-35 F3.5-4.5 Aspherical"},
{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"},
@@ -2186,6 +2190,7 @@ fmountlens[] = {
{0xF7,0x53,0x5C,0x80,0x24,0x24,0x84,0x06,0x01,0x00,0x02, "Tamron", "A001", "SP AF 70-200mm F/2.8 Di LD (IF) Macro"},
{0xF7,0x53,0x5C,0x80,0x24,0x24,0x40,0x06,0x01,0x00,0x02, "Tamron", "A001", "SP AF 70-200mm F/2.8 Di LD (IF) Macro"},
{0xFE,0x53,0x5C,0x80,0x24,0x24,0x84,0x06,0x01,0x00,0x02, "Tamron", "A001", "SP AF 70-200mm F/2.8 Di LD (IF) Macro"},
+{0xFE,0x54,0x5C,0x80,0x24,0x24,0xDF,0x0E,0x01,0x00,0x02, "Tamron", "A009", "SP AF 70-200mm F/2.8 Di VC USD"},
//M "Tamron" "67D" "SP AF 70-210mm f/2.8 LD";
//M "Tamron" "" "AF 70-210mm F/3.5-4.5";
//M "Tamron" "158D" "AF 70-210mm F/4-5.6";
diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index 0a1e67c..229e855 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -176,6 +176,9 @@ namespace Exiv2 {
{ 0x12f71, N_("K-5 II s") },
{ 0x12f7a, N_("Q7") },
{ 0x12f84, N_("MX-1") },
+ { 0x12f8e, N_("WG-3 GPS") },
+ { 0x12f98, N_("WG-3") },
+ { 0x12fa2, N_("WG-10") },
{ 0x12fb6, N_("K-50") },
{ 0x12fca, N_("K-500") },
};
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list