[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=aa24ca4

The following commit has been merged in the master branch:
commit aa24ca4ae9e7f61c7215207173a802b02f88eb81
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Dec 2 14:26:49 2009 +0000

    Inverted the meaning of -u. Bad bad bad...
---
 src/exiv2.1   | 2 +-
 src/exiv2.cpp | 4 ++--
 src/exiv2.hpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/exiv2.1 b/src/exiv2.1
index b06a21d..a1275dd 100644
--- a/src/exiv2.1
+++ b/src/exiv2.1
@@ -124,7 +124,7 @@ Be verbose during the program run.
 Show large binary values (default is to suppress them).
 .TP
 .B \-u
-Don't show unknown tags.
+Show unknown tags (default is to suppress tags which don't have a name).
 .TP
 .B \-k
 Preserve file timestamps when updating files (keep). Can be used with
diff --git a/src/exiv2.cpp b/src/exiv2.cpp
index 76d6205..bc0fe7b 100644
--- a/src/exiv2.cpp
+++ b/src/exiv2.cpp
@@ -249,7 +249,7 @@ void Params::help(std::ostream& os) const
        << _("   -V      Show the program version and exit.
")
        << _("   -v      Be verbose during the program run.
")
        << _("   -b      Show large binary values.
")
-       << _("   -u      Don't show unknown tags.
")
+       << _("   -u      Show unknown tags.
")
        << _("   -k      Preserve file timestamps (keep).
")
        << _("   -t      Also set the file timestamp in 'rename' action (overrides -k).
")
        << _("   -T      Only set the file timestamp in 'rename' action, do not rename
"
@@ -328,7 +328,7 @@ int Params::option(int opt, const std::string& optarg, int optopt)
     case 'v': verbose_ = true; break;
     case 'k': preserve_ = true; break;
     case 'b': binary_ = false; break;
-    case 'u': unknown_ = true; break;
+    case 'u': unknown_ = false; break;
     case 'f': force_ = true; fileExistsPolicy_ = overwritePolicy; break;
     case 'F': force_ = true; fileExistsPolicy_ = renamePolicy; break;
     case 'r': rc = evalRename(opt, optarg); break;
diff --git a/src/exiv2.hpp b/src/exiv2.hpp
index 25ca837..951147e 100644
--- a/src/exiv2.hpp
+++ b/src/exiv2.hpp
@@ -222,7 +222,7 @@ private:
                verbose_(false),
                force_(false),
                binary_(true),
-               unknown_(false),
+               unknown_(true),
                preserve_(false),
                timestamp_(false),
                timestampOnly_(false),

-- 
exiv2 packaging