[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=1c2d21f

The following commit has been merged in the master branch:
commit 1c2d21f6093ce27bb7c5815a98d7b7c7c9d40f5a
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Tue Mar 6 15:48:19 2007 +0000

    Renamed exiv2_version.* files to version.*
---
 src/Makefile                           | 10 +++++-----
 src/types.hpp                          |  2 +-
 src/{exiv2_version.cpp => version.cpp} |  4 ++--
 src/{exiv2_version.hpp => version.hpp} | 10 +++++-----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index a13263c..5e25afe 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -47,12 +47,12 @@ include $(top_srcdir)/config/config.mk
 # Source files
 
 # Add standalone C++ header files to this list
-CCHDR =  exiv2_version.hpp    \
-         exv_conf.h           \
+CCHDR =  exv_conf.h           \
          exv_msvc.h           \
          mn.hpp               \
          rcsid.hpp            \
-         tifffwd.hpp
+         tifffwd.hpp          \
+         version.hpp
 
 # Add library C++ source files to this list
 CCSRC =  basicio.cpp          \
@@ -62,7 +62,6 @@ CCSRC =  basicio.cpp          \
 	 datasets.cpp         \
 	 error.cpp            \
 	 exif.cpp             \
-	 exiv2_version.cpp    \
 	 futils.cpp           \
 	 fujimn.cpp           \
 	 ifd.cpp              \
@@ -90,7 +89,8 @@ CCSRC += rafimage.cpp         \
 	 tiffparser.cpp       \
 	 tiffvisitor.cpp      \
 	 types.cpp            \
-	 value.cpp
+	 value.cpp            \
+	 version.cpp
 
 # Add library C source files to this list
 ifndef HAVE_TIMEGM
diff --git a/src/types.hpp b/src/types.hpp
index c37fa16..02b6762 100644
--- a/src/types.hpp
+++ b/src/types.hpp
@@ -39,7 +39,7 @@
 # include "exv_conf.h"
 #endif
 
-#include "exiv2_version.hpp"
+#include "version.hpp"
 
 // + standard includes
 #include <string>
diff --git a/src/exiv2_version.cpp b/src/version.cpp
similarity index 96%
rename from src/exiv2_version.cpp
rename to src/version.cpp
index 816b4e1..b895e7b 100644
--- a/src/exiv2_version.cpp
+++ b/src/version.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
  */
 /*
-  File:      exiv2_version.cpp
+  File:      version.cpp
   Version:   $Rev$
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   06-Mar-07, ahu: created
@@ -37,7 +37,7 @@ EXIV2_RCSID("@(#) $Id$")
 # include "exv_conf.h"
 #endif
 
-#include "exiv2_version.hpp"
+#include "version.hpp"
 
 namespace Exiv2 {
     int versionNumber()
diff --git a/src/exiv2_version.hpp b/src/version.hpp
similarity index 94%
rename from src/exiv2_version.hpp
rename to src/version.hpp
index 61d41d9..cc237c0 100644
--- a/src/exiv2_version.hpp
+++ b/src/version.hpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
  */
 /*!
-  @file    exiv2_version.hpp
+  @file    version.hpp
   @brief   Define to check the %Exiv2 version. 
            References: Similar versioning defines are used in KDE, GTK and other
            libraries. See http://apr.apache.org/versioning.html for accompanying
@@ -29,8 +29,8 @@
            <a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
   @date    31-May-06, ahu: created
  */
-#ifndef EXIV2_VERSION_HPP_
-#define EXIV2_VERSION_HPP_
+#ifndef VERSION_HPP_
+#define VERSION_HPP_
 
 /*!
   @brief %Exiv2 MAJOR version number of the library used at compile-time.
@@ -74,7 +74,7 @@
   regard to the restrictions detailed in the above document.
 
   @code
-  // Don't include the exiv2_version.hpp file, it is included by types.hpp
+  // Don't include the version.hpp file, it is included by types.hpp
   // Early Exiv2 versions didn't have this file and the macros
 
   #ifndef EXIV2_CHECK_VERSION
@@ -111,4 +111,4 @@ namespace Exiv2 {
     */
     const char* version();
 }                                       // namespace Exiv2
-#endif                                  // EXIV2_VERSION_HPP_
+#endif                                  // VERSION_HPP_

-- 
exiv2 packaging