This is an automated email from the git hooks/post-receive script.

pini pushed a commit to branch upstream
in repository hdf5.

commit 6eb12835f91238e9a8c2849701cac2ca751172f9
Author: Gilles Filippini <p...@debian.org>
Date:   Tue Jun 16 23:07:26 2015 +0200

    Imported Upstream version 1.8.15-patch1+docs
---
 README.txt                 |  2 +-
 c++/src/Makefile.in        |  2 +-
 c++/src/cpp_doc_config     |  2 +-
 config/lt_vers.am          |  2 +-
 configure                  | 24 ++++++++++++------------
 configure.ac               |  4 ++--
 fortran/src/Makefile.in    |  2 +-
 hl/c++/src/Makefile.in     |  2 +-
 hl/fortran/src/Makefile.in |  2 +-
 hl/src/Makefile.in         |  2 +-
 html/RM/H5F/H5Fcreate.htm  |  4 ++--
 release_docs/RELEASE.txt   | 23 +++++++++++++++++------
 src/H5Epublic.h            |  2 +-
 src/H5api_adpt.h           |  7 -------
 src/H5private.h            |  2 ++
 src/H5public.h             |  4 ++--
 src/Makefile.in            |  2 +-
 tools/lib/h5tools_utils.h  |  6 +++---
 18 files changed, 50 insertions(+), 44 deletions(-)

diff --git a/README.txt b/README.txt
index fffe263..be8dc16 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.8.15 released on 2015-05-04
+HDF5 version 1.8.15-patch1 released on 2015-05-28
 Please refer to the release_docs/INSTALL file for installation instructions.
 ------------------------------------------------------------------------------
 
diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in
index c7b637d..3d1be83 100644
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@@ -670,7 +670,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
 # After making changes, run bin/reconfigure to update other configure related
 # files like Makefile.in.
 LT_VERS_INTERFACE = 10
-LT_VERS_REVISION = 0 
+LT_VERS_REVISION = 1 
 LT_VERS_AGE = 0
 
 # This is our main target
diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config
index 5a73fcb..795da03 100644
--- a/c++/src/cpp_doc_config
+++ b/c++/src/cpp_doc_config
@@ -38,7 +38,7 @@ PROJECT_NAME           = "HDF5 C++ API"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = HDF5 version 1.8.15 currently under development
+PROJECT_NUMBER         = HDF5 version 1.8.15-patch1 currently under development
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/config/lt_vers.am b/config/lt_vers.am
index 433a52d..fc14613 100644
--- a/config/lt_vers.am
+++ b/config/lt_vers.am
@@ -19,7 +19,7 @@
 # After making changes, run bin/reconfigure to update other configure related
 # files like Makefile.in.
 LT_VERS_INTERFACE = 10
-LT_VERS_REVISION = 0 
+LT_VERS_REVISION = 1 
 LT_VERS_AGE = 0
 
 ## If the API changes *at all*, increment LT_VERS_INTERFACE and
diff --git a/configure b/configure
index 773c6c5..8d26a2a 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac Id: configure.ac 26957 2015-04-28 21:36:33Z epourmal .
+# From configure.ac Id: configure.ac 27055 2015-05-12 18:35:09Z epourmal .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for HDF5 1.8.15.
+# Generated by GNU Autoconf 2.69 for HDF5 1.8.15-patch1.
 #
 # Report bugs to <h...@hdfgroup.org>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='HDF5'
 PACKAGE_TARNAME='hdf5'
-PACKAGE_VERSION='1.8.15'
-PACKAGE_STRING='HDF5 1.8.15'
+PACKAGE_VERSION='1.8.15-patch1'
+PACKAGE_STRING='HDF5 1.8.15-patch1'
 PACKAGE_BUGREPORT='h...@hdfgroup.org'
 PACKAGE_URL=''
 
