[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

Thu Jul 13 17:46:23 UTC 2017

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=8c92f5f

The following commit has been merged in the master branch:
commit 8c92f5f094ef487d5c2e43b7507e63237c7e16e2
Author: Robin Mills <robin at clanmills.com>
Date:   Fri Mar 25 10:36:31 2016 +0000

    #1034. Corrections to r4249 to fix build-breakers
---
 msvc2005/libexiv2/libexiv2.vcproj | 1124 ++++++++++++++++++++++++++++++++++++-
 src/makernote.cpp                 |    8 +-
 2 files changed, 1127 insertions(+), 5 deletions(-)

diff --git a/msvc2005/libexiv2/libexiv2.vcproj b/msvc2005/libexiv2/libexiv2.vcproj
index cd7ea5e..da84108 100644
--- a/msvc2005/libexiv2/libexiv2.vcproj
+++ b/msvc2005/libexiv2/libexiv2.vcproj
@@ -1 +1,1123 @@
-<?xml version="1.0" encoding="Windows-1252"?><VisualStudioProject ProjectType="Visual C++" Version="8.00" Name="libexiv2" ProjectGUID="{831EF580-92C8-4CA8-B0CE-3D906280A54D}" RootNamespace="libexiv2" Keyword="Win32Proj"><Platforms><Platform Name="Win32"/><Platform Name="x64"/></Platforms><ToolFiles>    </ToolFiles><Configurations><Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="4" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2"><Tool Name="VCPreBuildEventTool" CommandLine=""/><Tool Name="VCCustomBuildTool"/><Tool Name="VCXMLDataGeneratorTool"/><Tool Name="VCWebServiceProxyGeneratorTool"/><Tool Name="VCMIDLTool"/><Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;" PreprocessorDefinitions="WIN32;_DEBUG;LIBSSH_STATIC" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" BufferSecurityCheck="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" BrowseInformation="1" WarningLevel="3" WarnAsError="true" DebugInformationFormat="3"/><Tool Name="VCManagedResourceCompilerTool"/><Tool Name="VCResourceCompilerTool"/><Tool Name="VCPreLinkEventTool"/><Tool Name="VCLibrarianTool" AdditionalLibraryDirectories="..\xmpsdk\$(PlatformName)\$(ConfigurationName);..\expat\(PlatformName)\$(ConfigurationName)" IgnoreDefaultLibraryNames="msvcrtd"/><Tool Name="VCALinkTool"/><Tool Name="VCXDCMakeTool"/><Tool Name="VCBscMakeTool"/><Tool Name="VCFxCopTool"/><Tool Name="VCPostBuildEventTool"/></Configuration><Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="4" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2"><Tool Name="VCPreBuildEventTool" CommandLine=""/><Tool Name="VCCustomBuildTool"/><Tool Name="VCXMLDataGeneratorTool"/><Tool Name="VCWebServiceProxyGeneratorTool"/><Tool Name="VCMIDLTool" TargetEnvironment="3"/><Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;" PreprocessorDefinitions="WIN32;_DEBUG;LIBSSH_STATIC" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" BufferSecurityCheck="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" BrowseInformation="1" WarningLevel="3" WarnAsError="true" DebugInformationFormat="3"/><Tool Name="VCManagedResourceCompilerTool"/><Tool Name="VCResourceCompilerTool"/><Tool Name="VCPreLinkEventTool"/><Tool Name="VCLibrarianTool" AdditionalLibraryDirectories="..\xmpsdk\$(PlatformName)\$(ConfigurationName);..\expat\(PlatformName)\$(ConfigurationName)" IgnoreDefaultLibraryNames="msvcrtd"/><Tool Name="VCALinkTool"/><Tool Name="VCXDCMakeTool"/><Tool Name="VCBscMakeTool"/><Tool Name="VCFxCopTool"/><Tool Name="VCPostBuildEventTool"/></Configuration><Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="4" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2"><Tool Name="VCPreBuildEventTool" Description="copy expat and zlib binaries" CommandLine=""/><Tool Name="VCCustomBuildTool"/><Tool Name="VCXMLDataGeneratorTool"/><Tool Name="VCWebServiceProxyGeneratorTool"/><Tool Name="VCMIDLTool"/><Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;" PreprocessorDefinitions="WIN32;_NDEBUG;LIBSSH_STATIC" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" BrowseInformation="1" WarningLevel="3" WarnAsError="true" DebugInformationFormat="3"/><Tool Name="VCManagedResourceCompilerTool"/><Tool Name="VCResourceCompilerTool"/><Tool Name="VCPreLinkEventTool"/><Tool Name="VCLibrarianTool" AdditionalLibraryDirectories=""$(OutDir)";"..\xmpsdk\$(PlatformName)\$(ConfigurationName)";"..\expat\(PlatformName)\$(ConfigurationName)"" IgnoreDefaultLibraryNames="msvcrt"/><Tool Name="VCALinkTool"/><Tool Name="VCXDCMakeTool"/><Tool Name="VCBscMakeTool"/><Tool Name="VCFxCopTool"/><Tool Name="VCPostBuildEventTool"/></Configuration><Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="4" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2"><Tool Name="VCPreBuildEventTool" Description="copy expat and zlib binaries" CommandLine=""/><Tool Name="VCCustomBuildTool"/><Tool Name="VCXMLDataGeneratorTool"/><Tool Name="VCWebServiceProxyGeneratorTool"/><Tool Name="VCMIDLTool" TargetEnvironment="3"/><Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;" PreprocessorDefinitions="WIN32;_NDEBUG;LIBSSH_STATIC" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" BrowseInformation="1" WarningLevel="3" WarnAsError="true" DebugInformationFormat="3"/><Tool Name="VCManagedResourceCompilerTool"/><Tool Name="VCResourceCompilerTool"/><Tool Name="VCPreLinkEventTool"/><Tool Name="VCLibrarianTool" AdditionalLibraryDirectories=""$(OutDir)";"..\xmpsdk\$(PlatformName)\$(ConfigurationName)";"..\expat\(PlatformName)\$(ConfigurationName)"" IgnoreDefaultLibraryNames="msvcrt"/><Tool Name="VCALinkTool"/><Tool Name="VCXDCMakeTool"/><Tool Name="VCBscMakeTool"/><Tool Name="VCFxCopTool"/><Tool Name="VCPostBuildEventTool"/></Configuration><Configuration Name="DebugDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2"><Tool Name="VCPreBuildEventTool"/><Tool Name="VCCustomBuildTool"/><Tool Name="VCXMLDataGeneratorTool"/><Tool Name="VCWebServiceProxyGeneratorTool"/><Tool Name="VCMIDLTool"/><Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;" PreprocessorDefinitions="WIN32;_DEBUG;EXV_HAVE_DLL;EXV_BUILDING_LIB" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" BufferSecurityCheck="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" BrowseInformation="1" WarningLevel="3" WarnAsError="true" DebugInformationFormat="3"/><Tool Name="VCManagedResourceCompilerTool"/><Tool Name="VCResourceCompilerTool"/><Tool Name="VCPreLinkEventTool"/><Tool Name="VCLinkerTool" AdditionalOptions="/NODEFAULTLIB:LIBMTD" AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" TargetMachine="1"/><Tool Name="VCALinkTool"/><Tool Name="VCManifestTool"/><Tool Name="VCXDCMakeTool"/><Tool Name="VCBscMakeTool"/><Tool Name="VCFxCopTool"/><Tool Name="VCAppVerifierTool"/><Tool Name="VCWebDeploymentTool"/><Tool Name="VCPostBuildEventTool"/></Configuration><Configuration Name="DebugDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2"><Tool Name="VCPreBuildEventTool"/><Tool Name="VCCustomBuildTool"/><Tool Name="VCXMLDataGeneratorTool"/><Tool Name="VCWebServiceProxyGeneratorTool"/><Tool Name="VCMIDLTool" TargetEnvironment="3"/><Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;" PreprocessorDefinitions="WIN32;_DEBUG;EXV_HAVE_DLL;EXV_BUILDING_LIB" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" BufferSecurityCheck="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" BrowseInformation="1" WarningLevel="3" WarnAsError="true" DebugInformationFormat="3"/><Tool Name="VCManagedResourceCompilerTool"/><Tool Name="VCResourceCompilerTool"/><Tool Name="VCPreLinkEventTool"/><Tool Name="VCLinkerTool" AdditionalOptions="/NODEFAULTLIB:LIBMTD" AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" TargetMachine="17"/><Tool Name="VCALinkTool"/><Tool Name="VCManifestTool"/><Tool Name="VCXDCMakeTool"/><Tool Name="VCBscMakeTool"/><Tool Name="VCFxCopTool"/><Tool Name="VCAppVerifierTool"/><Tool Name="VCWebDeploymentTool"/><Tool Name="VCPostBuildEventTool"/></Configuration><Configuration Name="ReleaseDLL|Win32" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2"><Tool Name="VCPreBuildEventTool"/><Tool Name="VCCustomBuildTool"/><Tool Name="VCXMLDataGeneratorTool"/><Tool Name="VCWebServiceProxyGeneratorTool"/><Tool Name="VCMIDLTool"/><Tool Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;" PreprocessorDefinitions="WIN32;_NDEBUG;EXV_HAVE_DLL;EXV_BUILDING_LIB" MinimalRebuild="true" BasicRuntimeChecks="0" RuntimeLibrary="2" BufferSecurityCheck="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" BrowseInformation="1" WarningLevel="3" WarnAsError="true" DebugInformationFormat="3"/><Tool Name="VCManagedResourceCompilerTool"/><Tool Name="VCResourceCompilerTool"/><Tool Name="VCPreLinkEventTool"/><Tool Name="VCLinkerTool" AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="false" TargetMachine="1"/><Tool Name="VCALinkTool"/><Tool Name="VCManifestTool"/><Tool Name="VCXDCMakeTool"/><Tool Name="VCBscMakeTool"/><Tool Name="VCFxCopTool"/><Tool Name="VCAppVerifierTool"/><Tool Name="VCWebDeploymentTool"/><Tool Name="VCPostBuildEventTool"/></Configuration><Configuration Name="ReleaseDLL|x64" OutputDirectory="$(SolutionDir)bin/$(PlatformName)/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)" ConfigurationType="2" InheritedPropertySheets="$(SolutionDir)exiv2.vsprops" CharacterSet="2"><Tool Name="VCPreBuildEventTool"/><Tool Name="VCCustomBuildTool"/><Tool Name="VCXMLDataGeneratorTool"/><Tool Name="VCWebServiceProxyGeneratorTool"/><Tool Name="VCMIDLTool" TargetEnvironment="3"/><Tool Name="VCCLCompilerTool" Optimization="1" AdditionalIncludeDirectories="$(SolutionDir)../include;$(SolutionDir)../include/exiv2;$(SolutionDir)../xmpsdk/include;$(SolutionDir)../../expat/lib;$(SolutionDir)../../zlib;$(SolutionDir)/../../curl/include;$(SolutionDir)/../../libssh/include;$(SolutionDir)xssl/Win32/Release/include;" PreprocessorDefinitions="WIN32;_NDEBUG;EXV_HAVE_DLL;EXV_BUILDING_LIB" MinimalRebuild="true" BasicRuntimeChecks="0" RuntimeLibrary="2" BufferSecurityCheck="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" BrowseInformation="1" WarningLevel="3" WarnAsError="true" DebugInformationFormat="3"/><Tool Name="VCManagedResourceCompilerTool"/><Tool Name="VCResourceCompilerTool"/><Tool Name="VCPreLinkEventTool"/><Tool Name="VCLinkerTool" AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="false" ImportLibrary="$(TargetDir)$(TargetName).lib" TargetMachine="17"/><Tool Name="VCALinkTool"/><Tool Name="VCManifestTool"/><Tool Name="VCXDCMakeTool"/><Tool Name="VCBscMakeTool"/><Tool Name="VCFxCopTool"/><Tool Name="VCAppVerifierTool"/><Tool Name="VCWebDeploymentTool"/><Tool Name="VCPostBuildEventTool"/></Configuration></Configurations><References>    </References><Files><Filter Name="Source Files" Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"><File RelativePath="..\..\srcsfvideo.cpp">            </File><File RelativePath="..\..\srcasicio.cpp">            </File><File RelativePath="..\..\srcmpimage.cpp">            </File><File RelativePath="..\..\src
-- 
exiv2 packaging

