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

The following commit has been merged in the master branch:
commit dc6c8086daa04b370033b33c04b1094985688b2b
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun May 9 15:57:00 2010 +0000

    Fixed compilation with MSVC (Patch by Jens Mueller)
---
 msvc/exiv2lib/exiv2lib.vcproj | 12 ++++++++++--
 src/makernote.cpp             |  3 ++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/msvc/exiv2lib/exiv2lib.vcproj b/msvc/exiv2lib/exiv2lib.vcproj
index 200440d..1dda2e6 100644
--- a/msvc/exiv2lib/exiv2lib.vcproj
+++ b/msvc/exiv2lib/exiv2lib.vcproj
@@ -36,6 +36,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
+				AdditionalDependencies="Ws2_32.lib"
 				OutputFile="$(OutDir)/exiv2.lib"
 				AdditionalLibraryDirectories="..\xmpsdk\Debug;..\..\..\expat-2.0.1\win32in\debug"/>
 			<Tool
@@ -91,6 +92,7 @@ cd ..\..\exiv2lib
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
+				AdditionalDependencies="Ws2_32.lib"
 				OutputFile="$(OutDir)/exiv2.lib"
 				AdditionalLibraryDirectories="..\xmpsdk\Release;..\..\..\expat-2.0.1\win32in
elease"/>
 			<Tool
@@ -154,7 +156,7 @@ cd ..\..\exiv2lib
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/NODEFAULTLIB:LIBMTD"
-				AdditionalDependencies="..\xmpsdk\DebugDLL\xmpsdk.lib ..\..\..\expat-2.0.1\win32in\debug\libexpat.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Debug\zlib1d.lib"
+				AdditionalDependencies="..\xmpsdk\DebugDLL\xmpsdk.lib ..\..\..\expat-2.0.1\win32in\debug\libexpat.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Debug\zlib1d.lib  Ws2_32.lib"
 				OutputFile="$(OutDir)\exiv2.dll"
 				GenerateDebugInformation="TRUE"
 				ImportLibrary="$(TargetDir)\exiv2.lib"
@@ -221,7 +223,7 @@ copy/y ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Debug\zlib1d.dll $(OutDir
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMT"
-				AdditionalDependencies="..\xmpsdk\ReleaseDLL\xmpsdk.lib ..\..\..\expat-2.0.1\win32in
elease\libexpat.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Release\zlib1.lib"
+				AdditionalDependencies="..\xmpsdk\ReleaseDLL\xmpsdk.lib ..\..\..\expat-2.0.1\win32in
elease\libexpat.lib ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Release\zlib1.lib  Ws2_32.lib"
 				OutputFile="$(OutDir)\exiv2.dll"
 				GenerateDebugInformation="FALSE"
 				ImportLibrary="$(TargetDir)\exiv2.lib"
@@ -335,6 +337,9 @@ copy/y ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Release\zlib1.dll $(OutDi
 				RelativePath="..\..\src\minoltamn.cpp">
 			</File>
 			<File
+				RelativePath="..\..\src\minoltasonyvalues.cpp"
+			</File>
+			<File
 				RelativePath="..\..\src\mrwimage.cpp">
 			</File>
 			<File
@@ -484,6 +489,9 @@ copy/y ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Release\zlib1.dll $(OutDi
 				RelativePath="..\..\src\minoltamn.hpp">
 			</File>
 			<File
+				RelativePath="..\..\src\minoltasonyvalues.hpp"
+			</File>
+			<File
 				RelativePath="..\..\src\mn.hpp">
 			</File>
 			<File
diff --git a/src/makernote.cpp b/src/makernote.cpp
index 37457e5..aa48e4d 100644
--- a/src/makernote.cpp
+++ b/src/makernote.cpp
@@ -32,8 +32,10 @@ EXIV2_RCSID("@(#) $Id$")
 // included header files
 #ifdef _MSC_VER
 # include "exv_msvc.h"
+# include <winsock.h>
 #else
 # include "exv_conf.h"
+# include <arpa/inet.h>           // htonl (sony_decrypt)
 #endif
 
 #include "makernote_int.hpp"
@@ -46,7 +48,6 @@ EXIV2_RCSID("@(#) $Id$")
 #include <string>
 #include <cstring>
 
-#include <arpa/inet.h>           // htonl (sony_decrypt)
 
 // *****************************************************************************
 namespace {

-- 
exiv2 packaging