[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=67c98c2

The following commit has been merged in the master branch:
commit 67c98c21c4a395922bf15ad15630051060c3bce9
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Jun 28 04:27:18 2011 +0000

    Issue: 777
    Added #include <iterator> to iptc.cpp
    Added epsimage.{cpp|h} and version.{cpp|h} to the DevStudio build environments.
    Some compilation issues remain in VS2010/64 bit build and those fixes will be submitted separately.
---
 msvc/exiv2lib/exiv2lib.vcproj   | 16 ++++++++++++++++
 msvc64/exiv2lib/exiv2lib.vcproj | 16 ++++++++++++++++
 src/iptc.cpp                    |  1 +
 3 files changed, 33 insertions(+)

diff --git a/msvc/exiv2lib/exiv2lib.vcproj b/msvc/exiv2lib/exiv2lib.vcproj
index b962ddd..aa85604 100644
--- a/msvc/exiv2lib/exiv2lib.vcproj
+++ b/msvc/exiv2lib/exiv2lib.vcproj
@@ -373,6 +373,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\src\epsimage.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\src\error.cpp"
 				>
 			</File>
@@ -529,6 +533,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\src
ersion.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\src\xmp.cpp"
 				>
 			</File>
@@ -575,6 +583,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\src\epsimage.hpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\src\error.hpp"
 				>
 			</File>
@@ -683,6 +695,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\src
ersion.hpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\src\xmp.hpp"
 				>
 			</File>
diff --git a/msvc64/exiv2lib/exiv2lib.vcproj b/msvc64/exiv2lib/exiv2lib.vcproj
index a75cf26..f46ea55 100644
--- a/msvc64/exiv2lib/exiv2lib.vcproj
+++ b/msvc64/exiv2lib/exiv2lib.vcproj
@@ -682,6 +682,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\src\epsimage.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\src\error.cpp"
 				>
 			</File>
@@ -830,6 +834,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\src
ersion.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\src\xmp.cpp"
 				>
 			</File>
@@ -876,6 +884,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\src\epsimage.hpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\src\error.hpp"
 				>
 			</File>
@@ -984,6 +996,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\src
ersion.hpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\src\xmp.hpp"
 				>
 			</File>
diff --git a/src/iptc.cpp b/src/iptc.cpp
index 7955805..99b019f 100644
--- a/src/iptc.cpp
+++ b/src/iptc.cpp
@@ -40,6 +40,7 @@ EXIV2_RCSID("@(#) $Id$")
 // + standard includes
 #include <iostream>
 #include <algorithm>
+#include <iterator>
 
 // *****************************************************************************
 namespace {

-- 
exiv2 packaging