[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=90aa774

The following commit has been merged in the master branch:
commit 90aa774e41c5a271d342f98fb603978c6ede934f
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Jun 4 07:53:58 2005 +0000

    Minor doc updates
---
 README                          | 35 +++++++++++++++++++----------------
 doc/templates/iptc.xsl          |  5 +----
 doc/templates/tags-sony.html.in |  6 +++---
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/README b/README
index c1a3705..11da98d 100644
--- a/README
+++ b/README
@@ -4,13 +4,13 @@ Exiv2
 This is Exiv2, a C++ library and a command line utility to read and
 write Exif and Iptc image metadata.
 
-Exiv2's homepage is: 
+The homepage of Exiv2 is: 
 
     http://home.arcor.de/ahuggel/exiv2/index.html
 
-See the file doc/ChangeLog for a description of recent changes to Exiv2.
+See doc/ChangeLog for a description of recent changes to Exiv2.
 
-Point your internet browser to doc/index.html for the complete Exiv2
+Point your browser to doc/index.html for the complete Exiv2
 documentation.
 
 
@@ -18,25 +18,18 @@ Building and Installing
 =======================
 
 Exiv2 comes with a GNU configure script. Run the following commands
-from the top directory (containing this file) to build the library and
-utility:
+from the top directory (containing this file) to configure, build and
+install the library and utility:
 
     $ ./configure
     $ make
-
     $ make install
 
 The default install locations are /usr/local/lib for the library,
 /usr/local/bin for the exiv2 utility and /usr/local/include/exiv2 for
-the header files. The install command must be issued from an account
-with the necessary access rights.
-
-If you downloaded the software directly from the subversion
-repository, then you need to have GNU autoconf installed on your
-system and create the configure script as the first step:
-
-    $ make config
-
+the header files. Use the --prefix=directory option of the configure 
+script to change this default. Run ./configure --help to see a list
+of all options.
 
 To build Exiv2 with MSVC 7.1, use the solution file msvc/exiv2.sln.
 
@@ -46,7 +39,7 @@ 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 src/Makefile!
+modify any Makefile directly, in particular not src/Makefile!
 
 
 Uninstalling
@@ -76,3 +69,13 @@ 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
 of shared libraries can be turned off by specifying the
 --disable-shared option to the configure script.
+
+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
+the configure script as the first step:
+
+    $ make config
+
+To generate the documentation, you will further need python, doxygen, 
+graphviz and xsltproc. 
diff --git a/doc/templates/iptc.xsl b/doc/templates/iptc.xsl
index 8a0e599..290365c 100644
--- a/doc/templates/iptc.xsl
+++ b/doc/templates/iptc.xsl
@@ -42,7 +42,6 @@
     <col align="right" />
     <col />
     <col />
-    <col />
     <col align="center" />
     <col align="center" />
     <col align="right" />
@@ -56,7 +55,6 @@
   <tr>
     <th>Tag (hex)</th>
     <th>Tag (dec)</th>
-    <th>Record</th>
     <th>Key</th>
     <th>Type</th>
     <th><abbr title="Mandatory">M.</abbr></th>
@@ -87,7 +85,6 @@
   <tr><xsl:attribute name="class"><xsl:value-of select="$rowClass" /></xsl:attribute>
     <td><xsl:value-of select="taghex" /></td>
     <td><xsl:value-of select="tagdec" /></td>
-    <td><xsl:value-of select="recname" /></td>
     <td><xsl:value-of select="key" /></td>
     <td><xsl:value-of select="type" /></td>
     <td>
@@ -128,7 +125,7 @@
   //<![CDATA[
   var report1 = new SortableTable(
     document.getElementById("report1"),
-    ["String", "Number", "String", "String", "String", "String", "String", "Number", "Number", "String"]
+    ["String", "Number", "String", "String", "String", "String", "Number", "Number", "String"]
   );
   report1.onsort = function () { 
 	var rows = report1.tBody.rows;
diff --git a/doc/templates/tags-sony.html.in b/doc/templates/tags-sony.html.in
index 931af97..944e723 100644
--- a/doc/templates/tags-sony.html.in
+++ b/doc/templates/tags-sony.html.in
@@ -7,11 +7,11 @@ __header2__
 __index1__
 __index2__
 <h2>Sony MakerNote Tags defined in Exiv2</h2>
-<div>
-<p>Tags found in the MakerNote of images taken with Sony cameras.</p> 
+<p>Tags found in the MakerNote of images taken with Sony cameras. Not much is known about the contents of the Sony makernote tags. They appear to be chunks of binary data and I am not aware of any description of this information.</p> 
 <p>Click on a column header to sort the table.</p>
-</div>
+
 __Sony__
+
 </div>
 <!-- closes content -->
 

-- 
exiv2 packaging