[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=277edf2

The following commit has been merged in the master branch:
commit 277edf23fb90bec296e0e14da3802dda6456e67a
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Sep 25 12:54:34 2005 +0000

    Added imgreg.cpp to the MSVC build and did some cosmetic changes in the README
---
 README                        | 19 +++++++++++--------
 msvc/exiv2lib/exiv2lib.vcproj | 15 +++++++++++++++
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/README b/README
index 61ab493..18c76c9 100644
--- a/README
+++ b/README
@@ -17,9 +17,10 @@ documentation and metadata tags.
 Building and Installing
 =======================
 
-Exiv2 comes with a GNU configure script and uses GNU Libtool. Run the
-following commands from the top directory (containing this file) to
-configure, build and install the library and utility:
+To build Exiv2 on UNIX-like systems (e.g., GNU/Linux, Mac OS X, MinGW),
+use the included GNU configure script. Run the following commands from 
+the top directory (containing this file) to configure, build and 
+install the library and utility:
 
     $ ./configure
     $ make
@@ -37,9 +38,9 @@ To build Exiv2 with MSVC 7.1, use the solution file msvc/exiv2.sln.
 Troubleshooting
 ===============
 
-If you have problems building Exiv2, check the generated
-config/config.mk and config/config.h files. You should *not* need to
-modify any Makefile directly, in particular not src/Makefile!
+If you have problems building Exiv2 on UNIX-like systems, check the
+generated config/config.mk and config/config.h files. You should *not*
+need to modify any Makefile directly, in particular not src/Makefile!
 
 
 Uninstalling
@@ -66,12 +67,14 @@ Developing with Exiv2
 
 If you downloaded the software directly from the subversion
 repository, and you want to build it using the GNU configure script,
-then you need to have GNU autoconf installed on your system and create
+then you need to have GNU Autoconf installed on your system and create
 the configure script as the first step:
 
     $ make config
 
-To generate the documentation ($ make doc), you will further need
+Then run the usual ./configure; make; make install commands.
+
+To generate the documentation (make doc), you will further need
 python, doxygen, graphviz and xsltproc.
 
 Exiv2 uses GNU Libtool in order to build shared libraries on a variety
diff --git a/msvc/exiv2lib/exiv2lib.vcproj b/msvc/exiv2lib/exiv2lib.vcproj
index 48d3212..3f7f8f4 100644
--- a/msvc/exiv2lib/exiv2lib.vcproj
+++ b/msvc/exiv2lib/exiv2lib.vcproj
@@ -233,6 +233,21 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="..\..\src\imgreg.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\iptc.cpp">
 			</File>
 			<File

-- 
exiv2 packaging