[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=10a1b24

The following commit has been merged in the master branch:
commit 10a1b24398140831a0f1c71716312690cd34c1df
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Sep 25 10:23:50 2005 +0000

    Changed -s option to -S and included the "." in the suffix (similar to the -S option of gzip)
---
 src/actions.cpp          | 4 ++--
 src/exiv2.cpp            | 7 ++++---
 src/exiv2.hpp            | 2 +-
 test/data/exiv2-test.out | 3 ++-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/actions.cpp b/src/actions.cpp
index 535e507..ccc18c8 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -962,9 +962,9 @@ namespace Action {
             std::string directory = Params::instance().directory_;
             if (directory.empty()) directory = Util::dirname(path);
             std::string suffix = Params::instance().suffix_;
-            if (suffix.empty()) suffix = "exv";
+            if (suffix.empty()) suffix = ".exv";
             std::string exvPath =   directory + EXV_SEPERATOR_STR
-                                  + Util::basename(path, true) + "." + suffix;
+                                  + Util::basename(path, true) + suffix;
             rc = metacopy(exvPath, path, true);
         }
         return rc;
diff --git a/src/exiv2.cpp b/src/exiv2.cpp
index 47df8f6..458ef6f 100644
--- a/src/exiv2.cpp
+++ b/src/exiv2.cpp
@@ -192,6 +192,7 @@ void Params::help(std::ostream& os) const
        << "  pr | print    Print image metadata.
"
        << "  rm | delete   Delete image metadata from the files.
"
        << "  in | insert   Insert metadata from corresponding *.exv files.
"
+       << "                Use option -S to change the suffix of the input files.
"
        << "  ex | extract  Extract metadata to *.exv and thumbnail image files.
"
        << "  mv | rename   Rename files according to the Exif create timestamp.
"
        << "                The filename format can be set with -r format.
"
@@ -231,7 +232,7 @@ void Params::help(std::ostream& os) const
        << "   -M cmd  Command line for the modify action. The format for the
"
        << "           commands is the same as that of the lines of a command file.
"
        << "   -l dir  Location (directory) for files to be inserted from or extracted to.
"
-       << "   -s ext  Suffix of the files to be inserted from.

";
+       << "   -S .suf Use suffix .suf for source files for insert command.

";
 } // Params::help
 
 int Params::option(int opt, const std::string& optarg, int optopt)
@@ -252,7 +253,7 @@ int Params::option(int opt, const std::string& optarg, int optopt)
     case 'm': rc = evalModify(opt, optarg); break;
     case 'M': rc = evalModify(opt, optarg); break;
     case 'l': directory_ = optarg; break;
-    case 's': suffix_ = optarg; break;
+    case 'S': suffix_ = optarg; break;
     case ':':
         std::cerr << progname() << ": Option -" << static_cast<char>(optopt) 
                   << " requires an argument
";
@@ -582,7 +583,7 @@ int Params::getopt(int argc, char* const argv[])
     }
     if (!suffix_.empty() && !(action_ == Action::insert)) {
         std::cerr << progname() 
-                  << ": -s option can only be used with insert action
";
+                  << ": -S option can only be used with insert action
";
         rc = 1;
     }
     return rc;
diff --git a/src/exiv2.hpp b/src/exiv2.hpp
index 836ec21..2702946 100644
--- a/src/exiv2.hpp
+++ b/src/exiv2.hpp
@@ -155,7 +155,7 @@ private:
       @brief Default constructor. Note that optstring_ is initialized here.
              The c'tor is private to force instantiation through instance().
      */
-    Params() : optstring_(":hVvfFa:r:p:d:e:i:m:M:l:s:"),
+    Params() : optstring_(":hVvfFa:r:p:d:e:i:m:M:l:S:"),
                help_(false), 
                version_(false),
                verbose_(false), 
diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out
index 1f07cb8..46225ce 100644
--- a/test/data/exiv2-test.out
+++ b/test/data/exiv2-test.out
@@ -19,6 +19,7 @@ Actions:
   pr | print    Print image metadata.
   rm | delete   Delete image metadata from the files.
   in | insert   Insert metadata from corresponding *.exv files.
+                Use option -S to change the suffix of the input files.
   ex | extract  Extract metadata to *.exv and thumbnail image files.
   mv | rename   Rename files according to the Exif create timestamp.
                 The filename format can be set with -r format.
@@ -58,7 +59,7 @@ Options:
    -M cmd  Command line for the modify action. The format for the
            commands is the same as that of the lines of a command file.
    -l dir  Location (directory) for files to be inserted from or extracted to.
-   -s ext  Suffix of the files to be inserted from.
+   -S .suf Use suffix .suf for source files for insert command.
 
 
 Adjust -------------------------------------------------------------------

-- 
exiv2 packaging