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

The following commit has been merged in the master branch:
commit c6be927871383652283607469b3912fae73234ac
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Nov 4 11:11:31 2007 +0000

    Set version to 0.16-pre1 (0.15.99) and minor updates.
---
 config/Doxyfile          | 22 +++++++++++++++++++---
 config/configure.ac      |  2 +-
 po/pl.po                 |  4 ++--
 src/exv_msvc.h           |  4 ++--
 src/version.hpp          |  4 ++--
 test/data/exiv2-test.out |  2 +-
 6 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/config/Doxyfile b/config/Doxyfile
index fc1e39c..c31721b 100644
--- a/config/Doxyfile
+++ b/config/Doxyfile
@@ -1,4 +1,4 @@
-# Doxyfile 1.5.3
+# Doxyfile 1.5.4
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project
@@ -215,6 +215,12 @@ BUILTIN_STL_SUPPORT    = YES
 
 CPP_CLI_SUPPORT        = NO
 
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. 
+# Doxygen will parse them like normal C++ but will assume all classes use public 
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT            = NO
+
 # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
 # tag is set to YES, then doxygen will reuse the documentation of the first 
 # member in the group (if any) for the other members of the group. By default 
@@ -230,6 +236,16 @@ DISTRIBUTE_GROUP_DOC   = NO
 
 SUBGROUPING            = YES
 
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct (or union) is 
+# documented as struct with the name of the typedef. So 
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct 
+# with name TypeT. When disabled the typedef will appear as a member of a file, 
+# namespace, or class. And the struct will be named TypeS. This can typically 
+# be useful for C code where the coding convention is that all structs are 
+# typedef'ed and only the typedef is referenced never the struct's name.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -460,7 +476,7 @@ WARN_NO_PARAMDOC       = NO
 # $version, which will be replaced by the version of the file (if it could 
 # be obtained via FILE_VERSION_FILTER)
 
-WARN_FORMAT            = "$file:$line: $text "
+WARN_FORMAT            = "$file:$line: $text  "
 
 # The WARN_LOGFILE tag can be used to specify a file to which warning 
 # and error messages should be written. If left blank the output is written 
@@ -491,7 +507,7 @@ INPUT_ENCODING         = UTF-8
 # and *.h) to filter out the source-files in the directories. If left 
 # blank the following patterns are tested: 
 # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
 
 FILE_PATTERNS          = 
 
diff --git a/config/configure.ac b/config/configure.ac
index 98d9428..d80c502 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.59)
-AC_INIT(exiv2, 0.16, ahuggel at gmx.net)
+AC_INIT(exiv2, 0.16-pre1, ahuggel at gmx.net)
 # See http://www.gnu.org/software/libtool/manual.html#Updating-version-info
 EXIV2_LTVERSION=2:0:0
 PACKAGE=$PACKAGE_NAME
diff --git a/po/pl.po b/po/pl.po
index 1218ea9..7ab7ade 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -237,11 +237,11 @@ msgstr ""
 
 #: src/actions.cpp:722
 msgid "No IPTC data found in the file
"
-msgstr "Nie znaleziono żadnych danych IPTC w pliku"
+msgstr "Nie znaleziono żadnych danych IPTC w pliku
"
 
 #: src/actions.cpp:760
 msgid "No XMP data found in the file
"
-msgstr "Nie znaleziono żadnych danych XMP w pliku"
+msgstr "Nie znaleziono żadnych danych XMP w pliku
"
 
 #: src/actions.cpp:796
 msgid "JPEG comment"
diff --git a/src/exv_msvc.h b/src/exv_msvc.h
index b23684c..0126357 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.16"
+#define EXV_PACKAGE_STRING "exiv2 0.16-pre1"
 
 /* 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.16"
+#define EXV_PACKAGE_VERSION "0.16-pre1"
 
 /* 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 1452f43..95d6d30 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 (16)
+#define EXIV2_MINOR_VERSION (15)
 /*!
   @brief %Exiv2 PATCH version number of the library used at compile-time.
  */
-#define EXIV2_PATCH_VERSION  (0)
+#define EXIV2_PATCH_VERSION  (99)
 /*!
   @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 e579bbd..fc4abe5 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.16
+exiv2 0.16-pre1
 Copyright (C) 2004-2007 Andreas Huggel.
 
 This program is free software; you can redistribute it and/or

-- 
exiv2 packaging