[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=ead330e

The following commit has been merged in the master branch:
commit ead330e889e8da4617db04d3fce8e119ead7c50c
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Oct 21 09:16:47 2007 +0000

    Minor changes.
---
 README     | 29 ++++++++++++++++++++---------
 README-XMP |  4 ++--
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/README b/README
index 6f5765e..67dcf9d 100644
--- a/README
+++ b/README
@@ -8,8 +8,9 @@ write Exif, IPTC and XMP image metadata. The homepage of Exiv2 is:
 
 See doc/ChangeLog for a list of recent changes to Exiv2.
 
-If you have the doc package, you can point your browser to doc/index.html 
-for the complete Exiv2 API documentation and metadata tag reference.
+After installing or building the documentation, you can point your
+browser to doc/index.html for the complete Exiv2 API documentation and
+metadata tag reference.
 
 
 Building and Installing
@@ -46,9 +47,9 @@ To build a commercial version of the Exiv2 library, see also section
 Dependencies
 ============
 
-The following features are enabled by default and may *) require external
-libraries. They can be controlled through configure options. See also
-'./configure --help'.
+The following libexiv2 features are enabled by default and may*)
+require external libraries. They can be controlled through configure
+options. See also './configure --help'.
 
 Feature                     Package   Configure options
 --------------------------  --------  ----------------------------
@@ -68,6 +69,18 @@ expat        http://expat.sourceforge.net/
 *) Some systems have gettext and iconv in libc. The configure script 
 should detect this.
 
+To build the sample programs in the samples/ directory ('make samples'),
+you also need to have the pkg-config program.
+
+To generate the documentation ('make doc'), you will further need
+doxygen, graphviz, python and xsltproc.
+
+pkg-config   http://pkg-config.freedesktop.org/wiki/
+doxygen      http://www.doxygen.org/
+graphviz     http://www.graphviz.org/
+python       http://www.python.org/
+xsltproc     http://xmlsoft.org/XSLT/
+
 
 Troubleshooting
 ===============
@@ -94,7 +107,8 @@ Hacking
 
 A pkg-config .pc file is installed together with the library.
 Application developers can use pkg-config(1) to obtain correct compile
-and link time flags for the Exiv2 library.
+and link time flags for the Exiv2 library. See samples/Makefile for an
+example.
 
 If you downloaded Exiv2 directly from the subversion repository, and
 you want to build it using the GNU configure script, then you need to
@@ -105,9 +119,6 @@ script as the first step:
 
 Then run the usual './configure; make; make install' commands.
 
-To generate the documentation (run 'make doc'), you will further need
-doxygen, graphviz, python and xsltproc.
-
 Exiv2 uses GNU Libtool in order to build shared libraries on a variety
 of systems. While this is very nice for making usable binaries, it can
 be a pain when trying to debug a program. For that reason, compilation
diff --git a/README-XMP b/README-XMP
index 1fc259d..117d6e6 100644
--- a/README-XMP
+++ b/README-XMP
@@ -16,7 +16,7 @@ XMP Toolkit
 Exiv2 uses the XMPCore component of the Adobe XMP Toolkit (XMP SDK) to
 parse and serialize XMP packets. Temporarily, it is integrated and
 distributed with Exiv2. The xmpsdk/ directory of the Exiv2 distribution
-contains the XMP SDK source code. The final solution will eventually
+contains the XMP SDK source code. The final solution should eventually
 use an external XMP Toolkit.
 
 Building the XMP Toolkit is transparent. Following the installation
@@ -24,7 +24,7 @@ steps described in the main README file will ensure that the XMP
 Toolkit is compiled if necessary. It is only needed if XMP support is
 enabled. Building the XMP Toolkit results in a "convenience library"
 in xmpsdk/src/. This library is only used to link the Exiv2 library 
-with.
+with; it is not installed.
 
 If you experience problems building this library, please email to the
 Exiv2 support forum for help, see http://www.exiv2.org/support.html

-- 
exiv2 packaging