[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=755bb63

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

    Rename action: Use Exif.Image.DateTime if Exif.Photo.DateTimeOriginal is not present.
---
 src/actions.cpp | 13 +++++++++----
 src/exiv2.1     |  8 +++++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/actions.cpp b/src/actions.cpp
index 901fd36..bcea1b6 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -775,14 +775,19 @@ namespace Action {
         Exiv2::ExifKey key("Exif.Photo.DateTimeOriginal");
         Exiv2::ExifData::iterator md = exifData.findKey(key);
         if (md == exifData.end()) {
-            std::cerr << _("Metadatum with key") << " `" << key << "' "
-                      << _("not found in the file") << " " << path << "
";
+            key = Exiv2::ExifKey("Exif.Image.DateTime");
+            md = exifData.findKey(key);
+        }
+        if (md == exifData.end()) {
+            std::cerr << _("Neither tag") << " `Exif.Photo.DateTimeOriginal' "
+                      << _("nor") << " `Exif.Image.DateTime' "
+                      << _("found in the file") << " " << path << "
";
             return 1;
         }
         std::string v = md->toString();
         if (v.length() == 0 || v[0] == ' ') {
-            std::cerr << _("Image file creation timestamp not set in the file") << " "
-                      << path << "
";
+            std::cerr << _("Image file creation timestamp not set in the file")
+                      << " " << path << "
";
             return 1;
         }
         struct tm tm;
diff --git a/src/exiv2.1 b/src/exiv2.1
index a8838c5..cf22e17 100644
--- a/src/exiv2.1
+++ b/src/exiv2.1
@@ -3,7 +3,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH EXIV2 1 "February 25th, 2007"
+.TH EXIV2 1 "June 3rd, 2007"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -65,8 +65,10 @@ files. Requires option 
B\-c
P, 
B\-m
P or 
B\-M
P.
 .TP
 .B mv | rename
 Rename files and/or set file timestamps according to the Exif create
-timestamp. The filename format can be set with 
B\-r
P 
Ifmt
P,
-timestamp options are 
B\-t
P and 
B\-T
P.
+timestamp. Uses the value of tag Exif.Photo.DateTimeOriginal or, if
+not present, Exif.Image.DateTime to determine the timestamp. The
+filename format can be set with 
B\-r
P 
Ifmt
P, timestamp options
+are 
B\-t
P and 
B\-T
P.
 .TP
 .B fi | fixiso
 Copy the ISO setting from any of the proprietary Nikon makernote ISO

-- 
exiv2 packaging