[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:45:14 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=1216ce3
The following commit has been merged in the master branch:
commit 1216ce3b241a23d9437af9ab23fa0af44a37ff68
Author: asp <alan.pater at gmail.com>
Date: Thu Apr 30 14:41:00 2015 +0000
Website: script and templates integrating conversions table
---
website/Makefile | 5 +++-
website/bin/conversion.sh | 27 +++++++++++++++++++
website/convertToHTML.sh | 57 ---------------------------------------
website/master/conversion.html.in | 23 ++++++++++++++++
website/master/index.html.in | 5 ++--
5 files changed, 57 insertions(+), 60 deletions(-)
diff --git a/website/Makefile b/website/Makefile
index c46620f..ff3b8fe 100644
--- a/website/Makefile
+++ b/website/Makefile
@@ -144,7 +144,7 @@ html/rss.xml: master/news.xml
| awk '/pubDate/ { gsub("<[/]?pubDate>", ""); printf " <pubDate>"; system("bin/rssdate " $$0); printf "</pubDate>
"; next } /__lastBuildDate__/ { printf " <lastBuildDate>"; system("date -R"); printf " </lastBuildDate>
"; next; } {print}' > $@
# Run bin/release_info.sh to update release related variables (incl __version__)
-update: update-manpage update-intro update-sample update-changelog update-tags update-makernotes
+update: update-manpage update-intro update-sample update-conversion update-changelog update-tags update-makernotes
update-manpage:
@man -t exiv2 | ps2pdf - html/exiv2-manpage.pdf
@@ -162,6 +162,9 @@ update-intro:
update-sample:
@./bin/sample.sh
+update-conversion:
+ @./bin/conversion.sh
+
update-changelog:
@cp -f ../doc/ChangeLog var/__ChangeLog__
@bin/buglinks.sh var/__ChangeLog__
diff --git a/website/bin/conversion.sh b/website/bin/conversion.sh
new file mode 100644
index 0000000..60b9c99
--- /dev/null
+++ b/website/bin/conversion.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+##
+# conversion.sh
+# generate conversion.html by parsing src/convert.cpp
+# Thanks to Robin Mills for initial code
+##
+
+declare -a from=($(grep "mdExif,\|mdIptc," ../src/convert.cpp | cut '-d"' -f 2))
+declare -a to=($(grep "mdExif,\|mdIptc," ../src/convert.cpp | cut '-d"' -f 4))
+count=${#from[@]}
+
+index=0
+(
+
+ echo '<table class="ReportTable" cellspacing="0">'
+ echo '<tr><th>Between Exif tags or Iptc datasets</th><th>and XMP properties</th></tr>'
+ while [ $index -lt $count ]; do
+ printf '<tr><td>%s</td><td>%s</td></tr>
' "${from[index]}" "${to[index]}"
+ index=$((index+1))
+ done
+ echo '</table>'
+
+) > ../website/var/__conversion__
+
+# That's all Folks
+##
diff --git a/website/convertToHTML.sh b/website/convertToHTML.sh
deleted file mode 100755
index 5cd89cc..0000000
--- a/website/convertToHTML.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-##
-# convertToHTML.sh
-# generate convert.html by reading src/convert.cpp
-##
-
-declare -a from=($(grep mdExif, ../src/convert.cpp | cut '-d"' -f 2))
-declare -a to=($(grep mdExif, ../src/convert.cpp | cut '-d"' -f 4))
-count=${#from[@]}
-
-index=0
-(
- echo '<html><head><title>Exiv2 Convert Table</title></head>'
- echo '<style>'
- cat << STYLE
- body {
- font : 11px verdana, arial, helvetica, sans-serif;
- line-height : 12px;
- margin-left : 20px;
- margin-top : 20px;
- margin-bottom : 20px;
- color : blue;
- background-color : #44bbff;
- width : 850px;
- }
- th {
- font : 14px verdana, arial, helvetica, sans-serif;
- font-weight : bold;
- font-style : italic;
- line-height : 12px;
- color : black;
- background-color : white;
- text-align : left;
- }
-STYLE
- echo '</style>'
-
- echo '<body><img src="Exiv2Logo.png">'
- echo '<h1>Exiv2 Convert Table</h1>'
- echo '<p>Generated at: ' $(date) '</p>'
-
- echo '<table>'
- echo '<tr><th>From</th><th>To</th></tr>'
- while [ $index -lt $count ]; do
- printf '<tr><td>%s</td><td>%s</td></tr>
' "${from[index]}" "${to[index]}"
- index=$((index+1))
- done
- echo '</table>'
-
- echo '</body></html>'
-) > convert.html
-
-open convert.html
-
-# That's all Folks
-##
diff --git a/website/master/conversion.html.in b/website/master/conversion.html.in
new file mode 100644
index 0000000..cf75e88
--- /dev/null
+++ b/website/master/conversion.html.in
@@ -0,0 +1,23 @@
+__doctype__
+<html>
+__header2__
+<body>
+__sidebar1__
+
+<div id="content">
+__maintitle__
+<h2>Exiv2 Conversion Table</h2>
+<div>
+<p>Exiv2 maps and will convert Exif tags and IPTC Datasets to and from XMP properties.<br>
+This function is available via the import/export command line options: <a title="exiv2 manpage" href="manpage.html">exiv2 -eX image.jpg; exiv2 -iX image.jpg</a><br>
+and via the exiv2 API: <a title="convert.hpp File Reference" href="convert_8hpp.html">convert.hpp File Reference</a></p>
+</div>
+
+__conversion__
+
+__footer__
+</div>
+<!-- closes content -->
+
+</body>
+</html>
diff --git a/website/master/index.html.in b/website/master/index.html.in
index 29c5bc3..c013a85 100644
--- a/website/master/index.html.in
+++ b/website/master/index.html.in
@@ -35,7 +35,7 @@ Exiv2 is available as <a href="download.html#license">free software</a> and with
of an image
</li>
<li>an easy to use and <a href="doc/index.html" title="Exiv2 API documentation">extensively documented</a> API</li>
- <li>conversions of Exif and IPTC metadata to XMP and vice versa</li>
+ <li><a href="conversion.html" title="Exiv2 Conversions">conversions</a> of Exif and IPTC metadata to XMP and vice versa</li>
<li>a smart IPTC implementation that does not affect data that programs like Photoshop store
in the same image segment</li>
<li>Exif <a href="makernote.html" title="Exif Makernote Formats and Specifications">Makernote</a> support:
@@ -64,7 +64,8 @@ Exiv2 is available as <a href="download.html#license">free software</a> and with
<li>adjust the Exif timestamp (that's how it all started...)</li>
<li>rename Exif image files according to the Exif timestamp</li>
<li>extract, insert and delete Exif, IPTC and XMP metadata and JPEG comments</li>
- <li>extract previews from RAW images and thumbnails from the Exif metadata</li>
+ <li><a href="conversion.html" title="Exiv2 Conversions">convert</a> from Exif and IPTC to XMP properties and vice versa</li>
+ <li>extract previews from RAW images and thumbnails from the Exif metadata</li>
<li>insert and delete the thumbnail image embedded in the Exif metadata</li>
<li>print, set and delete the JPEG comment of JPEG images</li>
<li>fix the Exif ISO setting of picture taken with Canon and Nikon cameras</li>
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list