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

The following commit has been merged in the master branch:
commit f51e06be648ae1a73b48547e279c21da272956d7
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sun May 18 15:37:19 2014 +0000

    Update Canon lens list and Olympus AF modes to match ExifTool version 9.61.
---
 src/canonmn.cpp   | 7 +++++--
 src/olympusmn.cpp | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 6e12868..bdec7bb 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -790,7 +790,7 @@ namespace Exiv2 {
         { 187, "Canon EF 70-200mm f/4L + 1.4x"                              },
         { 188, "Canon EF 70-200mm f/4L + 2x"                                },
         { 189, "Canon EF 70-200mm f/4L + 2.8x"                              },
-        { 190, "Canon EF 100mm f/2.8 Macro"                                 },
+        { 190, "Canon EF 100mm f/2.8 Macro USM"                             },
         { 191, "Canon EF 400mm f/4 DO IS"                                   },
         { 193, "Canon EF 35-80mm f/4-5.6 USM"                               },
         { 194, "Canon EF 80-200mm f/4.5-5.6 USM"                            },
@@ -844,6 +844,7 @@ namespace Exiv2 {
         { 252, "Canon EF 70-200mm f/2.8L IS II USM + 1.4x"                  },
         { 253, "Canon EF 70-200mm f/2.8L IS II USM + 2x"                    },
         { 254, "Canon EF 100mm f/2.8L Macro IS USM"                         },
+        { 255, "Sigma 24-105mm f/4 DG OS HSM | A"                           },
         { 488, "Canon EF-S 15-85mm f/3.5-5.6 IS USM"                        },
         { 489, "Canon EF 70-300mm f/4-5.6L IS USM"                          },
         { 490, "Canon EF 8-15mm f/4L USM"                                   },
@@ -858,13 +859,15 @@ namespace Exiv2 {
         { 503, "Canon EF 24mm f/2.8 IS USM"                                 },
         { 504, "Canon EF 24-70mm f/4L IS USM"                               },
         { 505, "Canon EF 35mm f/2 IS USM"                                   },
+        { 507, "Canon EF 16-35mm f/4L IS USM"                               },
         { 4142,"Canon EF-S 18-135mm f/3.5-5.6 IS STM"                       },
         { 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-S 18-55mm f/3.5-5.6 IS STM"                        },
         { 4147,"Canon EF-M 11-22mm f/4-5.6 IS STM"                          },
-        { 4148,"Canon EF-S 55-250mm f/4-5.6 IS STM"                         }
+        { 4148,"Canon EF-S 55-250mm f/4-5.6 IS STM"                         },
+        { 4150,"Canon EF-S 10-18mm f/4.5-5.6 IS STM"                        }
     };
 
     //! A lens id and a pretty-print function for special treatment of the id.
diff --git a/src/olympusmn.cpp b/src/olympusmn.cpp
index 7c1ee02..96c899d 100644
--- a/src/olympusmn.cpp
+++ b/src/olympusmn.cpp
@@ -1416,7 +1416,7 @@ namespace Exiv2 {
             { 1, N_("Sequential shooting AF") },
             { 2, N_("Continuous AF")          },
             { 3, N_("Multi AF")               },
-            { 5, N_("Face detect")            },
+            { 4, N_("Face detect")            },
             { 10, N_("MF")                    },
             // End of list marker
             { 0xff, "" }

-- 
exiv2 packaging