[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=08c2c50

The following commit has been merged in the master branch:
commit 08c2c50448ef2ed77b8c60f2089ef7e2ca69b9cc
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Thu Nov 1 02:47:04 2007 +0000

    Partially updated MSVC project (samples and XMP don't compile).
---
 Makefile                                  |  2 +-
 msvc/addmoddel/addmoddel.vcproj           |  2 +-
 msvc/crwparse/crwparse.vcproj             |  2 +-
 msvc/exifcomment/exifcomment.vcproj       |  2 +-
 msvc/exifdata-test/exifdata-test.vcproj   |  2 +-
 msvc/exifprint/exifprint.vcproj           |  2 +-
 msvc/exiv2lib/exiv2lib.vcproj             |  6 ++++++
 msvc/ifd-test/ifd-test.vcproj             |  2 +-
 msvc/iotest/iotest.vcproj                 |  2 +-
 msvc/iptceasy/iptceasy.vcproj             |  2 +-
 msvc/iptcprint/iptcprint.vcproj           |  2 +-
 msvc/iptctest/iptctest.vcproj             |  2 +-
 msvc/largeiptc-test/largeiptc-test.vcproj |  2 +-
 msvc/makernote-test/makernote-test.vcproj |  2 +-
 msvc/write-test/write-test.vcproj         |  2 +-
 msvc/write2-test/write2-test.vcproj       |  2 +-
 src/taglist.cpp                           |  2 +-
 src/xmp.cpp                               | 17 ++++++++++-------
 18 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/Makefile b/Makefile
index bd84f22..a6f7e58 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@
 ########################################################################
 
 SHELL = /bin/sh
-ENABLE_XMP = 1
+ENABLE_XMP = 
 
 .PHONY: all doc config samples xmpsdk                \
         mostlyclean clean distclean maintainer-clean \
diff --git a/msvc/addmoddel/addmoddel.vcproj b/msvc/addmoddel/addmoddel.vcproj
index 40a920f..a1f22d1 100644
--- a/msvc/addmoddel/addmoddel.vcproj
+++ b/msvc/addmoddel/addmoddel.vcproj
@@ -124,7 +124,7 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath="..\..\srcddmoddel.cpp">
+				RelativePath="..\..\samplesddmoddel.cpp">
 			</File>
 		</Filter>
 		<Filter
diff --git a/msvc/crwparse/crwparse.vcproj b/msvc/crwparse/crwparse.vcproj
index 5dc828b..07646e7 100644
--- a/msvc/crwparse/crwparse.vcproj
+++ b/msvc/crwparse/crwparse.vcproj
@@ -114,7 +114,7 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath="..\..\src
-- 
exiv2 packaging