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

The following commit has been merged in the master branch:
commit ccb462869f4b0edff1fca198c64030e885220563
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Aug 26 13:34:55 2015 +0000

    Fix: #1100
---
 src/actions.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/actions.cpp b/src/actions.cpp
index 4568764..464c4bc 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -2025,9 +2025,11 @@ namespace {
     {
         std::string directory = Params::instance().directory_;
         if (directory.empty()) directory = Util::dirname(path);
-        std::string newPath =   directory + EXV_SEPARATOR_STR
-                              + Util::basename(path, true) + ext;
-        return newPath;
+        directory   = Exiv2::fileProtocol(path) == Exiv2::pFile
+                    ? directory + EXV_SEPARATOR_STR
+                    : "" // use current directory for remote files
+                    ;
+        return directory + Util::basename(path, true) + ext;
     }
 
     int dontOverwrite(const std::string& path)

-- 
exiv2 packaging