[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=891827b

The following commit has been merged in the master branch:
commit 891827b6cee30b7310e7d818d0c89eadc0744d92
Author: Robin Mills <robin at clanmills.com>
Date:   Fri Mar 20 03:40:14 2009 +0000

    #621 : Windows build changes.
    
    I discovered while doing a private build for a user that msvc/include/exv_msvc.h still contains the #pragma comment code.
    I've removed that (again!) and fixed a consequential link error on exiv2lib.vcproj DebugDLL | ReleaseDLL
    Rebuilt everything on VS2003/5/8 and all run the runner.bat test OK.
---
 msvc/exiv2lib/exiv2lib.vcproj |  4 ++--
 msvc/include/exv_msvc.h       | 14 --------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/msvc/exiv2lib/exiv2lib.vcproj b/msvc/exiv2lib/exiv2lib.vcproj
index 9457483..d7bb898 100644
--- a/msvc/exiv2lib/exiv2lib.vcproj
+++ b/msvc/exiv2lib/exiv2lib.vcproj
@@ -212,7 +212,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/NODEFAULTLIB:LIBMTD"
-				AdditionalDependencies="..\xmpsdk\DebugDLL\xmpsdk.lib ..\..\..\expat-2.0.1\win32in\debug\libexpat.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"
 				OutputFile="$(OutDir)\exiv2.dll"
 				GenerateDebugInformation="true"
 				RandomizedBaseAddress="1"
@@ -297,7 +297,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/NODEFAULTLIB:LIBCMT"
-				AdditionalDependencies="..\xmpsdk\ReleaseDLL\xmpsdk.lib ..\..\..\expat-2.0.1\win32in
elease\libexpat.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"
 				OutputFile="$(OutDir)\exiv2.dll"
 				GenerateDebugInformation="false"
 				RandomizedBaseAddress="1"
diff --git a/msvc/include/exv_msvc.h b/msvc/include/exv_msvc.h
index 14685a5..c681332 100644
--- a/msvc/include/exv_msvc.h
+++ b/msvc/include/exv_msvc.h
@@ -56,20 +56,6 @@ typedef int pid_t;
 
 #if HAVE_LIBZ
   #define EXV_HAVE_LIBZ
-  #if     EXV_HAVE_DLL
-    #ifdef   _DEBUG
-      #pragma comment(lib,"../../../zlib-1.2.3/projects/visualc6/Win32_DLL_Debug/zlib1d.lib")
-    #else
-      #pragma comment(lib,"../../../zlib-1.2.3/projects/visualc6/Win32_DLL_Release/zlib1.lib")
-    #endif
-  #else
-    #ifdef   _DEBUG
-      #pragma comment(lib,"../../../zlib-1.2.3/projects/visualc6/Win32_LIB_Debug/zlibd.lib")
-    #else
-      #pragma comment(lib,"../../../zlib-1.2.3/projects/visualc6/Win32_LIB_Release/zlib.lib")
-    #endif
-  #endif
-  #define EXV_HAVE_LIBZ
   // assist VC7.1 to compile vsnprintf
   #if (_MSC_VER < 1400) && !defined(vsnprintf)
   #define vsnprintf _vsnprintf

-- 
exiv2 packaging