[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=41e27fa

The following commit has been merged in the master branch:
commit 41e27fa5199763513139ff2d97197d6d0624fb07
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Fri Feb 19 02:27:28 2016 +0000

    Update various lists to match ExifTool version 10.11.
---
 src/canonmn.cpp   | 1 +
 src/minoltamn.cpp | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 91c555e..0b047c2 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -361,6 +361,7 @@ namespace Exiv2 {
         { (long int)0x80000325, "EOS 70D" },
         { (long int)0x80000326, "EOS Rebel T5i / 700D / Kiss X7i" },
         { (long int)0x80000327, "EOS Rebel T5 / 1200D / Kiss X70" },
+        { (long int)0x80000328, "EOS-1D X MARK II" },
         { (long int)0x80000331, "EOS M" },
         { (long int)0x80000355, "EOS M2" },
         { (long int)0x80000346, "EOS Rebel SL1 / 100D / Kiss X7" },
diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index c8dd023..b6850b3 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -1668,7 +1668,7 @@ namespace Exiv2 {
                  "Minolta/Sony AF 50mm F3.5 Macro" },
         { 32,    "Minolta AF 100-400mm F4.5-6.7 (D) | "
                  "Minolta/Sony AF 300mm F2.8G APO (D) SSM" },
-        { 33,    "Minolta/Sony AF 70-200mm F2.8 G" },
+        { 33,    "Minolta/Sony AF 70-200mm F2.8 APO G (D) SSM" },
         { 35,    "Minolta AF 85mm F1.4 G (D) Limited" },
         { 36,    "Minolta AF 28-100mm F3.5-5.6 (D)" },
         { 38,    "Minolta AF 17-35mm F2.8-4 (D)" },
@@ -1863,7 +1863,7 @@ namespace Exiv2 {
         { 25920, "Minolta AF 85mm F1.4G" },
         { 25921, "Minolta AF 85mm F1.4G (D)" },
         { 25930, "Minolta AF 200mm F2.8 APO" },
-        { 25931, "Minolta AF 200mm F2.8 G APO" },
+        { 25931, "Minolta AF 200mm F2.8 APO" },
         { 25940, "Minolta AF 3X-1X F1.7-2.8 Macro" },
         { 25941, "Minolta AF 3x-1x F1.7-2.8 Macro" },
         { 25960, "Minolta AF 28mm F2" },
@@ -1905,7 +1905,7 @@ namespace Exiv2 {
         { 26211, "Minolta AF 100-300mm F4.5-5.6 xi" },
         { 26240, "Minolta AF 35-80mm F4-5.6 Power Zoom" },
         { 26241, "Minolta AF 35-80mm F4-5.6 Power Zoom" },
-        { 26281, "Minolta AF 80-200mm F2.8 G" },
+        { 26281, "Minolta AF 80-200mm F2.8 HS-APO G" },
         { 26291, "Minolta AF 85mm F1.4 New" },
         { 26311, "Minolta/Sony AF 100-300mm F4.5-5.6 APO" },
         { 26321, "Minolta AF 24-50mm F4 New" },

-- 
exiv2 packaging