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

The following commit has been merged in the master branch:
commit f8a4d46103e68d27d7a7bd59d3eb12625f5695b4
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed May 21 02:57:21 2008 +0000

    Renamed XMP.hpp from the XMP-SDK to XMPSDK.hpp to avoid potential name clashes with Exiv2's xmp.hpp
---
 src/convert.cpp                                  | 2 +-
 src/xmp.cpp                                      | 2 +-
 xmpsdk/include/TXMPIterator.hpp                  | 4 ++--
 xmpsdk/include/TXMPMeta.hpp                      | 6 +++---
 xmpsdk/include/TXMPUtils.hpp                     | 4 ++--
 xmpsdk/include/XMP.incl_cpp                      | 2 +-
 xmpsdk/include/{XMP.hpp => XMPSDK.hpp}           | 2 +-
 xmpsdk/include/client-glue/TXMPIterator.incl_cpp | 2 +-
 xmpsdk/include/client-glue/TXMPMeta.incl_cpp     | 2 +-
 xmpsdk/include/client-glue/TXMPUtils.incl_cpp    | 2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/convert.cpp b/src/convert.cpp
index b24078b..f33edab 100644
--- a/src/convert.cpp
+++ b/src/convert.cpp
@@ -45,7 +45,7 @@ EXIV2_RCSID("@(#) $Id$")
 // Adobe XMP Toolkit
 #ifdef EXV_HAVE_XMP_TOOLKIT
 # define TXMP_STRING_TYPE std::string
-# include <XMP.hpp>
+# include <XMPSDK.hpp>
 # include <MD5.h>
 #endif // EXV_HAVE_XMP_TOOLKIT
 
diff --git a/src/xmp.cpp b/src/xmp.cpp
index c77d2e4..8d55c2c 100644
--- a/src/xmp.cpp
+++ b/src/xmp.cpp
@@ -45,7 +45,7 @@ EXIV2_RCSID("@(#) $Id$")
 // Adobe XMP Toolkit
 #ifdef EXV_HAVE_XMP_TOOLKIT
 # define TXMP_STRING_TYPE std::string
-# include <XMP.hpp>
+# include <XMPSDK.hpp>
 # include <XMP.incl_cpp>
 #endif // EXV_HAVE_XMP_TOOLKIT
 
diff --git a/xmpsdk/include/TXMPIterator.hpp b/xmpsdk/include/TXMPIterator.hpp
index 26bb141..2fbd950 100644
--- a/xmpsdk/include/TXMPIterator.hpp
+++ b/xmpsdk/include/TXMPIterator.hpp
@@ -2,7 +2,7 @@
 #define __TXMPIterator_hpp__ 1
 
 #if ( ! __XMP_hpp__ )
-    #error "Do not directly include, use XMP.hpp"
+    #error "Do not directly include, use XMPSDK.hpp"
 #endif
 
 // =================================================================================================
@@ -37,7 +37,7 @@
 /// are automatically copied and access is fully thread safe.  String objects are only necessary
 /// for output strings. Input string are literals and passed as typical C <tt>const char *</tt>.
 ///
-/// The template parameter, class 
-- 
exiv2 packaging