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

The following commit has been merged in the master branch:
commit fb9820d28144e7fb7c8934565a577b9ae21222b7
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Aug 15 15:09:00 2010 +0000

    Bumped version to 0.21 to facilitate testing (soname remains unchanged for now).
---
 CMakeLists.txt           | 4 ++--
 config/configure.ac      | 2 +-
 msvc/include/exv_msvc.h  | 4 ++--
 src/version.hpp          | 2 +-
 test/data/exiv2-test.out | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e78d78..cd6d2ac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,9 +37,9 @@ SET( PACKAGE_COPYRIGHT      "Andreas Huggel" )
 SET( PACKAGE_BUGREPORT      "ahuggel at gmx.net" )
 SET( PACKAGE                "exiv2" )
 SET( PACKAGE_NAME           "exiv2" )
-SET( PACKAGE_STRING         "exiv2 0.20" )
+SET( PACKAGE_STRING         "exiv2 0.21" )
 SET( PACKAGE_TARNAME        "exiv2" )
-SET( PACKAGE_VERSION        "0.20" )
+SET( PACKAGE_VERSION        "0.21" )
 SET( PACKAGE_URL            "http://www.exiv2.org" )
 SET( GENERIC_LIB_VERSION    "9.0.0" )
 SET( GENERIC_LIB_SOVERSION  "9" )
diff --git a/config/configure.ac b/config/configure.ac
index 9080811..5c84fa2 100644
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT(exiv2, 0.20, ahuggel at gmx.net)
+AC_INIT(exiv2, 0.21, ahuggel at gmx.net)
 # See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 EXIV2_LTVERSION=9:0:0
 PACKAGE=$PACKAGE_NAME
diff --git a/msvc/include/exv_msvc.h b/msvc/include/exv_msvc.h
index a9fa579..53a3af1 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.20"
+#define EXV_PACKAGE_STRING "exiv2 0.21"
 
 /* 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.20"
+#define EXV_PACKAGE_VERSION "0.21"
 
 /* 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 4a2120d..89b6010 100644
--- a/src/version.hpp
+++ b/src/version.hpp
@@ -39,7 +39,7 @@
 /*!
   @brief %Exiv2 MINOR version number of the library used at compile-time.
  */
-#define EXIV2_MINOR_VERSION (20)
+#define EXIV2_MINOR_VERSION (21)
 /*!
   @brief %Exiv2 PATCH version number of the library used at compile-time.
  */
diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out
index 6e7e1d3..25a99b7 100644
--- a/test/data/exiv2-test.out
+++ b/test/data/exiv2-test.out
@@ -3,7 +3,7 @@ tmp/
 
 Exiv2 version ------------------------------------------------------------
 /usr/local/bin/exiv2
-exiv2 0.20
+exiv2 0.21
 Copyright (C) 2004-2010 Andreas Huggel.
 
 This program is free software; you can redistribute it and/or

-- 
exiv2 packaging