[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:47:02 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=52f3e10

The following commit has been merged in the master branch:
commit 52f3e100c277807576e870522bfadb950429f158
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sat Sep 24 00:13:38 2016 +0000

    Update various lists to match ExifTool version 10.27.
---
 src/canonmn.cpp | 1 +
 src/nikonmn.cpp | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 4fd7be3..80ab672 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -288,6 +288,7 @@ namespace Exiv2 {
         { (long int)0x3890000, "PowerShot ELPH 170 IS / IXUS 170" },
         { (long int)0x3910000, "PowerShot SX410 HS" },
         { (long int)0x3930000, "PowerShot G9 X" },
+        { (long int)0x3940000, "EOS M5" },
         { (long int)0x3950000, "PowerShot G5 X" },
         { (long int)0x3970000, "PowerShot G7 X Mark II" },
         { (long int)0x3990000, "PowerShot ELPH 360 HS / IXUS 285 HS / IXY 650" },
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index a434849..42eaafa 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -2053,6 +2053,8 @@ fmountlens[] = {
 {0xB7,0x44,0x60,0x98,0x34,0x3C,0xB9,0x0E,0x01,0x00,0x00, "Nikon", "JAA817DA", "AF-S Nikkor 80-400mm f/4.5-5.6G ED VR"},
 {0xB8,0x40,0x2D,0x44,0x2C,0x34,0xBA,0x06,0x01,0x00,0x00, "Nikon", "JAA818DA", "AF-S Nikkor 18-35mm f/3.5-4.5G ED"},
 {0xA0,0x40,0x2D,0x74,0x2C,0x3C,0xBB,0x0E,0x01,0x00,0x01, "Nikon", "JAA819DA", "AF-S DX Nikkor 18-140mm f/3.5-5.6G ED VR"},
+{0xA0,0x40,0x2D,0x53,0x2C,0x3C,0xCA,0x8E,0x01,0x00,0x01, "Nikon", "", "AF-P DX Nikkor 18-55mm f/3.5-5.6G"},
+{0xA0,0x40,0x2D,0x53,0x2C,0x3C,0xCA,0x0E,0x01,0x00,0x01, "Nikon", "", "AF-P DX Nikkor 18-55mm f/3.5-5.6G VR"},
 {0xA1,0x54,0x55,0x55,0x0C,0x0C,0xBC,0x06,0x01,0x00,0x01, "Nikon", "JAA136DA", "AF-S Nikkor 58mm f/1.4G"},
 {0xA2,0x40,0x2D,0x53,0x2C,0x3C,0xBD,0x0E,0x01,0x00,0x01, "Nikon", "JAA820DA", "AF-S DX Nikkor 18-55mm f/3.5-5.6G VR II"},
 {0xA4,0x40,0x2D,0x8E,0x2C,0x40,0xBF,0x0E,0x01,0x00,0x01, "Nikon", "JAA821DA", "AF-S DX Nikkor 18-300mm f/3.5-6.3G ED VR"},

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list