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

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:42:09 UTC 2017


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

The following commit has been merged in the master branch:
commit 474c487d15beb194a981c49387f1401f1cd3a4c7
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Dec 21 06:49:12 2010 +0000

    msvc64: more fixes.  Created the zlib125 directory (for consistency with zlib123)
---
 msvc64/exiv2.sln                     | 10 ---------
 msvc64/exiv2/exiv2.vcproj            | 41 +++++++++++++++++++++---------------
 msvc64/{zlib => zlib125}/zlib.vcproj |  0
 3 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/msvc64/exiv2.sln b/msvc64/exiv2.sln
index c4ad25e..0cf5ee7 100644
--- a/msvc64/exiv2.sln
+++ b/msvc64/exiv2.sln
@@ -1,20 +1,10 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exiv2lib", "exiv2lib\exiv2lib.vcproj", "{831EF580-92C8-4CA8-B0CE-3D906280A54D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{09877CF4-83B6-44FE-A2E2-629AA5C8093E} = {09877CF4-83B6-44FE-A2E2-629AA5C8093E}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exiv2", "exiv2\exiv2.vcproj", "{07293CAC-00DA-493E-90C9-5D010C2B1B53}"
-	ProjectSection(ProjectDependencies) = postProject
-		{831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmpsdk", "xmpsdk\xmpsdk.vcproj", "{09877CF4-83B6-44FE-A2E2-629AA5C8093E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8308C68D-E12B-4C71-96F4-7137F6BEB654} = {8308C68D-E12B-4C71-96F4-7137F6BEB654}
-		{6C4C06A3-6F8F-4067-AA4C-D5F41E1FFF9A} = {6C4C06A3-6F8F-4067-AA4C-D5F41E1FFF9A}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "expat", "expat\expat.vcproj", "{6C4C06A3-6F8F-4067-AA4C-D5F41E1FFF9A}"
 EndProject
diff --git a/msvc64/exiv2/exiv2.vcproj b/msvc64/exiv2/exiv2.vcproj
index da7adf3..b7479f9 100644
--- a/msvc64/exiv2/exiv2.vcproj
+++ b/msvc64/exiv2/exiv2.vcproj
@@ -6,7 +6,6 @@
 	ProjectGUID="{07293CAC-00DA-493E-90C9-5D010C2B1B53}"
 	RootNamespace="exiv2"
 	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -77,8 +76,6 @@
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/exiv2.pdb"
 				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -100,6 +97,9 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
 				Name="VCPostBuildEventTool"
 				Description="copy target to bin"
 				CommandLine="setlocal&#x0D;&#x0A;set X=$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)\&#x0D;&#x0A;if NOT EXIST "%X%" mkdir "%X%"&#x0D;&#x0A;copy/y "$(TargetPath)" "%X%"&#x0D;&#x0A;&#x0D;&#x0A;"
@@ -164,8 +164,6 @@
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/exiv2.pdb"
 				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -187,6 +185,9 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
 				Name="VCPostBuildEventTool"
 				Description="copy target to bin"
 				CommandLine="setlocal&#x0D;&#x0A;set X=$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)\&#x0D;&#x0A;if NOT EXIST "%X%" mkdir "%X%"&#x0D;&#x0A;copy/y "$(TargetPath)" "%X%"&#x0D;&#x0A;&#x0D;&#x0A;"
@@ -247,8 +248,6 @@
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -270,6 +269,9 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
 				Name="VCPostBuildEventTool"
 				Description="copy target to bin"
 				CommandLine="setlocal&#x0D;&#x0A;set X=$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)\&#x0D;&#x0A;if NOT EXIST "%X%" mkdir "%X%"&#x0D;&#x0A;copy/y "$(TargetPath)" "%X%"&#x0D;&#x0A;&#x0D;&#x0A;"
@@ -331,8 +333,6 @@
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -354,6 +354,9 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
 				Name="VCPostBuildEventTool"
 				Description="copy target to bin"
 				CommandLine="setlocal&#x0D;&#x0A;set X=$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)\&#x0D;&#x0A;if NOT EXIST "%X%" mkdir "%X%"&#x0D;&#x0A;copy/y "$(TargetPath)" "%X%"&#x0D;&#x0A;&#x0D;&#x0A;"
@@ -419,8 +422,6 @@
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/exiv2.pdb"
 				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -442,6 +443,9 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
 				Name="VCPostBuildEventTool"
 				Description="copy target to bin"
 				CommandLine="setlocal&#x0D;&#x0A;set X=$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)\&#x0D;&#x0A;if NOT EXIST "%X%" mkdir "%X%"&#x0D;&#x0A;copy/y "$(TargetPath)" "%X%"&#x0D;&#x0A;copy/y "$(SolutionDir)exiv2lib\$(PlatformName)\$(ConfigurationName)\*.dll"  "%X%"&#x0D;&#x0A;&#x0D;&#x0A;&#x0D;&#x0A;&#x0D;&#x0A;"
@@ -509,8 +513,6 @@
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/exiv2.pdb"
 				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -532,6 +534,9 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
 				Name="VCPostBuildEventTool"
 				Description="copy target to bin"
 				CommandLine="setlocal&#x0D;&#x0A;set X=$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)\&#x0D;&#x0A;if NOT EXIST "%X%" mkdir "%X%"&#x0D;&#x0A;copy/y "$(TargetPath)" "%X%"&#x0D;&#x0A;copy/y "$(SolutionDir)exiv2lib\$(PlatformName)\$(ConfigurationName)\*.dll"  "%X%"&#x0D;&#x0A;&#x0D;&#x0A;&#x0D;&#x0A;&#x0D;&#x0A;"
@@ -597,8 +602,6 @@
 				GenerateDebugInformation="false"
 				ProgramDatabaseFile="$(OutDir)/exiv2.pdb"
 				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -620,6 +623,9 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
 				Name="VCPostBuildEventTool"
 				Description="copy target to bin"
 				CommandLine="setlocal&#x0D;&#x0A;set X=$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)\&#x0D;&#x0A;if NOT EXIST "%X%" mkdir "%X%"&#x0D;&#x0A;copy/y "$(TargetPath)" "%X%"&#x0D;&#x0A;copy/y "$(SolutionDir)exiv2lib\$(PlatformName)\$(ConfigurationName)\*.dll"  "%X%"&#x0D;&#x0A;&#x0D;&#x0A;&#x0D;&#x0A;&#x0D;&#x0A;"
@@ -686,8 +692,6 @@
 				GenerateDebugInformation="false"
 				ProgramDatabaseFile="$(OutDir)/exiv2.pdb"
 				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -709,6 +713,9 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
 				Name="VCPostBuildEventTool"
 				Description="copy target to bin"
 				CommandLine="setlocal&#x0D;&#x0A;set X=$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)\&#x0D;&#x0A;if NOT EXIST "%X%" mkdir "%X%"&#x0D;&#x0A;copy/y "$(TargetPath)" "%X%"&#x0D;&#x0A;copy/y "$(SolutionDir)exiv2lib\$(PlatformName)\$(ConfigurationName)\*.dll"  "%X%"&#x0D;&#x0A;&#x0D;&#x0A;&#x0D;&#x0A;&#x0D;&#x0A;"
diff --git a/msvc64/zlib/zlib.vcproj b/msvc64/zlib125/zlib.vcproj
similarity index 100%
copy from msvc64/zlib/zlib.vcproj
copy to msvc64/zlib125/zlib.vcproj

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list