[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=95f3901

The following commit has been merged in the master branch:
commit 95f3901a62bd2b7de2e6708c1d7e521ec0b0aa9f
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Jul 7 06:54:45 2007 +0000

    Updated ChangeLog, bumped version to 0.15 and the libtool -version-info to 1:0:1
---
 config/configure.ac      |  5 +++--
 doc/ChangeLog            | 39 +++++++++++++++++++++++++++++++++++++++
 src/exv_msvc.h           |  4 ++--
 src/version.hpp          | 10 +++++-----
 test/data/exiv2-test.out |  2 +-
 5 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/config/configure.ac b/config/configure.ac
index 3db69b6..f5fe57c 100644
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -2,8 +2,9 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(exiv2, 0.14, ahuggel at gmx.net)
-EXIV2_LTVERSION=0:0:0
+AC_INIT(exiv2, 0.15, ahuggel at gmx.net)
+# See http://www.gnu.org/software/libtool/manual.html#Updating-version-info
+EXIV2_LTVERSION=1:0:1
 PACKAGE=$PACKAGE_NAME
 VERSION=$PACKAGE_VERSION
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 5383b5b..dfb41c5 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,42 @@
+Changes from version 0.14 to 0.15
+---------------------------------
+
+* Exiv2 utility
+	- 0000518: Return code 0 when unable to insert exif tags.
+	           (Reported by Daniel J Blueman)
+	         - Rename action: Use Exif.Image.DateTime if 
+	           Exif.Photo.DateTimeOriginal is not present. (Highlighted by 
+	           mflanagan_swim)
+
+* Exiv2 library
+	- 0000521: [exif] Image with large invalid Exif tag crashes exiv2.
+	           (Reported by Marco Piovanelli)
+	- 0000520: [exif] crash when loading certain image.
+	           (Reported by Christian Weiske)
+	- 0000519: [exif] Another Minolta G500 file impossible to read after fix.
+	           (Reported by Alexander Rabtchevich)
+	- 0000513: [exif] Sony Makernote crashes exiv2.
+	           (Reported by Aaron D. Campbell)
+	- 0000512: [exif] Wrong AFPoints mapping for Canon cameras.
+	           (Reported with patch by Rob Walker)
+	- 0000511: [exif] Minolta G500 RAW format support.
+	           (Reported by Udi Fuchs)
+	- 0000509: [miscellaneous] Since v0.14 the version check macro doesn't work
+	           in a precompiler #if test anymore. (Reported by Udi Fuchs)
+	- 0000449: [jpeg i/o] Uncouple IPTC and Exif reading.
+	         - [exif] Updated Nikon lens info to v2.30 of Robert Rottmerhusen's 
+	           lens database.
+	         - [Exif] Added additional values to the Exif.CanonCs.ISOSpeed.
+	           lookup table. (Patrick Markert)
+	         - [Exif] Canon ModelId patch. (Gerry Patterson)
+	         - [miscellaneous] Updated German translation. 
+	           (Oliver Dörr)
+	         - [miscellaneous] Updated Russian translation. 
+	           (Alexandre Prokoudine)
+	         - [miscellaneous] Updated French translation. 
+	           (Stephane Pontier)
+
+
 Changes from version 0.13 to 0.14
 ---------------------------------
 
diff --git a/src/exv_msvc.h b/src/exv_msvc.h
index 7d7d33d..70a4923 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.14"
+#define EXV_PACKAGE_STRING "exiv2 0.15"
 
 /* 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.14"
+#define EXV_PACKAGE_VERSION "0.15"
 
 /* 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 49e63b1..9478665 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 (14)
+#define EXIV2_MINOR_VERSION (15)
 /*!
   @brief %Exiv2 PATCH version number of the library used at compile-time.
  */
@@ -91,10 +91,10 @@
             << "Runtime Exiv2 version is    " << Exiv2::version()    << "
";
   
   // Test the Exiv2 version available at runtime but compile the if-clause only if
-  // the compile-time version is at least 0.14.1. Earlier versions didn't have a
+  // the compile-time version is at least 0.15. Earlier versions didn't have a
   // testVersion() function:
   
-  #if EXIV2_TEST_VERSION(0,14,1)
+  #if EXIV2_TEST_VERSION(0,15,0)
   if (Exiv2::testVersion(0,13,0)) {
       std::cout << "Available Exiv2 version is equal to or greater than 0.13
";
   }
@@ -147,10 +147,10 @@ namespace Exiv2 {
                 << "Runtime Exiv2 version is    " << Exiv2::version()    << "
";
     
       // Test the Exiv2 version available at runtime but compile the if-clause only if
-      // the compile-time version is at least 0.14.1. Earlier versions didn't have a
+      // the compile-time version is at least 0.15. Earlier versions didn't have a
       // testVersion() function:
 
-      #if EXIV2_TEST_VERSION(0,14,1)
+      #if EXIV2_TEST_VERSION(0,15,0)
       if (Exiv2::testVersion(0,13,0)) {
           std::cout << "Available Exiv2 version is equal to or greater than 0.13
";
       }
diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out
index 7fc561f..884b3b5 100644
--- a/test/data/exiv2-test.out
+++ b/test/data/exiv2-test.out
@@ -3,7 +3,7 @@ tmp/
 
 Exiv2 version ------------------------------------------------------------
 ../../src/exiv2
-exiv2 0.14
+exiv2 0.15
 Copyright (C) 2004-2007 Andreas Huggel.
 
 This program is free software; you can redistribute it and/or

-- 
exiv2 packaging