[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=33c7159

The following commit has been merged in the master branch:
commit 33c7159091d417ff5520f9106d9c36eeb37951f5
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Sep 14 15:15:28 2008 +0000

    #570: Changed make string to recognize Fujifilm makernotes from FUJIFILM to FUJI.
---
 src/makernote.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/makernote.cpp b/src/makernote.cpp
index 64b650f..abc0975 100644
--- a/src/makernote.cpp
+++ b/src/makernote.cpp
@@ -54,7 +54,7 @@ namespace Exiv2 {
     const TiffMnRegistry TiffMnCreator::registry_[] = {
         { "Canon",          Group::canonmn,   newIfdMn,       newIfdMn2       },
         { "FOVEON",         Group::sigmamn,   newSigmaMn,     newSigmaMn2     },
-        { "FUJIFILM",       Group::fujimn,    newFujiMn,      newFujiMn2      },
+        { "FUJI",           Group::fujimn,    newFujiMn,      newFujiMn2      },
         { "KONICA MINOLTA", Group::minoltamn, newIfdMn,       newIfdMn2       },
         { "Minolta",        Group::minoltamn, newIfdMn,       newIfdMn2       },
         { "NIKON",          Group::nikonmn,   newNikonMn,     0               },

-- 
exiv2 packaging