The following commit has been merged in the upstream branch: commit c54361ff38992d804c9dd9db43160c42ff87f9cb Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Wed Apr 9 13:11:31 2008 +0000
Major changes diff --git a/debian/changelog b/debian/changelog index 7c5498e..16e322c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,9 +7,12 @@ hdf5 (1.6.7-1) unstable; urgency=low autoconf" in the base directory, and "autoupdate; libtoolize --force --copy; aclocal; autoconf" in the c++/ directory. * [LINTIAN] Changed a bit versions used in build-dep to avoid possible breakages. - * Homepage field updated in debian/control.in + * Homepage field updated in debian/control.in. + * Updated and normalized debian/copyright. + * Now enabled Fortran (openmpi and mpich only) and C++ (serial only) binding. + (closes: #470159) - -- Francesco Paolo Lovergine <fran...@debian.org> Wed, 09 Apr 2008 14:23:29 +0200 + -- Francesco Paolo Lovergine <fran...@debian.org> Wed, 09 Apr 2008 15:06:58 +0200 hdf5 (1.6.6-4) unstable; urgency=low diff --git a/debian/copyright b/debian/copyright index f1ba45d..cfe7556 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,82 +1,88 @@ This package was debianized by Brian Russo <wol...@debian.org> on -Mon, 22 Jan 2001 22:09:19 -1000. +Mon, 22 Jan 2001 22:09:19 -1000. -It was downloaded from -http://hdf.ncsa.uiuc.edu/ +Currently maintained by Francesco P. Lovergine <fran...@debian.org> +in behalf of the DebianGis Team. + +It was downloaded from http://hdfgroup.org/ + +Upstream authors: The HDF Group (THG) Copyright: -Copyright Notice and Statement for NCSA Hierarchical Data Format (HDF) -Software Library and Utilities +HDF5 (Hierarchical Data Format 5) Software Library and Utilities +Copyright 2006-2008 by The HDF Group (THG). + +NCSA HDF5 (Hierarchical Data Format 5) Software Library and Utilities +Copyright 1998-2006 by the Board of Trustees of the University of Illinois. -NCSA HDF5 (Hierarchical Data Format 5) Software Library and Utilities -Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 by the Board of -Trustees of the University of Illinois. All rights reserved. +All rights reserved. -Contributors: National Center for Supercomputing Applications (NCSA) at the -University of Illinois at Urbana-Champaign (UIUC), Lawrence Livermore -National Laboratory (LLNL), Sandia National Laboratories (SNL), Los Alamos -National Laboratory (LANL), Jean-loup Gailly and Mark Adler (gzip library). +Contributors: National Center for Supercomputing Applications (NCSA) at +the University of Illinois, Fortner Software, Unidata Program Center (netCDF), +The Independent JPEG Group (JPEG), Jean-loup Gailly and Mark Adler (gzip), +and Digital Equipment Corporation (DEC). -Redistribution and use in source and binary forms, with or without -modification, are permitted for any purpose (including commercial purposes) +Redistribution and use in source and binary forms, with or without +modification, are permitted for any purpose (including commercial purposes) provided that the following conditions are met: -1. Redistributions of source code must retain the above copyright notice, - this list of conditions, and the following disclaimer. +1. Redistributions of source code must retain the above copyright notice, + this list of conditions, and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions, and the following disclaimer in the documentation - and/or materials provided with the distribution. +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions, and the following disclaimer in the documentation + and/or materials provided with the distribution. -3. In addition, redistributions of modified forms of the source or binary - code must carry prominent notices stating that the original code was - changed and the date of the change. +3. In addition, redistributions of modified forms of the source or binary + code must carry prominent notices stating that the original code was + changed and the date of the change. -4. All publications or advertising materials mentioning features or use of - this software are asked, but not required, to acknowledge that it was - developed by the National Center for Supercomputing Applications at the - University of Illinois at Urbana-Champaign and to credit the contributors. +4. All publications or advertising materials mentioning features or use of + this software are asked, but not required, to acknowledge that it was + developed by The HDF Group and by the National Center for Supercomputing + Applications at the University of Illinois at Urbana-Champaign and + credit the contributors. -5. Neither the name of the University nor the names of the Contributors may - be used to endorse or promote products derived from this software without - specific prior written permission from the University or the Contributors, - as appropriate for the name(s) to be used. +5. Neither the name of The HDF Group, the name of the University, nor the + name of any Contributor may be used to endorse or promote products derived + from this software without specific prior written permission from the + University, THG, or the Contributor, respectively. -6. THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY AND THE CONTRIBUTORS "AS IS" - WITH NO WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED. In no event - shall the University or the Contributors be liable for any damages - suffered by the users arising out of the use of this software, even if - advised of the possibility of such damage. +DISCLAIMER: +THIS SOFTWARE IS PROVIDED BY THE HDF GROUP (THG) AND THE CONTRIBUTORS +"AS IS" WITH NO WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED. In no +event shall THG or the Contributors be liable for any damages suffered by +the users arising out of the use of this software, even if advised of the +possibility of such damage. --------------------------------------------------------------------------- +----------------------------------------------------------------------------- Portions of HDF5 were developed with support from the University of -California, Lawrence Livermore National Laboratory (UC LLNL). -The following statement applies to those portions of the product -and must be retained in any redistribution of source code, binaries, -documentation, and/or accompanying materials: - - This work was partially produced at the University of California, - Lawrence Livermore National Laboratory (UC LLNL) under contract no. - W-7405-ENG-48 (Contract 48) between the U.S. Department of Energy - (DOE) and The Regents of the University of California (University) - for the operation of UC LLNL. - - DISCLAIMER: - This work was prepared as an account of work sponsored by an agency - of the United States Government. Neither the United States - Government nor the University of California nor any of their - employees, makes any warranty, express or implied, or assumes any - liability or responsibility for the accuracy, completeness, or - usefulness of any information, apparatus, product, or process - disclosed, or represents that its use would not infringe privately- - owned rights. Reference herein to any specific commercial products, - process, or service by trade name, trademark, manufacturer, or - otherwise, does not necessarily constitute or imply its endorsement, - recommendation, or favoring by the United States Government or the - University of California. The views and opinions of authors - expressed herein do not necessarily state or reflect those of the - United States Government or the University of California, and shall - not be used for advertising or product endorsement purposes. --------------------------------------------------------------------------- +California, Lawrence Livermore National Laboratory (UC LLNL). +The following statement applies to those portions of the product and must +be retained in any redistribution of source code, binaries, documentation, +and/or accompanying materials: + + This work was partially produced at the University of California, + Lawrence Livermore National Laboratory (UC LLNL) under contract + no. W-7405-ENG-48 (Contract 48) between the U.S. Department of Energy + (DOE) and The Regents of the University of California (University) + for the operation of UC LLNL. + + DISCLAIMER: + This work was prepared as an account of work sponsored by an agency of + the United States Government. Neither the United States Government nor + the University of California nor any of their employees, makes any + warranty, express or implied, or assumes any liability or responsibility + for the accuracy, completeness, or usefulness of any information, + apparatus, product, or process disclosed, or represents that its use + would not infringe privately- owned rights. Reference herein to any + specific commercial products, process, or service by trade name, + trademark, manufacturer, or otherwise, does not necessarily constitute + or imply its endorsement, recommendation, or favoring by the United + States Government or the University of California. The views and + opinions of authors expressed herein do not necessarily state or reflect + those of the United States Government or the University of California, + and shall not be used for advertising or product endorsement purposes. +----------------------------------------------------------------------------- diff --git a/debian/rules b/debian/rules index f22fd91..1922565 100755 --- a/debian/rules +++ b/debian/rules @@ -65,6 +65,7 @@ endif # else DEBCC=gcc DEBCXX=g++ + DEBFORTRAN=gfortran # endif ### @@ -79,8 +80,9 @@ CONFIGURE_FLAGS = --prefix=/usr --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ --mandir=\$${prefix}/share/man \ --with-pthread --enable-threadsafe --enable-linux-lfs \ - --enable-shared --enable-production=$(USE_PROD) - + --enable-shared --enable-production=$(USE_PROD) \ + --enable-threadsafe +SERIAL_ONLY_FLAGS = --enable-cxx configure: configure-stamp-debian configure-stamp-serial configure-stamp-lam $(configure_stamp_openmpi) configure-stamp-mpich @@ -104,8 +106,8 @@ configure-stamp-serial: configure-stamp-debian dh_testdir -mkdir debian/build-serial # configure serial version - cd debian/build-serial && CC=$(DEBCC) CXX=$(DEBCXX) \ - ../../configure $(CONFIGURE_FLAGS) \ + cd debian/build-serial && CC=$(DEBCC) CXX=$(DEBCXX) F9X=$(DEBFORTRAN) \ + ../../configure $(CONFIGURE_FLAGS) $(SERIAL_ONLY_FLAGS) \ --enable-cxx touch configure-stamp-serial @@ -114,7 +116,7 @@ configure-stamp-lam: configure-stamp-debian -mkdir debian/build-lam # configure version with lam cd debian/build-lam && CPPFLAGS=-I/usr/include/lam \ - CC=mpicc.lam CXX=mpic++.lam RUNPARALLEL=/usr/bin/mpirun.lam \ + CC=mpicc.lam RUNPARALLEL=/usr/bin/mpirun.lam \ ../../configure $(CONFIGURE_FLAGS) \ --enable-parallel=yes touch configure-stamp-lam @@ -122,10 +124,10 @@ configure-stamp-lam: configure-stamp-debian configure-stamp-openmpi: configure-stamp-debian dh_testdir -mkdir debian/build-openmpi -# configure version with lam +# configure version with openmpi cd debian/build-openmpi && CPPFLAGS=-I/usr/lib/openmpi/include \ - CC=mpicc.openmpi CXX=mpic++.openmpi RUNPARALLEL=/usr/bin/mpirun.openmpi \ - ../../configure $(CONFIGURE_FLAGS) \ + CC=mpicc.openmpi F9X=mpif90.openmpi RUNPARALLEL=/usr/bin/mpirun.openmpi \ + ../../configure $(CONFIGURE_FLAGS) --enable-fortran \ --enable-parallel=yes touch configure-stamp-openmpi @@ -135,8 +137,8 @@ configure-stamp-mpich: configure-stamp-debian # configure version with mpich cd debian/build-mpich && CPPFLAGS=-I/usr/lib/mpich/include/ \ LDFLAGS=-L/usr/lib/mpich/lib/ CC=mpicc.mpich \ - CXX=mpiCC.mpich RUNPARALLEL=/usr/bin/mpirun.mpich \ - ../../configure $(CONFIGURE_FLAGS) \ + CXX=mpiCC.mpich F9X=mpif90.mpich RUNPARALLEL=/usr/bin/mpirun.mpich \ + ../../configure $(CONFIGURE_FLAGS) --enable-fortran \ --enable-parallel=yes touch configure-stamp-mpich -- Hierarchical Data Format 5 (HDF5) _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel