[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=4974ff9

The following commit has been merged in the master branch:
commit 4974ff976fa51f927da2cf155853e53bbef6f834
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon Jun 15 15:32:21 2015 +0000

    Bumped version to 0.25.
---
 CMakeLists.txt                    | 8 ++++----
 config/configure.ac               | 4 ++--
 include/exiv2/exv_msvc-webready.h | 4 ++--
 include/exiv2/exv_msvc.h          | 4 ++--
 include/exiv2/version.hpp         | 4 ++--
 msvc2005/ReadMe.txt               | 4 ++--
 test/data/exiv2-test.out          | 2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d03e9b1..e0c178b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,12 +32,12 @@ SET( PACKAGE_COPYRIGHT      "Andreas Huggel" )
 SET( PACKAGE_BUGREPORT      "ahuggel at gmx.net" )
 SET( PACKAGE                "exiv2" )
 SET( PACKAGE_NAME           "exiv2" )
-SET( PACKAGE_STRING         "exiv2 0.24" )
+SET( PACKAGE_STRING         "exiv2 0.25" )
 SET( PACKAGE_TARNAME        "exiv2" )
-SET( PACKAGE_VERSION        "0.24" )
+SET( PACKAGE_VERSION        "0.25" )
 SET( PACKAGE_URL            "http://www.exiv2.org" )
-SET( GENERIC_LIB_VERSION    "13.0.0" )
-SET( GENERIC_LIB_SOVERSION  "13" )
+SET( GENERIC_LIB_VERSION    "14.0.0" )
+SET( GENERIC_LIB_SOVERSION  "14" )
 
 # options and their default values
 OPTION( EXIV2_ENABLE_SHARED        "Build exiv2 as a shared library (dll)"                 ON  )
diff --git a/config/configure.ac b/config/configure.ac
index ce30470..b3aa0e2 100644
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -2,9 +2,9 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT(exiv2, 0.24, ahuggel at gmx.net)
+AC_INIT(exiv2, 0.25, ahuggel at gmx.net)
 # See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-EXIV2_LTVERSION=13:0:0
+EXIV2_LTVERSION=14:0:0
 PACKAGE=$PACKAGE_NAME
 VERSION=$PACKAGE_VERSION
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
diff --git a/include/exiv2/exv_msvc-webready.h b/include/exiv2/exv_msvc-webready.h
index 999be77..c71c765 100644
--- a/include/exiv2/exv_msvc-webready.h
+++ b/include/exiv2/exv_msvc-webready.h
@@ -49,13 +49,13 @@
 #define EXV_PACKAGE_NAME "exiv2"
 
 /* Define to the full name and version of this package. */
-#define EXV_PACKAGE_STRING "exiv2 0.24"
+#define EXV_PACKAGE_STRING "exiv2 0.25"
 
 /* Define to the one symbol short name of this package. */
 #define EXV_PACKAGE_TARNAME "exiv2"
 
 /* Define to the version of this package. */
-#define EXV_PACKAGE_VERSION "0.24"
+#define EXV_PACKAGE_VERSION "0.25"
 
 /* Define to `int' if <sys/types.h> does not define pid_t. */
 typedef int pid_t;
diff --git a/include/exiv2/exv_msvc.h b/include/exiv2/exv_msvc.h
index a862bca..b29f81e 100644
--- a/include/exiv2/exv_msvc.h
+++ b/include/exiv2/exv_msvc.h
@@ -49,13 +49,13 @@
 #define EXV_PACKAGE_NAME "exiv2"
 
 /* Define to the full name and version of this package. */
-#define EXV_PACKAGE_STRING "exiv2 0.24"
+#define EXV_PACKAGE_STRING "exiv2 0.25"
 
 /* Define to the one symbol short name of this package. */
 #define EXV_PACKAGE_TARNAME "exiv2"
 
 /* Define to the version of this package. */
-#define EXV_PACKAGE_VERSION "0.24"
+#define EXV_PACKAGE_VERSION "0.25"
 
 /* Define to `int' if <sys/types.h> does not define pid_t. */
 typedef int pid_t;
diff --git a/include/exiv2/version.hpp b/include/exiv2/version.hpp
index 10efdb4..b9f88b6 100644
--- a/include/exiv2/version.hpp
+++ b/include/exiv2/version.hpp
@@ -51,7 +51,7 @@ typedef std::vector<std::string> exv_grep_keys_t ;
 /*!
   @brief %Exiv2 MINOR version number of the library used at compile-time.
  */
-#define EXIV2_MINOR_VERSION (24)
+#define EXIV2_MINOR_VERSION (25)
 /*!
   @brief %Exiv2 PATCH version number of the library used at compile-time.
  */
@@ -129,7 +129,7 @@ namespace Exiv2 {
     */
     EXIV2API int versionNumber();
     /*!
-      @brief Return the version string Example: "0.24.0" (major.minor.patch)
+      @brief Return the version string Example: "0.25.0" (major.minor.patch)
     */
     EXIV2API std::string versionString();
     /*!
diff --git a/msvc2005/ReadMe.txt b/msvc2005/ReadMe.txt
index 990680d..310a59e 100644
--- a/msvc2005/ReadMe.txt
+++ b/msvc2005/ReadMe.txt
@@ -430,7 +430,7 @@ T A B L E  o f  C O N T E N T S
      You can inspect build information using exiv2 -v -V (verbose version):
 
      C:
-- 
exiv2 packaging