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

The following commit has been merged in the master branch:
commit e56387cabae0862c93ee7d9f4ac7691c09766901
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon Aug 29 10:02:33 2011 +0000

    Updated version to 0.22.
---
 CMakeLists.txt           | 8 ++++----
 config/configure.ac      | 4 ++--
 msvc/include/exv_msvc.h  | 4 ++--
 src/version.hpp          | 4 ++--
 test/data/exiv2-test.out | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4eb26b9..d2f99fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,12 +37,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.21.1" )
+SET( PACKAGE_STRING         "exiv2 0.22" )
 SET( PACKAGE_TARNAME        "exiv2" )
-SET( PACKAGE_VERSION        "0.21.1" )
+SET( PACKAGE_VERSION        "0.22" )
 SET( PACKAGE_URL            "http://www.exiv2.org" )
-SET( GENERIC_LIB_VERSION    "10.1.0" )
-SET( GENERIC_LIB_SOVERSION  "10" )
+SET( GENERIC_LIB_VERSION    "11.0.0" )
+SET( GENERIC_LIB_SOVERSION  "11" )
 
 # 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 1ac0065..c8e4299 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.21.1, ahuggel at gmx.net)
+AC_INIT(exiv2, 0.22, ahuggel at gmx.net)
 # See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-EXIV2_LTVERSION=10:1:0
+EXIV2_LTVERSION=11:0:0
 PACKAGE=$PACKAGE_NAME
 VERSION=$PACKAGE_VERSION
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
diff --git a/msvc/include/exv_msvc.h b/msvc/include/exv_msvc.h
index e357378..9ca2abc 100644
--- a/msvc/include/exv_msvc.h
+++ b/msvc/include/exv_msvc.h
@@ -23,13 +23,13 @@
 #define EXV_PACKAGE_NAME "exiv2"
 
 /* Define to the full name and version of this package. */
-#define EXV_PACKAGE_STRING "exiv2 0.21.1"
+#define EXV_PACKAGE_STRING "exiv2 0.22"
 
 /* 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.21.1"
+#define EXV_PACKAGE_VERSION "0.22"
 
 /* Define to `int' if <sys/types.h> does not define pid_t. */
 typedef int pid_t;
diff --git a/src/version.hpp b/src/version.hpp
index 8574765..c7e29ae 100644
--- a/src/version.hpp
+++ b/src/version.hpp
@@ -44,11 +44,11 @@
 /*!
   @brief %Exiv2 MINOR version number of the library used at compile-time.
  */
-#define EXIV2_MINOR_VERSION (21)
+#define EXIV2_MINOR_VERSION (22)
 /*!
   @brief %Exiv2 PATCH version number of the library used at compile-time.
  */
-#define EXIV2_PATCH_VERSION  (1)
+#define EXIV2_PATCH_VERSION  (0)
 /*!
   @brief Make an integer version number for comparison from a major, minor and
          a patch version number.
diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out
index eb23bb6..245a0a0 100644
--- a/test/data/exiv2-test.out
+++ b/test/data/exiv2-test.out
@@ -2,7 +2,7 @@ Exiv2 test directory -----------------------------------------------------
 tmp/
 
 Exiv2 version ------------------------------------------------------------
-exiv2 0.21.1 001501 (__ bit build)
+exiv2 0.22 001600 (__ bit build)
 Copyright (C) 2004-2011 Andreas Huggel.
 
 This program is free software; you can redistribute it and/or

-- 
exiv2 packaging