[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=24cee62

The following commit has been merged in the master branch:
commit 24cee62ad4de6411f0fc7350e80223f1dc176cd3
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Sep 5 07:07:14 2004 +0000

    Updated according to patch from Brad Schick
---
 msvc/exiv2.sln                | 18 ++++++++++++++++++
 msvc/exiv2lib/exiv2lib.vcproj | 24 ++++++++++++------------
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/msvc/exiv2.sln b/msvc/exiv2.sln
index 905c7b8..4660b7c 100644
--- a/msvc/exiv2.sln
+++ b/msvc/exiv2.sln
@@ -48,6 +48,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makernote-test", "makernote
 		{831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iptcprint", "iptcprint\iptcprint.vcproj", "{52034F65-28AA-4E3F-A44D-C91F6F0922F8}"
+	ProjectSection(ProjectDependencies) = postProject
+		{831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iptctest", "iptctest\iptctest.vcproj", "{C8F41CDA-76AA-4053-A8DE-F80892C1C2FC}"
+	ProjectSection(ProjectDependencies) = postProject
+		{831EF580-92C8-4CA8-B0CE-3D906280A54D} = {831EF580-92C8-4CA8-B0CE-3D906280A54D}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
@@ -94,6 +104,14 @@ Global
 		{AB0BA03E-2B09-4DCE-966F-3F5CCA01355C}.Debug.Build.0 = Debug|Win32
 		{AB0BA03E-2B09-4DCE-966F-3F5CCA01355C}.Release.ActiveCfg = Release|Win32
 		{AB0BA03E-2B09-4DCE-966F-3F5CCA01355C}.Release.Build.0 = Release|Win32
+		{52034F65-28AA-4E3F-A44D-C91F6F0922F8}.Debug.ActiveCfg = Debug|Win32
+		{52034F65-28AA-4E3F-A44D-C91F6F0922F8}.Debug.Build.0 = Debug|Win32
+		{52034F65-28AA-4E3F-A44D-C91F6F0922F8}.Release.ActiveCfg = Release|Win32
+		{52034F65-28AA-4E3F-A44D-C91F6F0922F8}.Release.Build.0 = Release|Win32
+		{C8F41CDA-76AA-4053-A8DE-F80892C1C2FC}.Debug.ActiveCfg = Debug|Win32
+		{C8F41CDA-76AA-4053-A8DE-F80892C1C2FC}.Debug.Build.0 = Debug|Win32
+		{C8F41CDA-76AA-4053-A8DE-F80892C1C2FC}.Release.ActiveCfg = Release|Win32
+		{C8F41CDA-76AA-4053-A8DE-F80892C1C2FC}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/msvc/exiv2lib/exiv2lib.vcproj b/msvc/exiv2lib/exiv2lib.vcproj
index 1f5873e..95c55bd 100644
--- a/msvc/exiv2lib/exiv2lib.vcproj
+++ b/msvc/exiv2lib/exiv2lib.vcproj
@@ -123,18 +123,6 @@
 			</File>
 			<File
 				RelativePath="..\..\src\datasets.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\src\exif.cpp">
@@ -197,6 +185,9 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="..\..\src\iptc.cpp">
+			</File>
+			<File
 				RelativePath="..\..\src\makernote.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
@@ -212,6 +203,9 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="..\..\src\metadatum.cpp">
+			</File>
+			<File
 				RelativePath="..\..\src\mn.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
@@ -319,9 +313,15 @@
 				RelativePath="..\..\src\image.hpp">
 			</File>
 			<File
+				RelativePath="..\..\src\iptc.hpp">
+			</File>
+			<File
 				RelativePath="..\..\src\makernote.hpp">
 			</File>
 			<File
+				RelativePath="..\..\src\metadatum.hpp">
+			</File>
+			<File
 				RelativePath="..\..\src
ikonmn.hpp">
 			</File>
 			<File

-- 
exiv2 packaging