[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=38e7e14

The following commit has been merged in the master branch:
commit 38e7e148218208d3ed18b9447826370968be0cca
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Thu Dec 11 09:13:51 2008 +0000

    Bumped version to 0.18.
---
 config/configure.ac      | 4 ++--
 src/exv_msvc.h           | 4 ++--
 src/version.hpp          | 4 ++--
 test/data/exiv2-test.out | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/config/configure.ac b/config/configure.ac
index 9906d48..8024eb3 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.18-pre2, ahuggel at gmx.net)
+AC_INIT(exiv2, 0.18, ahuggel at gmx.net)
 # See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-EXIV2_LTVERSION=6:0:1
+EXIV2_LTVERSION=7:0:2
 PACKAGE=$PACKAGE_NAME
 VERSION=$PACKAGE_VERSION
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
diff --git a/src/exv_msvc.h b/src/exv_msvc.h
index c1a8231..14685a5 100644
--- a/src/exv_msvc.h
+++ b/src/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.18-pre2"
+#define EXV_PACKAGE_STRING "exiv2 0.18"
 
 /* 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.18-pre2"
+#define EXV_PACKAGE_VERSION "0.18"
 
 /* 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 17b6c1d..18bf07a 100644
--- a/src/version.hpp
+++ b/src/version.hpp
@@ -39,11 +39,11 @@
 /*!
   @brief %Exiv2 MINOR version number of the library used at compile-time.
  */
-#define EXIV2_MINOR_VERSION (17)
+#define EXIV2_MINOR_VERSION (18)
 /*!
   @brief %Exiv2 PATCH version number of the library used at compile-time.
  */
-#define EXIV2_PATCH_VERSION  (92)
+#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 3536c07..d208666 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.18-pre2
+exiv2 0.18
 Copyright (C) 2004-2008 Andreas Huggel.
 
 This program is free software; you can redistribute it and/or

-- 
exiv2 packaging