[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=6b353f3

The following commit has been merged in the master branch:
commit 6b353f3ff68c6bd633591380f5ac6f9347f3e62a
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Oct 3 13:26:52 2015 +0000

    #1111, #933: Added Casio makernote doc.
---
 doc/templates/Makefile            |  2 ++
 doc/templates/__index2__          |  1 +
 doc/templates/__makernotes__      | 25 +++++++++++++++++--------
 doc/templates/makernote.html.in   |  1 +
 doc/templates/tags-casio.html.in  | 32 ++++++++++++++++++++++++++++++++
 website/Makefile                  |  2 ++
 website/master/makernote.html.in  |  2 ++
 website/master/metadata.html.in   |  1 +
 website/master/tags-casio.html.in | 32 ++++++++++++++++++++++++++++++++
 9 files changed, 90 insertions(+), 8 deletions(-)

diff --git a/doc/templates/Makefile b/doc/templates/Makefile
index 66cc447..037a19d 100644
--- a/doc/templates/Makefile
+++ b/doc/templates/Makefile
@@ -54,6 +54,8 @@ TABLES = Exif \
          CanonFi \
          CanonPa \
          CanonPr \
+         Casio \
+         Casio2 \
          Fujifilm \
          Minolta \
          MinoltaCsNew \
diff --git a/doc/templates/__index2__ b/doc/templates/__index2__
index 3f63493..8e810e1 100644
--- a/doc/templates/__index2__
+++ b/doc/templates/__index2__
@@ -4,6 +4,7 @@
   </ul>
   <ul>
     <li><a href="tags-canon.html"><span>Canon</span></a></li> 
+    <li><a href="tags-casio.html"><span>Casio</span></a></li> 
     <li><a href="tags-fujifilm.html"><span>Fujifilm</span></a></li> 
     <li><a href="tags-minolta.html"><span>Minolta</span></a></li> 
     <li><a href="tags-nikon.html"><span>Nikon</span></a></li> 
diff --git a/doc/templates/__makernotes__ b/doc/templates/__makernotes__
index c79b4cf..d7ff1d3 100644
--- a/doc/templates/__makernotes__
+++ b/doc/templates/__makernotes__
@@ -20,7 +20,7 @@
    </tr>
   </thead>
   <tbody>
-   <tr> 
+   <tr>
     <td>Canon</td>
     <td>IFD</td>
     <td>None</td>
@@ -29,16 +29,25 @@
     <td><a href="#R2">[2]</a></td>
     <td>Some CR2 images have a non-zero next-IFD pointer</td>
    </tr>
-   <tr> 
-    <td>Casio</td>
+   <tr>
+    <td>CASIO</td>
     <td>IFD</td>
-    <td>-</td>
-    <td>-</td>
-    <td>-</td>
+    <td>None</td>
+    <td> </td>
+    <td> </td>
     <td><a href="#R4">[4]</a></td>
-    <td>Not supported by Exiv2 yet</td>
+    <td> </td>
    </tr>
-   <tr> 
+   <tr>
+    <td>CASIO</td>
+    <td>IFD, at offset 6</td>
+    <td>"QVC

-- 
exiv2 packaging