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

The following commit has been merged in the master branch:
commit f113c5aacc5e9703f338084e8e7e8d72b4e81fd1
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon Mar 12 13:05:10 2007 +0000

    Bumped version to 0.14 and changed to libtool's -version-info versioning system
---
 config/config.mk.in      | 4 ++--
 config/configure.ac      | 4 +++-
 src/Makefile             | 2 +-
 src/doxygen.hpp          | 8 ++++----
 src/exv_msvc.h           | 4 ++--
 src/version.hpp          | 2 +-
 test/data/exiv2-test.out | 2 +-
 7 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/config/config.mk.in b/config/config.mk.in
index d3024e6..281046a 100644
--- a/config/config.mk.in
+++ b/config/config.mk.in
@@ -28,8 +28,8 @@
 #
 
 # **********************************************************************
-# Exiv2 version
-EXIV2_VERSION = @PACKAGE_VERSION@
+# Exiv2 version for use with libtool (-version-info argument)
+EXIV2_LTVERSION = @EXIV2_LTVERSION@
 
 # **********************************************************************
 # Libtool
diff --git a/config/configure.ac b/config/configure.ac
index 258dd38..2b566d1 100644
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -2,11 +2,13 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(Exiv2, 0.13, ahuggel at gmx.net)
+AC_INIT(Exiv2, 0.14, ahuggel at gmx.net)
+EXIV2_LTVERSION=0:0:0
 PACKAGE=$PACKAGE_NAME
 VERSION=$PACKAGE_VERSION
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
+AC_SUBST(EXIV2_LTVERSION)
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 AC_CONFIG_SRCDIR([src/exif.cpp])
diff --git a/src/Makefile b/src/Makefile
index 5e25afe..e366d98 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -243,7 +243,7 @@ $(LIBTOOL): $(LIBTOOL_DEPS)
 bin: lib $(BINARY) $(EXIV2BIN) $(MCBIN) path-test
 
 lib: $(OBJ)
-	$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) $(LOBJ) -o $(LIBRARY) -rpath $(libdir) -release $(EXIV2_VERSION) $(LIBS)
+	$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) $(LOBJ) -o $(LIBRARY) -rpath $(libdir) -version-info $(EXIV2_LTVERSION) $(LIBS)
 	@touch lib
 
 path-test: path-test.o utils.o
diff --git a/src/doxygen.hpp b/src/doxygen.hpp
index bd7b429..8f6bb4e 100644
--- a/src/doxygen.hpp
+++ b/src/doxygen.hpp
@@ -8,7 +8,7 @@
   @date    07-Feb-04, ahu: created
  */
 /*!
-  @mainpage Exif and IPTC metadata library and tools v0.13
+  @mainpage Exif and IPTC metadata library and tools v0.14
 
   @section overview Exiv2 Overview
 
@@ -82,12 +82,12 @@ bug tracking system</a>.</p>
 
   @verbatim $ svn checkout svn://dev.robotbattle.com/exiv2/trunk . @endverbatim
 
-  <p>To download the test data and test drivers for version 0.13 from
-  the repository, change to your local exiv2-0.13 directory and use the
+  <p>To download the test data and test drivers for version 0.14 from
+  the repository, change to your local exiv2-0.14 directory and use the
   following command:
   </p>
 
-  @verbatim $ svn export svn://dev.robotbattle.com/exiv2/tags/0.13/test @endverbatim
+  @verbatim $ svn export svn://dev.robotbattle.com/exiv2/tags/0.14/test @endverbatim
 
   <P>If you'd like to contribute code, please <A HREF="mailto:ahuggel at gmx.net">contact me</A>.
 
diff --git a/src/exv_msvc.h b/src/exv_msvc.h
index 7e2c316..cafe123 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.13"
+#define EXV_PACKAGE_STRING "Exiv2 0.14"
 
 /* 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.13"
+#define EXV_PACKAGE_VERSION "0.14"
 
 /* Define to `int' if <sys/types.h> does not define pid_t. */
 #define pid_t int
diff --git a/src/version.hpp b/src/version.hpp
index cc237c0..390b5ce 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 (13)
+#define EXIV2_MINOR_VERSION (14)
 /*!
   @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 d732916..8a34cd0 100644
--- a/test/data/exiv2-test.out
+++ b/test/data/exiv2-test.out
@@ -3,7 +3,7 @@ tmp/
 
 Exiv2 version ------------------------------------------------------------
 ../../src/exiv2
-Exiv2 0.13
+Exiv2 0.14
 Copyright (C) 2004-2007 Andreas Huggel.
 
 This program is free software; you can redistribute it and/or

-- 
exiv2 packaging