[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=2c36463

The following commit has been merged in the master branch:
commit 2c36463574a015dc1de8261c09f62585010b6f03
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Jun 4 02:15:24 2008 +0000

    Added strinto-test project to MSVC build.
---
 msvc/exiv2.sln                                        | 10 +++++++++-
 .../stringto-test.vcproj}                             | 19 +++++++++----------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/msvc/exiv2.sln b/msvc/exiv2.sln
index ebafaf9..cba7ce5 100644
--- a/msvc/exiv2.sln
+++ b/msvc/exiv2.sln
@@ -114,7 +114,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmpsample", "xmpsample\xmps
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmpparse", "xmpparse\xmpparse.vcproj", "{948E8E86-7F47-46B0-95B2-ED24805F3CAF}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
@@ -123,6 +122,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmpparser-test", "xmpparser
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stringto-test", "stringto-test\stringto-test.vcproj", "{156423D3-5FBB-45C6-A7CA-675B32F45C15}"
+	ProjectSection(ProjectDependencies) = postProject
+		{831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
@@ -231,6 +235,10 @@ Global
 		{948E8E86-7F47-46B0-95B2-ED24805F3CBF}.Debug.Build.0 = Debug|Win32
 		{948E8E86-7F47-46B0-95B2-ED24805F3CBF}.Release.ActiveCfg = Release|Win32
 		{948E8E86-7F47-46B0-95B2-ED24805F3CBF}.Release.Build.0 = Release|Win32
+		{156423D3-5FBB-45C6-A7CA-675B32F45C15}.Debug.ActiveCfg = Debug|Win32
+		{156423D3-5FBB-45C6-A7CA-675B32F45C15}.Debug.Build.0 = Debug|Win32
+		{156423D3-5FBB-45C6-A7CA-675B32F45C15}.Release.ActiveCfg = Release|Win32
+		{156423D3-5FBB-45C6-A7CA-675B32F45C15}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/msvc/xmpsample/xmpsample.vcproj b/msvc/stringto-test/stringto-test.vcproj
similarity index 86%
copy from msvc/xmpsample/xmpsample.vcproj
copy to msvc/stringto-test/stringto-test.vcproj
index e497d1e..5f132ff 100644
--- a/msvc/xmpsample/xmpsample.vcproj
+++ b/msvc/stringto-test/stringto-test.vcproj
@@ -2,8 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="7.10"
-	Name="xmpsample"
-	ProjectGUID="{948E8E86-7F47-46B0-95B2-ED24805F3C9F}"
+	Name="stringto-test"
+	ProjectGUID="{156423D3-5FBB-45C6-A7CA-675B32F45C15}"
+	RootNamespace="stringto-test"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -20,7 +21,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=""..\include";"..\..""
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BUILD_GETOPT"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="5"
@@ -28,7 +29,6 @@
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="0"
 				BrowseInformation="1"
-				BrowseInformationFile="$(IntDir)/"
 				WarningLevel="3"
 				WarnAsError="TRUE"
 				Detect64BitPortabilityProblems="TRUE"
@@ -38,18 +38,17 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="..\exiv2lib\Debug\exiv2.lib"
-				OutputFile="$(OutDir)/xmpsample.exe"
+				OutputFile="$(OutDir)/stringto-test.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/xmpsample.pdb"
+				ProgramDatabaseFile="$(OutDir)/stringto-test.pdb"
 				SubSystem="1"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy /y $(TargetPath) $(SolutionDir)in\$(TargetFileName)
-"/>
+				CommandLine="copy /y $(TargetPath) $(SolutionDir)in\$(TargetFileName)"/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
@@ -85,7 +84,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/xmpsample.exe"
+				OutputFile="$(OutDir)/stringto-test.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
@@ -122,7 +121,7 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath="..\..\samples\xmpsample.cpp">
+				RelativePath="..\..\samples\stringto-test.cpp">
 			</File>
 		</Filter>
 		<Filter

-- 
exiv2 packaging