[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=3a3ca52

The following commit has been merged in the master branch:
commit 3a3ca52f99d05cc86c100c2589117a3ef3e1316a
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon Oct 8 17:30:22 2007 +0000

    Added Pentax Makernote tag doc, changed copyright.
---
 doc/templates/Makefile                                      | 13 ++++++++++---
 doc/templates/__index2__                                    |  1 +
 doc/templates/__makernotes__                                | 11 ++++++++++-
 doc/templates/makernote.html.in                             |  4 ++--
 doc/templates/{tags-olympus.html.in => tags-pentax.html.in} |  6 +++---
 samples/taglist.cpp                                         |  2 +-
 src/pentaxmn.cpp                                            |  4 ++--
 src/pentaxmn.hpp                                            | 13 ++++++++++++-
 8 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/doc/templates/Makefile b/doc/templates/Makefile
index 2da3962..2be91cf 100644
--- a/doc/templates/Makefile
+++ b/doc/templates/Makefile
@@ -45,9 +45,16 @@
 #  Only tested with GNU make.
 #
 
-TABLES = Exif Canon CanonCs CanonSi CanonCf CanonPi CanonPa Fujifilm Minolta \
-	 MinoltaCsNew MinoltaCs5D MinoltaCs7D Nikon1 Nikon2 Nikon3 Olympus \
-	 Panasonic Sigma Sony
+TABLES = Exif \
+         Canon CanonCs CanonSi CanonCf CanonPi CanonPa \
+         Fujifilm \
+         Minolta MinoltaCsNew MinoltaCs5D MinoltaCs7D \
+         Nikon1 Nikon2 Nikon3 \
+         Olympus \
+	 Panasonic \
+         Pentax \
+         Sigma \
+         Sony
 
 TAGLIST = ../../samples/taglist
 
diff --git a/doc/templates/__index2__ b/doc/templates/__index2__
index 767e63e..1a642af 100644
--- a/doc/templates/__index2__
+++ b/doc/templates/__index2__
@@ -7,6 +7,7 @@
     <li><a href="tags-nikon.html"><span>Nikon</span></a></li> 
     <li><a href="tags-olympus.html"><span>Olympus</span></a></li> 
     <li><a href="tags-panasonic.html"><span>Panasonic</span></a></li> 
+    <li><a href="tags-pentax.html"><span>Pentax</span></a></li> 
     <li><a href="tags-sigma.html"><span>Sigma/Foveon</span></a></li> 
     <li><a href="tags-sony.html"><span>Sony</span></a></li> 
     <li><a href="tags-iptc.html"><span>IPTC datasets</span></a></li>
diff --git a/doc/templates/__makernotes__ b/doc/templates/__makernotes__
index e1b5fed..2661952 100644
--- a/doc/templates/__makernotes__
+++ b/doc/templates/__makernotes__
@@ -125,6 +125,15 @@
     <td> </td>
    </tr>
    <tr class="EvenRow"> 
+    <td>PENTAX</td>
+    <td>IFD at offset 6</td>
+    <td>"AOC

-- 
exiv2 packaging