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

The following commit has been merged in the master branch:
commit e21d82990e739bedb654ce7e66214dd18fb3c78b
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Feb 25 22:39:17 2015 +0000

    #1031.  CMake documentation update for v0.25.  No major work is planned for CMake in v0.25.
---
 README-CMAKE | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README-CMAKE b/README-CMAKE
index a6fbf64..70647c0 100644
--- a/README-CMAKE
+++ b/README-CMAKE
@@ -5,7 +5,7 @@ NOTE:
   Use them only if you're prepared to fix them.
   See TODO-CMAKE for known pending tasks. 
 
-* The existing automake (./configure), msvc2003 and msvc64 build files will continue
+* The existing automake (./configure), msvc2003 and msvc2005 build files will continue
   to be supported by exiv2 until at least v0.26.
   We will flag them as "deprecated" for at least one release cycle (about 12 months).
   Our plan is to only support CMake when our scripts are feature-complete, stable and documented.
@@ -83,6 +83,8 @@ Specific Exiv2 options :
 -DEXIV2_ENABLE_COMMERCIAL    : Build with the EXV_COMMERCIAL_VERSION symbol set. [default=off]
 -DEXIV2_ENABLE_BUILD_SAMPLES : Build the unit tests.                             [default=off]
 -DEXIV2_ENABLE_BUILD_PO      : Build translations files.                         [default=off]
+-DEXIV2_ENABLE_CURL          : USE Libcurl for HttpIo                            [default=off]
+-DEXIV2_ENABLE_SSH           : USE Libssh for SshIo                              [default=off]
 
 Default install locations
 

-- 
exiv2 packaging