@@ -1473,7 +1473,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures HDF5 1.8.15 to adapt to many kinds of systems.
+\`configure' configures HDF5 1.8.15-patch1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1543,7 +1543,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of HDF5 1.8.15:";;
+     short | recursive ) echo "Configuration of HDF5 1.8.15-patch1:";;
    esac
   cat <<\_ACEOF
 
@@ -1731,7 +1731,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-HDF5 configure 1.8.15
+HDF5 configure 1.8.15-patch1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2668,7 +2668,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by HDF5 $as_me 1.8.15, which was
+It was created by HDF5 $as_me 1.8.15-patch1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3539,7 +3539,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='hdf5'
- VERSION='1.8.15'
+ VERSION='1.8.15-patch1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -28845,7 +28845,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libt...@gnu.org>."
 
 lt_cl_version="\
-HDF5 config.lt 1.8.15
+HDF5 config.lt 1.8.15-patch1
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -30961,7 +30961,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by HDF5 $as_me 1.8.15, which was
+This file was extended by HDF5 $as_me 1.8.15-patch1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -31027,7 +31027,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; 
s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-HDF5 config.status 1.8.15
+HDF5 config.status 1.8.15-patch1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index fea421f..bdfcc11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@
 ## ----------------------------------------------------------------------
 ## Initialize configure.
 ##
-AC_REVISION($Id: configure.ac 26991 2015-05-01 19:00:32Z epourmal $)
+AC_REVISION($Id: configure.ac 27055 2015-05-12 18:35:09Z epourmal $)
 AC_PREREQ([2.69])
 
 ## AC_INIT takes the name of the package, the version number, and an
@@ -26,7 +26,7 @@ AC_PREREQ([2.69])
 ## NOTE: Do not forget to change the version number here when we do a
 ## release!!!
 ##
-AC_INIT([HDF5], [1.8.15], [h...@hdfgroup.org])
+AC_INIT([HDF5], [1.8.15-patch1], [h...@hdfgroup.org])
 AC_CONFIG_SRCDIR([src/H5.c])
 AC_CONFIG_HEADER([src/H5config.h])
 
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index a223a31..0d19969 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -724,7 +724,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
 # After making changes, run bin/reconfigure to update other configure related
 # files like Makefile.in.
 LT_VERS_INTERFACE = 10
-LT_VERS_REVISION = 0 
+LT_VERS_REVISION = 1 
 LT_VERS_AGE = 0
 AM_FCLIBS = $(LIBHDF5)
 
diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in
index 41c1bea..f049952 100644
--- a/hl/c++/src/Makefile.in
+++ b/hl/c++/src/Makefile.in
@@ -662,7 +662,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
 # After making changes, run bin/reconfigure to update other configure related
 # files like Makefile.in.
 LT_VERS_INTERFACE = 10
-LT_VERS_REVISION = 0 
+LT_VERS_REVISION = 1 
 LT_VERS_AGE = 0
 
 # This is our main target
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index c0fa250..0e44d85 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -680,7 +680,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
 # After making changes, run bin/reconfigure to update other configure related
 # files like Makefile.in.
 LT_VERS_INTERFACE = 10
-LT_VERS_REVISION = 0 
+LT_VERS_REVISION = 1 
 LT_VERS_AGE = 0
 
 # Our main target, the high-level fortran library
diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in
index eb029e3..123af7a 100644
--- a/hl/src/Makefile.in
+++ b/hl/src/Makefile.in
@@ -661,7 +661,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
 # After making changes, run bin/reconfigure to update other configure related
 # files like Makefile.in.
 LT_VERS_INTERFACE = 10
-LT_VERS_REVISION = 0 
+LT_VERS_REVISION = 1 
 LT_VERS_AGE = 0
 
 # This library is our main target.
diff --git a/html/RM/H5F/H5Fcreate.htm b/html/RM/H5F/H5Fcreate.htm
index e433131..0389998 100644
--- a/html/RM/H5F/H5Fcreate.htm
+++ b/html/RM/H5F/H5Fcreate.htm
@@ -23,7 +23,7 @@
 <hr>
 <dl>
 <dt><div align=right><font color=999999 size=-1><i>
-  Last modified: 9 October 2014</i></font></div></dt>
+  Last modified: 1 June 2015</i></font></div></dt>
 
 <dt><strong>Name:</strong> <a name="File-Create">H5Fcreate</a></dt>
 <br />
@@ -115,7 +115,7 @@
             <td 
valign="top"><em>const&nbsp;char&nbsp;*</em><code>name&nbsp;&nbsp;&nbsp;&nbsp;</code></td>
             <td valign="top">IN: Name of the file to access.</td></tr>
         <tr>
-            <td valign="top"><em>uintn</em> <code>flags</code></td>
+            <td valign="top"><em>unsigned</em> <code>flags</code></td>
             <td valign="top">IN: File access flags.  Allowable values are:
                 <ul><dl>
                     <dt><code>H5F_ACC_TRUNC</code>
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 23adc53..9428eb2 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1,12 +1,12 @@
-HDF5 version 1.8.15 released on 2015-05-04
+HDF5 version 1.8.15-patch1 released on 2015-05-28
 
================================================================================
 
 INTRODUCTION
 ============
 
-This document describes the differences between HDF5-1.8.14 and 
-HDF5-1.8.15, and contains information on the platforms tested and 
-known problems in HDF5-1.8.15. 
+Tnhis document describes the differences between HDF5-1.8.14 and 
+HDF5-1.8.15-patch1, and contains information on the platforms tested and 
+known problems in HDF5-1.8.15-patch1. 
 
 Links to the HDF5 source code, documentation, and additional materials
 can be found on the HDF5 web page at:
@@ -36,6 +36,7 @@ CONTENTS
 
 - New Features
 - Support for New Platforms, Languages, and Compilers
+- Bug Fixes since HDF5-1.8.15
 - Bug Fixes since HDF5-1.8.14
 - Supported Platforms
 - Supported Configuration Features Summary
@@ -342,6 +343,16 @@ Support for New Platforms, Languages, and Compilers
     - Support for Mac OS X Yosemite 10.10 added (AKC - 2015/03/04, HDFFV-9007)
     - Support for AIX 6.1 added and AIX 5.3 is retired. (AKC - 2015/01/09)
 
+
+Bug Fixes since HDF5-1.8.15
+===========================
+    Library
+    -------
+    - Reverted the change to the H5api_adpt.h (rev. 26678) that caused 
+      compilation errors for the C++ HDF5 applications. 
+     (EIP - 2015/05/28, HDFFV-9384)
+
+
 Bug Fixes since HDF5-1.8.14
 ===========================
 
@@ -669,7 +680,7 @@ They are built with the configure process unless specified 
otherwise.
                                       Version 4.8.4, 4.9.2
                                   PGI C, Fortran, C++ Compilers for 32-bit
                                   applications;
-                                      Version 14.10-0
+                                      Version 15.4-0
                                   Intel(R) C, C++, Fortran Compiler for 32-bit
                                   applications;
                                       Version 15.0.1.133 (Build 20141023)
@@ -688,7 +699,7 @@ They are built with the configure process unless specified 
otherwise.
                                      Version 4.8.2, Version 4.9.2
                                   PGI C, Fortran, C++ for 64-bit target on 
                                   x86-64;
-                                      Version 14.10-0 
+                                      Version 15.4-0
                                   Intel(R) C (icc), C++ (icpc), Fortran (icc)
                                   compilers:
                                      Version 15.0.1.133 Build 20141023
diff --git a/src/H5Epublic.h b/src/H5Epublic.h
index 1639ab4..17a35d9 100644
--- a/src/H5Epublic.h
+++ b/src/H5Epublic.h
@@ -165,7 +165,7 @@ H5_DLL herr_t H5Eclose_stack(hid_t stack_id);
 H5_DLL ssize_t H5Eget_class_name(hid_t class_id, char *name, size_t size);
 H5_DLL herr_t H5Eset_current_stack(hid_t err_stack_id);
 H5_DLL herr_t H5Epush2(hid_t err_stack, const char *file, const char *func, 
unsigned line,
-    hid_t cls_id, hid_t maj_id, hid_t min_id, const char *msg, 
...)__attribute__((format (printf, 8, 9)));
+    hid_t cls_id, hid_t maj_id, hid_t min_id, const char *msg, ...);
 H5_DLL herr_t H5Epop(hid_t err_stack, size_t count);
 H5_DLL herr_t H5Eprint2(hid_t err_stack, FILE *stream);
 H5_DLL herr_t H5Ewalk2(hid_t err_stack, H5E_direction_t direction, H5E_walk2_t 
func,
diff --git a/src/H5api_adpt.h b/src/H5api_adpt.h
index 7602310..9b00bd9 100644
--- a/src/H5api_adpt.h
+++ b/src/H5api_adpt.h
@@ -21,13 +21,6 @@
 #ifndef H5API_ADPT_H
 #define H5API_ADPT_H
 
-#ifdef __cplusplus
-#define __attribute__(X)  /*void*/
-#endif /* __cplusplus */
-#ifndef H5_HAVE_ATTRIBUTE
-#define __attribute__(X)  /*void*/
-#endif /* H5_HAVE_ATTRIBUTE */
-
 /* This will only be defined if HDF5 was built with CMake */
 #ifdef H5_BUILT_AS_DYNAMIC_LIB
 
diff --git a/src/H5private.h b/src/H5private.h
index 4c4b9d1..87e95b5 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -280,6 +280,7 @@
  * big deal if we don't.
  */
 #ifdef __cplusplus
+#   define __attribute__(X)  /*void*/
 #   define UNUSED    /*void*/
 #   define NORETURN  /*void*/
 #else /* __cplusplus */
@@ -287,6 +288,7 @@
 #   define UNUSED    __attribute__((unused))
 #   define NORETURN  __attribute__((noreturn))
 #else
+#   define __attribute__(X)  /*void*/
 #   define UNUSED    /*void*/
 #   define NORETURN  /*void*/
 #endif
diff --git a/src/H5public.h b/src/H5public.h
index f2cea1a..01608d9 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -95,9 +95,9 @@ extern "C" {
 #define H5_VERS_MAJOR  1       /* For major interface/format changes        */
 #define H5_VERS_MINOR  8       /* For minor interface/format changes        */
 #define H5_VERS_RELEASE        15      /* For tweaks, bug-fixes, or 
development     */
-#define H5_VERS_SUBRELEASE ""  /* For pre-releases like snap0       */
+#define H5_VERS_SUBRELEASE "patch1"    /* For pre-releases like snap0       */
                                /* Empty string for real releases.           */
-#define H5_VERS_INFO    "HDF5 library version: 1.8.15"      /* Full version 
string */
+#define H5_VERS_INFO    "HDF5 library version: 1.8.15-patch1"      /* Full 
version string */
 
 #define H5check()      H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR,          \
                                        H5_VERS_RELEASE)
diff --git a/src/Makefile.in b/src/Makefile.in
index 21f01d4..15a534b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -719,7 +719,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
 # After making changes, run bin/reconfigure to update other configure related
 # files like Makefile.in.
 LT_VERS_INTERFACE = 10
-LT_VERS_REVISION = 0 
+LT_VERS_REVISION = 1 
 LT_VERS_AGE = 0
 
 # Our main target, the HDF5 library
diff --git a/tools/lib/h5tools_utils.h b/tools/lib/h5tools_utils.h
index fd588b9..3285278 100644
--- a/tools/lib/h5tools_utils.h
+++ b/tools/lib/h5tools_utils.h
@@ -124,9 +124,9 @@ H5TOOLS_DLLVAR int     h5tools_nCols;               /*max 
number of columns for
 /* Definitions of useful routines */
 H5TOOLS_DLL void     indentation(int);
 H5TOOLS_DLL void     print_version(const char *progname);
-H5TOOLS_DLL void     parallel_print(const char* format, ... 
)__attribute__((format (printf, 1, 2)));
-H5TOOLS_DLL void     error_msg(const char *fmt, ...)__attribute__((format 
(printf, 1, 2)));
-H5TOOLS_DLL void     warn_msg(const char *fmt, ...)__attribute__((format 
(printf, 1, 2)));
+H5TOOLS_DLL void     parallel_print(const char* format, ... );
+H5TOOLS_DLL void     error_msg(const char *fmt, ...);
+H5TOOLS_DLL void     warn_msg(const char *fmt, ...);
 H5TOOLS_DLL void     help_ref_msg(FILE *output);
 H5TOOLS_DLL void     free_table(table_t *table);
 #ifdef H5DUMP_DEBUG

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/hdf5.git

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to