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

The following commit has been merged in the master branch:
commit 3c9548bad79402de23e13288f99972404a6fc092
Author: HumanDynamo <caulier.gilles at gmail.com>
Date:   Tue Sep 26 19:58:56 2006 +0000

    Minolta lens ID update (pass 3) using Dimage Master Rev. Eng.
---
 src/minoltamn.cpp | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index ff2f670..6bdf323 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -96,7 +96,7 @@ namespace Exiv2 {
     /* NOTE: duplicate tags value are : 
        0/25520, 4/25920, 13/25610, 19/25910, 22/26050/26070,
        25500/25501/26130, 25540/25541/25850, 25580/25581, 2564025641,
-       25720/25721, 25790/25791, 
+       25720/25721, 25790/25791, 25960/25961, 25980/25981, 26150/26151
     */
     extern const TagDetails minoltaLensID[] = {
         { 0,     "AF28-85mm F3.5-4.5"                                                         },
@@ -171,24 +171,43 @@ namespace Exiv2 {
         { 25781, "AF16mm F2.8 Fisheye or SIGMA 8mm F4 Fisheye"                                },
         { 25790, "AF20mm F2.8"                                                                },
         { 25791, "AF20mm F2.8"                                                                },
+        { 25810, "AF100mm F2.8 Macro"                                                         },
         { 25811, "AF100mm F2.8 Macro(D) or TAMRON 90mm F2.8 Macro or SIGMA 180mm F5.6 Macro"  },
         { 25850, "AF35-105mm F3.5-4.5"                                                        },
         { 25858, "TAMRON 24-135mm F3.5-5.6"                                                   },
+        { 25880, "AF70-210mm F3.5-4.5"                                                        },
+        { 25890, "AF80-200mm F2.8 APO"                                                        },
         { 25891, "TOKINA 80-200mm F2.8"                                                       },
         { 25910, "AF35mm F1.4G"                                                               },
         { 25920, "AF85mm F1.4G"                                                               },
         { 25921, "AF85mm F1.4G(D)"                                                            },
+        { 25930, "AF200mm F2.8 APO"                                                           },
         { 25931, "AF200mm F2.8G"                                                              },
+        { 25940, "AF 3X-1X F1.7-2.8 Macro"                                                    },
+        { 25960, "AF28mm F2"                                                                  },
         { 25961, "AF28mm F2"                                                                  },
+        { 25970, "AF35mm F2"                                                                  },
+        { 25980, "AF100mm F2"                                                                 },
         { 25981, "AF100mm F2"                                                                 },
+        { 26040, "AF80-200mm F4.5-5.6"                                                        },
         { 26050, "AF35-80mm F4-5.6"                                                           },
+        { 26060, "AF100-300mm F4.5-5.6"                                                       },
         { 26061, "AF100-300mm F4.5-5.6(D) or SIGMA 105mm F2.8 Macro EX-DG"                    },
         { 26070, "AF35-80mm F4-5.6"                                                           },
+        { 26080, "AF300mm F2.8G APO High Speed"                                               },
         { 26081, "AF300mm F2.8G"                                                              },
+        { 26090, "AF600mm F4G APO High Speed"                                                 },
+        { 26120, "AF200mm F2.8G APO High Speed"                                               },
         { 26121, "AF200mm F2.8G(D)"                                                           },
         { 26130, "AF50mm F1.7"                                                                },
         { 26131, "AF50mm F1.7"                                                                },
+        { 26150, "AF28-105mm F3.5-4.5 Xi"                                                     },
         { 26151, "AF28-105mm F3.5-4.5 Xi"                                                     },
+        { 26160, "AF35-200mm F4.5-5.6 Xi"                                                     },
+        { 26180, "AF28-80mm F4-5.6 Xi"                                                        },
+        { 26190, "AF80-200mm F4.5-5.6 Xi"                                                     },
+        { 26210, "AF100-300mm F4.5-5.6 Xi"                                                    },
+        { 26240, "AF35-80mm F4-5.6 Power"                                                     },
         { 26241, "AF35-80mm F4-5.6"                                                           },
         { 45741, "AF200mm F2.8G x2 or TOKINA 300mm F2.8 x2"                                   }
     };

-- 
exiv2 packaging