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

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:43:24 UTC 2017


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

The following commit has been merged in the master branch:
commit 14441afffd763f93138a51ebee9a95e2b1438336
Author: Robin Mills <robin at clanmills.com>
Date:   Sat Sep 15 02:50:40 2012 +0000

    See issue: 846 (http://dev.exiv2.org/issues/846).  MSVC support to build video code {asf|matroska|quicktime|riff}video.{hpp|cpp}
---
 msvc/exiv2lib/exiv2lib.vcproj   | 2 +-
 msvc64/exiv2lib/exiv2lib.vcproj | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/msvc/exiv2lib/exiv2lib.vcproj b/msvc/exiv2lib/exiv2lib.vcproj
index 0576049..1af73e8 100644
--- a/msvc/exiv2lib/exiv2lib.vcproj
+++ b/msvc/exiv2lib/exiv2lib.vcproj
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="Windows-1252"?><VisualStudioProject	ProjectType="Visual C++"	Version="7.10"	Name="exiv2lib"	ProjectGUID="{831EF580-92C8-4CA8-B0CE-3D906280A54D}"	RootNamespace="exiv2lib"	Keyword="Win32Proj"	TargetFrameworkVersion="131072"	>	<Platforms>		<Platform			Name="Win32"		/>	</Platforms>	<ToolFiles>	</ToolFiles>	<Configurations>		<Configuration			Name="Debug|Win32"			OutputDirectory="Debug"			IntermediateDirectory="Debug"			ConfigurationType="4"			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"			CharacterSet="2"			TargetName="exiv2sd"			>			<Tool				Name="VCPreBuildEventTool"				CommandLine="if exist ..\include\exiv2 goto :jail&#x0D;&#x0A;mkdir ..\include\exiv2\&#x0D;&#x0A;copy/y ..\..\src\*.h ..\include\exiv2\&#x0D;&#x0A;copy/y ..\..\src\*.hpp ..\include\exiv2\&#x0D;&#x0A;cd ..\include\exiv2&#x0D;&#x0A;del *_int.hpp&#x0D;&#x0A;cd ..\..\exiv2lib&#x0D;&#x0A;:jail&#x0D;&#x0A;"			/>			<Tool				Name="VCCustomBuildTool"			/>			<Tool				Name="VCXMLDataGeneratorTool"			/>			<Tool				Name="VCWebServiceProxyGeneratorTool"			/>			<Tool				Name="VCMIDLTool"			/>			<Tool				Name="VCCLCompilerTool"				Optimization="0"				AdditionalIncludeDirectories="../include;../include/exiv2;../../src;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"				PreprocessorDefinitions="WIN32;_DEBUG"				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"				OutputFile="$(OutDir)/exiv2sd.lib"				AdditionalLibraryDirectories="..\xmpsdk\Debug;..\..\..\expat-2.0.1\win32in\debug"			/>			<Tool				Name="VCALinkTool"			/>			<Tool				Name="VCXDCMakeTool"			/>			<Tool				Name="VCBscMakeTool"			/>			<Tool				Name="VCFxCopTool"			/>			<Tool				Name="VCPostBuildEventTool"				Description="create the bin (delivery) directory"				CommandLine="mkdir ..in\Debug\&#x0D;&#x0A;copy/y "$(TargetPath)" ..in\Debug\$(TargetFileName)&#x0D;&#x0A;"			/>		</Configuration>		<Configuration			Name="Release|Win32"			OutputDirectory="Release"			IntermediateDirectory="Release"			ConfigurationType="4"			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"			CharacterSet="2"			TargetName="exiv2s"			>			<Tool				Name="VCPreBuildEventTool"				Description="copy expat and zlib binaries"				CommandLine="if exist ..\include\exiv2 goto :jail&#x0D;&#x0A;mkdir ..\include\exiv2\&#x0D;&#x0A;copy/y ..\..\src\*.h ..\include\exiv2\&#x0D;&#x0A;copy/y ..\..\src\*.hpp ..\include\exiv2\&#x0D;&#x0A;cd ..\include\exiv2&#x0D;&#x0A;del *_int.hpp&#x0D;&#x0A;cd ..\..\exiv2lib&#x0D;&#x0A;:jail&#x0D;&#x0A;&#x0D;&#x0A;"			/>			<Tool				Name="VCCustomBuildTool"			/>			<Tool				Name="VCXMLDataGeneratorTool"			/>			<Tool				Name="VCWebServiceProxyGeneratorTool"			/>			<Tool				Name="VCMIDLTool"			/>			<Tool				Name="VCCLCompilerTool"				AdditionalIncludeDirectories="../include;../include/exiv2;../../src;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"				PreprocessorDefinitions="WIN32;_NDEBUG"				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"				OutputFile="$(OutDir)/exiv2s.lib"				AdditionalLibraryDirectories="..\xmpsdk\Release;..\..\..\expat-2.0.1\win32in
elease"			/>			<Tool				Name="VCALinkTool"			/>			<Tool				Name="VCXDCMakeTool"			/>			<Tool				Name="VCBscMakeTool"			/>			<Tool				Name="VCFxCopTool"			/>			<Tool				Name="VCPostBuildEventTool"				Description="create the bin (delivery) directory"				CommandLine="mkdir ..in\Release\&#x0D;&#x0A;copy/y "$(TargetPath)" ..in\$(ConfigurationName)\$(TargetFileName)&#x0D;&#x0A;&#x0D;&#x0A;"			/>		</Configuration>		<Configuration			Name="DebugDLL|Win32"			OutputDirectory="$(ConfigurationName)"			IntermediateDirectory="$(ConfigurationName)"			ConfigurationType="2"			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"			CharacterSet="2"			TargetName="exiv2d"			>			<Tool				Name="VCPreBuildEventTool"				Description="copy expat and zlib dlls"				CommandLine="if exist ..\include\exiv2 goto :jail&#x0D;&#x0A;mkdir ..\include\exiv2\&#x0D;&#x0A;copy/y ..\..\src\*.h ..\include\exiv2\&#x0D;&#x0A;copy/y ..\..\src\*.hpp ..\include\exiv2\&#x0D;&#x0A;cd ..\include\exiv2&#x0D;&#x0A;del *_int.hpp&#x0D;&#x0A;cd ..\..\exiv2lib&#x0D;&#x0A;:jail&#x0D;&#x0A;copy/y ..\..\..\expat-2.0.1\win32in\Debug\libexpat.dll $(OutDir)&#x0D;&#x0A;copy/y ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Debug\zlib1d.dll $(OutDir)&#x0D;&#x0A;"			/>			<Tool				Name="VCCustomBuildTool"			/>			<Tool				Name="VCXMLDataGeneratorTool"			/>			<Tool				Name="VCWebServiceProxyGeneratorTool"			/>			<Tool				Name="VCMIDLTool"			/>			<Tool				Name="VCCLCompilerTool"				Optimization="0"				AdditionalIncludeDirectories="../include;../include/exiv2;../../src;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"				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="false"				DebugInformationFormat="3"			/>			<Tool				Name="VCManagedResourceCompilerTool"			/>			<Tool				Name="VCResourceCompilerTool"			/>			<Tool				Name="VCPreLinkEventTool"			/>			<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"				OutputFile="$(OutDir)\exiv2d.dll"				GenerateDebugInformation="true"				RandomizedBaseAddress="1"				DataExecutionPrevention="0"				ImportLibrary="$(TargetDir)\exiv2d.lib"				TargetMachine="1"			/>			<Tool				Name="VCALinkTool"			/>			<Tool				Name="VCManifestTool"			/>			<Tool				Name="VCXDCMakeTool"			/>			<Tool				Name="VCBscMakeTool"			/>			<Tool				Name="VCFxCopTool"			/>			<Tool				Name="VCAppVerifierTool"			/>			<Tool				Name="VCPostBuildEventTool"				Description="create the bin (delivery) directorie"				CommandLine="mkdir "$(SolutionDir)in\DebugDLL\"&#x0D;&#x0A;copy/y ..\..\..\expat-2.0.1\win32in\Debug\libexpat.dll "$(SolutionDir)bin\$(ConfigurationName)"&#x0D;&#x0A;copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)\$(TargetFileName)"&#x0D;&#x0A;copy/y "$(TargetDir)\*.dll" "$(SolutionDir)in\$(ConfigurationName)\"&#x0D;&#x0A;copy/y "$(TargetDir)\*.lib" "$(SolutionDir)in\$(ConfigurationName)\"&#x0D;&#x0A;&#x0D;&#x0A;"			/>		</Configuration>		<Configuration			Name="ReleaseDLL|Win32"			OutputDirectory="$(ConfigurationName)"			IntermediateDirectory="$(ConfigurationName)"			ConfigurationType="2"			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"			CharacterSet="2"			TargetName="exiv2"			>			<Tool				Name="VCPreBuildEventTool"				Description="copy expat and zlib dlls"				CommandLine="if exist ..\include\exiv2 goto :jail&#x0D;&#x0A;mkdir ..\include\exiv2\&#x0D;&#x0A;copy/y ..\..\src\*.h ..\include\exiv2\&#x0D;&#x0A;copy/y ..\..\src\*.hpp ..\include\exiv2\&#x0D;&#x0A;cd ..\include\exiv2&#x0D;&#x0A;del *_int.hpp&#x0D;&#x0A;cd ..\..\exiv2lib&#x0D;&#x0A;:jail&#x0D;&#x0A;copy/y ..\..\..\expat-2.0.1\win32in\Release\*.dll $(OutDir)&#x0D;&#x0A;copy/y ..\..\..\zlib-1.2.3\projects
isualc6\Win32_DLL_Release\zlib1.dll $(OutDir)&#x0D;&#x0A;&#x0D;&#x0A;"			/>			<Tool				Name="VCCustomBuildTool"			/>			<Tool				Name="VCXMLDataGeneratorTool"			/>			<Tool				Name="VCWebServiceProxyGeneratorTool"			/>			<Tool				Name="VCMIDLTool"			/>			<Tool				Name="VCCLCompilerTool"				Optimization="1"				AdditionalIncludeDirectories="../include;../include/exiv2;../../src;../../xmpsdk/include;../../xmpsdk/src;../../../expat-2.0.1/lib;../../../zlib-1.2.3;"				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="false"				DebugInformationFormat="3"			/>			<Tool				Name="VCManagedResourceCompilerTool"			/>			<Tool				Name="VCResourceCompilerTool"			/>			<Tool				Name="VCPreLinkEventTool"			/>			<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"				OutputFile="$(OutDir)\exiv2.dll"				GenerateDebugInformation="false"				RandomizedBaseAddress="1"				DataExecutionPrevention="0"				ImportLibrary="$(TargetDir)\exiv2.lib"				TargetMachine="1"			/>			<Tool				Name="VCALinkTool"			/>			<Tool				Name="VCManifestTool"			/>			<Tool				Name="VCXDCMakeTool"			/>			<Tool				Name="VCBscMakeTool"			/>			<Tool				Name="VCFxCopTool"			/>			<Tool				Name="VCAppVerifierTool"			/>			<Tool				Name="VCPostBuildEventTool"				Description="create the bin (delivery) directory"				CommandLine="mkdir "$(SolutionDir)in\$(ConfigurationName)\"&#x0D;&#x0A;copy/y ..\..\..\expat-2.0.1\win32in\Release\libexpat.dll "$(SolutionDir)bin\$(ConfigurationName)"&#x0D;&#x0A;copy/y "$(TargetPath)" "$(SolutionDir)in\$(ConfigurationName)\$(TargetFileName)"&#x0D;&#x0A;copy/y "$(TargetDir)\*.dll" "$(SolutionDir)in\$(ConfigurationName)\"&#x0D;&#x0A;copy/y "$(TargetDir)\*.lib" "$(SolutionDir)in\$(ConfigurationName)\"&#x0D;&#x0A;"			/>		</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="..\..\srcasicio.cpp"				>			</File>			<File				RelativePath="..\..\srcmpimage.cpp"				>			</File>			<File				RelativePath="..\..\src
-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list