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

The following commit has been merged in the master branch:
commit d9db53d7bc315f0c4a1e2ef893dd0311d285e45f
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Tue May 20 04:19:00 2008 +0000

    Moved MD5.h into the xmpsdk/include/ directory.
---
 doc/README-XMP                | 11 ++++++-----
 src/convert.cpp               |  2 +-
 xmpsdk/{src => include}/MD5.h |  0
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/doc/README-XMP b/doc/README-XMP
index 0bef127..78df99e 100644
--- a/doc/README-XMP
+++ b/doc/README-XMP
@@ -50,11 +50,12 @@ http://www.adobe.com/devnet/xmp/sdk/eula.html
 The following files were copied from the original XMP SDK
 distribution:
 
-public/include/*      -> xmpsdk/include
-source/common/*       -> xmpsdk/src
-source/XMPCore/*      -> xmpsdk/src
-build/XMP_BuildInfo.h -> xmpsdk/src
-third-party/MD5/*     -> xmpsdk/src
+public/include/*        -> xmpsdk/include
+source/common/*         -> xmpsdk/src
+source/XMPCore/*        -> xmpsdk/src
+build/XMP_BuildInfo.h   -> xmpsdk/src
+third-party/MD5/MD5.h   -> xmpsdk/include
+third-party/MD5/MD5.cpp -> xmpsdk/src
 
 Minor changes were applied to the original XMP SDK, see the SVN for 
 details:
diff --git a/src/convert.cpp b/src/convert.cpp
index b76b7b9..4f46d05 100644
--- a/src/convert.cpp
+++ b/src/convert.cpp
@@ -43,7 +43,7 @@ EXIV2_RCSID("@(#) $Id$")
 # define TXMP_STRING_TYPE std::string
 # include <XMP.hpp>
 # include <XMP.incl_cpp>
-# include <../src/MD5.h>
+# include <MD5.h>
 #endif // EXV_HAVE_XMP_TOOLKIT
 
 // + standard includes
diff --git a/xmpsdk/src/MD5.h b/xmpsdk/include/MD5.h
similarity index 100%
rename from xmpsdk/src/MD5.h
rename to xmpsdk/include/MD5.h

-- 
exiv2 packaging