[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=3153aab

The following commit has been merged in the master branch:
commit 3153aab4615a31b0b2c903d1fc29ddaad80b4a23
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Feb 15 13:44:13 2012 +0000

    #806: Fixed typo. (Mark Purcell)
---
 doc/cmd.txt        | 2 +-
 src/exiv2.1        | 2 +-
 src/exiv2app.hpp   | 2 +-
 src/properties.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/cmd.txt b/doc/cmd.txt
index 7a34c2d..2daf491 100644
--- a/doc/cmd.txt
+++ b/doc/cmd.txt
@@ -28,7 +28,7 @@
 #    for Iptc Time values it is HH:MM:SS±HH:MM where HH:MM:SS refers to local 
 #    hour, minute and seconds and ±HH:MM refers to hours and minutes ahead or 
 #    behind Universal Coordinated Time.
-#    A default type is used if none is explicitely given. The default type is 
+#    A default type is used if none is explicitly given. The default type is 
 #    determined based on the key.
 # value 
 #    The remaining text on the line is the value. It can optionally be enclosed
diff --git a/src/exiv2.1 b/src/exiv2.1
index 29b8954..939c9d8 100644
--- a/src/exiv2.1
+++ b/src/exiv2.1
@@ -377,7 +377,7 @@ for IPTC keys, and
 .B XmpText | XmpAlt | XmpBag | XmpSeq | LangAlt
 for XMP keys.
 .sp 1
-A default ItypeP is used if none is explicitely given. The default
+A default ItypeP is used if none is explicitly given. The default
 is determined based on IkeyP.
 .TP
 .I value
diff --git a/src/exiv2app.hpp b/src/exiv2app.hpp
index 8cbbedf..91f4918 100644
--- a/src/exiv2app.hpp
+++ b/src/exiv2app.hpp
@@ -57,7 +57,7 @@ struct ModifyCmd {
     std::string key_;                           //!< Exiv2 key string
     MetadataId metadataId_;                     //!< Metadata identifier
     Exiv2::TypeId typeId_;                      //!< Exiv2 type identifier
-    //! Flag to indicate if the type was explicitely specified (true)
+    //! Flag to indicate if the type was explicitly specified (true)
     bool explicitType_;
     std::string value_;                         //!< Data
 };
diff --git a/src/properties.cpp b/src/properties.cpp
index 1e368d9..8b9d84f 100644
--- a/src/properties.cpp
+++ b/src/properties.cpp
@@ -1110,7 +1110,7 @@ namespace Exiv2 {
         }
         // Allocated memory is freed when the namespace is unregistered.
         // Using malloc/free for better system compatibility in case
-        // users don't unregister their namespaces explicitely.
+        // users don't unregister their namespaces explicitly.
         XmpNsInfo xn;
         char* c = static_cast<char*>(std::malloc(ns2.size() + 1));
         std::strcpy(c, ns2.c_str());

-- 
exiv2 packaging