Author: frankie Date: 2009-09-25 08:53:42 +0000 (Fri, 25 Sep 2009) New Revision: 2496
Added: packages/netcdf/trunk/debian/README.source packages/netcdf/trunk/debian/libnetcdf6.dirs packages/netcdf/trunk/debian/netcdf-doc.dirs packages/netcdf/trunk/debian/patches/cfortran Removed: packages/netcdf/trunk/debian/README.Debian-source packages/netcdf/trunk/debian/libnetcdf4.dirs Modified: packages/netcdf/trunk/debian/changelog packages/netcdf/trunk/debian/control packages/netcdf/trunk/debian/copyright packages/netcdf/trunk/debian/libnetcdf-dev.dirs packages/netcdf/trunk/debian/netcdf-doc.docs packages/netcdf/trunk/debian/netcdf-doc.info packages/netcdf/trunk/debian/patches/series packages/netcdf/trunk/debian/rules packages/netcdf/trunk/debian/watch Log: Updated to 4.0.1 Deleted: packages/netcdf/trunk/debian/README.Debian-source =================================================================== --- packages/netcdf/trunk/debian/README.Debian-source 2009-09-24 10:17:31 UTC (rev 2495) +++ packages/netcdf/trunk/debian/README.Debian-source 2009-09-25 08:53:42 UTC (rev 2496) @@ -1,12 +0,0 @@ -The orig.tar.gz has changed from the upstream source. To recreate the -orig.tar.gz from the upstream source, follow these steps. - -1) Unpack source in parent directory of prior debianized source. -2) Rename unpacked source directory to oldname.orig (e.g. - netcdf-3.6.2.orig). -3) Cd to source directory (e.g. netcdf-3.6.2.orig) -4) Run "./configure" -5) Run "make distclean" -6) Cd to parent directory -7) The dpkg-source will create the orig.tar.gz for you when you build - Copied: packages/netcdf/trunk/debian/README.source (from rev 2482, packages/netcdf/trunk/debian/README.Debian-source) =================================================================== --- packages/netcdf/trunk/debian/README.source (rev 0) +++ packages/netcdf/trunk/debian/README.source 2009-09-25 08:53:42 UTC (rev 2496) @@ -0,0 +1,13 @@ +The upstream tarball is now maintained as a separate archive within +the .orig.tar.gz. It has to be saved in netcdf-<version>/upstream/ and the .orig tarball +needs to be crated running a command like: + +tar czvf tarballs/netcdf-<version>/netcdf_<version>.orig.tar.gz netcdf-<version> + +At build time, cdbs will create a build-tree/netcdf-<version> sub-tree in parallel +with the debian/ directory. Quilt can be as follows + +cd build-tree/netcdf-<version> +QUILT_PATCHES=$(pwd)/../debian/patches quilt <command> + +i.e. you have to consider the build-tree as its root tree. Modified: packages/netcdf/trunk/debian/changelog =================================================================== --- packages/netcdf/trunk/debian/changelog 2009-09-24 10:17:31 UTC (rev 2495) +++ packages/netcdf/trunk/debian/changelog 2009-09-25 08:53:42 UTC (rev 2496) @@ -1,3 +1,17 @@ +netcdf (1:4.0.1-1) experimental; urgency=low + + * New upstream release. This is a major update which adds new API support + and depends on HDF5. + * Added quilt support for patches. + * Patch introduced: + cfortran: update to cfortran.h 4.4 and fix for a proper gfortran 4.3 support. + * Introduced a README.source. + * Removed autotools depedencies because they are no more called at build-time. + * Upstream tarball is now maintained as a separate embedded file for easy cleanups. + * Rules file revised. + + -- Francesco Paolo Lovergine <fran...@debian.org> Mon, 21 Sep 2009 22:35:11 +0200 + netcdf (1:3.6.3-1) unstable; urgency=low * New maintainer set to DebianGis team list. Thanks Warren. Modified: packages/netcdf/trunk/debian/control =================================================================== --- packages/netcdf/trunk/debian/control 2009-09-24 10:17:31 UTC (rev 2495) +++ packages/netcdf/trunk/debian/control 2009-09-25 08:53:42 UTC (rev 2496) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> Uploaders: Francesco Paolo Lovergine <fran...@debian.org> -Build-Depends: cdbs, debhelper (>= 7), gfortran, texinfo, texlive-latex-base | tetex-bin, automake, libtool, quilt +Build-Depends: debhelper (>= 7), cdbs, gfortran, texinfo, quilt, zlib1g-dev, libhdf5-serial-dev Standards-Version: 3.8.3 Homepage: http://www.unidata.ucar.edu/software/netcdf/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-grass/packages/netcdf/ @@ -17,7 +17,7 @@ This package contains documentation for the NetCDF library in a variety of formats. -Package: libnetcdf4 +Package: libnetcdf6 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -28,12 +28,15 @@ machine-independent format for representing scientific data. Together, the interface, library, and format support the creation, access, and sharing of scientific data. + . + This package contains the C, C++ and Fortran77/90 run-time shared + libraries required by programs. Package: netcdf-dbg Section: debug Priority: extra Architecture: any -Depends: libnetcdf4 (= ${binary:Version}), ${misc:Depends} +Depends: libnetcdf6 (= ${binary:Version}), ${misc:Depends} Suggests: gdb Description: debugging symbols for NetCDF This package contains the files that make it possible to debug the @@ -43,8 +46,9 @@ Package: libnetcdf-dev Section: libdevel Architecture: any -Depends: libnetcdf4 (= ${binary:Version}), ${misc:Depends} +Depends: libnetcdf6 (= ${binary:Version}), ${misc:Depends} Suggests: netcdf-bin, netcdf-doc +Recommends: pkg-config Description: Development kit for NetCDF NetCDF (network Common Data Form) is an interface for scientific data access and a freely-distributed software library that provides an Modified: packages/netcdf/trunk/debian/copyright =================================================================== --- packages/netcdf/trunk/debian/copyright 2009-09-24 10:17:31 UTC (rev 2495) +++ packages/netcdf/trunk/debian/copyright 2009-09-25 08:53:42 UTC (rev 2496) @@ -6,6 +6,7 @@ released under the following license: Copyright (c) 2006-2007 Warren Turkal. +Copyright (c) 2009 Debian GIS Team. All rights reserved. Redistribution and use in source and binary forms, with or without Modified: packages/netcdf/trunk/debian/libnetcdf-dev.dirs =================================================================== --- packages/netcdf/trunk/debian/libnetcdf-dev.dirs 2009-09-24 10:17:31 UTC (rev 2495) +++ packages/netcdf/trunk/debian/libnetcdf-dev.dirs 2009-09-25 08:53:42 UTC (rev 2496) @@ -1,3 +1,4 @@ usr/lib usr/include usr/share/man +usr/lib/pkgconfig Deleted: packages/netcdf/trunk/debian/libnetcdf4.dirs =================================================================== --- packages/netcdf/trunk/debian/libnetcdf4.dirs 2009-09-24 10:17:31 UTC (rev 2495) +++ packages/netcdf/trunk/debian/libnetcdf4.dirs 2009-09-25 08:53:42 UTC (rev 2496) @@ -1 +0,0 @@ -usr/lib Copied: packages/netcdf/trunk/debian/libnetcdf6.dirs (from rev 2482, packages/netcdf/trunk/debian/libnetcdf4.dirs) =================================================================== --- packages/netcdf/trunk/debian/libnetcdf6.dirs (rev 0) +++ packages/netcdf/trunk/debian/libnetcdf6.dirs 2009-09-25 08:53:42 UTC (rev 2496) @@ -0,0 +1 @@ +usr/lib Added: packages/netcdf/trunk/debian/netcdf-doc.dirs =================================================================== --- packages/netcdf/trunk/debian/netcdf-doc.dirs (rev 0) +++ packages/netcdf/trunk/debian/netcdf-doc.dirs 2009-09-25 08:53:42 UTC (rev 2496) @@ -0,0 +1 @@ +usr/share/doc/netcdf-doc Modified: packages/netcdf/trunk/debian/netcdf-doc.docs =================================================================== --- packages/netcdf/trunk/debian/netcdf-doc.docs 2009-09-24 10:17:31 UTC (rev 2495) +++ packages/netcdf/trunk/debian/netcdf-doc.docs 2009-09-25 08:53:42 UTC (rev 2496) @@ -1,15 +1,15 @@ -man/ncdump-man-1.html -man/ncgen-man-1.html -man/netcdf-c.html -man/netcdf-cxx.html -man/netcdf-f77.html -man/netcdf_f77-man.html -man/netcdf-f90.html -man/netcdf_f90-man.html -man/netcdf.html -man/netcdf-install.html -man/netcdf-man-3.html -man/netcdf-tutorial.html +debian/tmp/doc/ncdump-man-1.html +debian/tmp/doc/ncgen-man-1.html +debian/tmp/doc/netcdf-c.html +debian/tmp/doc/netcdf-cxx.html +debian/tmp/doc/netcdf-f77.html +debian/tmp/doc/netcdf_f77-man.html +debian/tmp/doc/netcdf-f90.html +debian/tmp/doc/netcdf_f90-man.html +debian/tmp/doc/netcdf.html +debian/tmp/doc/netcdf-install.html +debian/tmp/doc/netcdf-man-3.html +debian/tmp/doc/netcdf-tutorial.html debian/tmp/usr/share/doc/netcdf/netcdf.ps debian/tmp/usr/share/doc/netcdf/netcdf-install.ps debian/tmp/usr/share/doc/netcdf/netcdf-c.ps Modified: packages/netcdf/trunk/debian/netcdf-doc.info =================================================================== --- packages/netcdf/trunk/debian/netcdf-doc.info 2009-09-24 10:17:31 UTC (rev 2495) +++ packages/netcdf/trunk/debian/netcdf-doc.info 2009-09-25 08:53:42 UTC (rev 2496) @@ -1,5 +1,6 @@ debian/tmp/usr/share/info/netcdf-tutorial.info debian/tmp/usr/share/info/netcdf-cxx.info +debian/tmp/usr/share/info/netcdf-cxx4.info debian/tmp/usr/share/info/netcdf-c.info debian/tmp/usr/share/info/netcdf-f77.info debian/tmp/usr/share/info/netcdf.info Added: packages/netcdf/trunk/debian/patches/cfortran =================================================================== --- packages/netcdf/trunk/debian/patches/cfortran (rev 0) +++ packages/netcdf/trunk/debian/patches/cfortran 2009-09-25 08:53:42 UTC (rev 2496) @@ -0,0 +1,499 @@ +Index: netcdf-4.0.1/fortran/cfortran.h +=================================================================== +--- netcdf-4.0.1.orig/fortran/cfortran.h 2006-04-11 01:46:59.000000000 +0200 ++++ netcdf-4.0.1/fortran/cfortran.h 2009-09-24 21:10:08.000000000 +0200 +@@ -1,6 +1,6 @@ +-/* cfortran.h 4.3 */ ++/* cfortran.h 4.4 */ + /* http://www-zeus.desy.de/~burow/cfortran/ */ +-/* Burkhard Burow bu...@desy.de 1990 - 2001. */ ++/* Burkhard Burow bu...@desy.de 1990 - 2002. */ + + #ifndef __CFORTRAN_LOADED + #define __CFORTRAN_LOADED +@@ -11,11 +11,78 @@ + MODIFYING, COPYING AND DISTRIBUTING THE CFORTRAN.H PACKAGE. + */ + ++/* The following modifications were made by the authors of CFITSIO or by me. ++ * They are flagged below with CFITSIO, the author's initials, or KMCCARTY. ++ * PDW = Peter Wilson ++ * DM = Doug Mink ++ * LEB = Lee E Brotzman ++ * MR = Martin Reinecke ++ * WDP = William D Pence ++ * -- Kevin McCarty, for Debian (19 Dec. 2005) */ ++ ++/******* ++ Modifications: ++ Oct 1997: Changed symbol name extname to appendus (PDW/HSTX) ++ (Conflicted with a common variable name in FTOOLS) ++ Nov 1997: If g77Fortran defined, also define f2cFortran (PDW/HSTX) ++ Feb 1998: Let VMS see the NUM_ELEMS code. Lets programs treat ++ single strings as vectors with single elements ++ Nov 1999: If macintoxh defined, also define f2cfortran (for Mac OS-X) ++ Apr 2000: If WIN32 defined, also define PowerStationFortran and ++ VISUAL_CPLUSPLUS (Visual C++) ++ Jun 2000: If __GNUC__ and linux defined, also define f2cFortran ++ (linux/gcc environment detection) ++ Apr 2002: If __CYGWIN__ is defined, also define f2cFortran ++ Nov 2002: If __APPLE__ defined, also define f2cfortran (for Mac OS-X) ++ ++ Nov 2003: If __INTEL_COMPILER or INTEL_COMPILER defined, also define ++ f2cFortran (KMCCARTY) ++ Dec 2005: If f2cFortran is defined, enforce REAL functions in FORTRAN ++ returning "double" in C. This was one of the items on ++ Burkhard's TODO list. (KMCCARTY) ++ Dec 2005: Modifications to support 8-byte integers. (MR) ++ USE AT YOUR OWN RISK! ++ Feb 2006 Added logic to typedef the symbol 'LONGLONG' to an appropriate ++ intrinsic 8-byte integer datatype (WDP) ++ Apr 2006: Modifications to support gfortran (and g77 with -fno-f2c flag) ++ since by default it returns "float" for FORTRAN REAL function. ++ (KMCCARTY) ++ May 2008: Revert commenting out of "extern" in COMMON_BLOCK_DEF macro. ++ Add braces around do-nothing ";" in 3 empty while blocks to ++ get rid of compiler warnings. Thanks to ROOT developers ++ Jacek Holeczek and Rene Brun for these suggestions. (KMCCARTY) ++ Aug 2008: If __GNUC__ is defined and no FORTRAN compiler is specified ++ via a #define or -D, default to gfortran behavior rather than ++ g77 behavior. (KMCCARTY) ++ *******/ ++ + /* + Avoid symbols already used by compilers and system *.h: + __ - OSF1 zukal06 V3.0 347 alpha, cc -c -std1 cfortest.c + +- */ ++*/ ++ ++/* ++ Determine what 8-byte integer data type is available. ++ 'long long' is now supported by most compilers, but older ++ MS Visual C++ compilers before V7.0 use '__int64' instead. (WDP) ++*/ ++ ++#ifndef LONGLONG_TYPE /* this may have been previously defined */ ++#if defined(_MSC_VER) /* Microsoft Visual C++ */ ++ ++#if (_MSC_VER < 1300) /* versions earlier than V7.0 do not have 'long long' */ ++ typedef __int64 LONGLONG; ++#else /* newer versions do support 'long long' */ ++ typedef long long LONGLONG; ++#endif ++ ++#else ++ typedef long long LONGLONG; ++#endif ++ ++#define LONGLONG_TYPE ++#endif + + + /* First prepare for the C compiler. */ +@@ -75,15 +142,15 @@ + + /* Remainder of cfortran.h depends on the Fortran compiler. */ + +-#if defined(CLIPPERFortran) || defined(pgiFortran) || defined(__CYGWIN32__) +-#ifndef f2cFortran ++/* 11/29/2003 (KMCCARTY): add *INTEL_COMPILER symbols here */ ++/* 04/05/2006 (KMCCARTY): add gFortran symbol here */ ++#if defined(CLIPPERFortran) || defined(pgiFortran) || defined(__INTEL_COMPILER) || defined(INTEL_COMPILER) || defined(gFortran) + #define f2cFortran + #endif +-#endif + + /* VAX/VMS does not let us \-split long #if lines. */ + /* Split #if into 2 because some HP-UX can't handle long #if */ +-#if !(defined(NAGf90Fortran)||defined(f2cFortran)||defined(hpuxFortran)||defined(apolloFortran)||defined(sunFortran)||defined(IBMR2Fortran)||defined(CRAYFortran)||defined(PATHSCALE_COMPILER)||defined(gFortran)) ++#if !(defined(NAGf90Fortran)||defined(f2cFortran)||defined(hpuxFortran)||defined(apolloFortran)||defined(sunFortran)||defined(IBMR2Fortran)||defined(CRAYFortran)) + #if !(defined(mipsFortran)||defined(DECFortran)||defined(vmsFortran)||defined(CONVEXFortran)||defined(PowerStationFortran)||defined(AbsoftUNIXFortran)||defined(AbsoftProFortran)||defined(SXFortran)) + /* If no Fortran compiler is given, we choose one for the machines we know. */ + #if defined(lynx) || defined(VAXUltrix) +@@ -92,6 +159,31 @@ + Support f2c or f77 with gcc, vcc with f2c. + f77 with vcc works, missing link magic for f77 I/O.*/ + #endif ++/* 04/13/00 DM (CFITSIO): Add these lines for NT */ ++/* with PowerStationFortran and and Visual C++ */ ++#if defined(WIN32) && !defined(__CYGWIN__) ++#define PowerStationFortran ++#define VISUAL_CPLUSPLUS ++#endif ++#if defined(g77Fortran) /* 11/03/97 PDW (CFITSIO) */ ++#define f2cFortran ++#endif ++#if defined(__CYGWIN__) /* 04/11/02 LEB (CFITSIO) */ ++#define f2cFortran ++#define gFortran /* 8/26/08 (KMCCARTY) */ ++#endif ++#if defined(__GNUC__) && defined(linux) /* 06/21/00 PDW (CFITSIO) */ ++#define f2cFortran ++#define gFortran /* 8/26/08 (KMCCARTY) */ ++#endif ++#if defined(macintosh) /* 11/1999 (CFITSIO) */ ++#define f2cFortran ++#define gFortran /* 8/26/08 (KMCCARTY) */ ++#endif ++#if defined(__APPLE__) /* 11/2002 (CFITSIO) */ ++#define f2cFortran ++#define gFortran /* 8/26/08 (KMCCARTY) */ ++#endif + #if defined(__hpux) /* 921107: Use __hpux instead of __hp9000s300 */ + #define hpuxFortran /* Should also allow hp9000s7/800 use.*/ + #endif +@@ -125,17 +217,15 @@ + #if defined(VISUAL_CPLUSPLUS) + #define PowerStationFortran + #endif +-#if defined(__PATHCC__) +-#define PATHSCALE_COMPILER +-#endif + #endif /* ...Fortran */ + #endif /* ...Fortran */ + + /* Split #if into 2 because some HP-UX can't handle long #if */ +-#if !(defined(NAGf90Fortran)||defined(f2cFortran)||defined(hpuxFortran)||defined(apolloFortran)||defined(sunFortran)||defined(IBMR2Fortran)||defined(CRAYFortran)||defined(PATHSCALE_COMPILER)||defined(gFortran)) ++#if !(defined(NAGf90Fortran)||defined(f2cFortran)||defined(hpuxFortran)||defined(apolloFortran)||defined(sunFortran)||defined(IBMR2Fortran)||defined(CRAYFortran)) + #if !(defined(mipsFortran)||defined(DECFortran)||defined(vmsFortran)||defined(CONVEXFortran)||defined(PowerStationFortran)||defined(AbsoftUNIXFortran)||defined(AbsoftProFortran)||defined(SXFortran)) + /* If your compiler barfs on ' #error', replace # with the trigraph for # */ + #error "cfortran.h: Can't find your environment among:\ ++ - GNU gcc (gfortran) on Linux. \ + - MIPS cc and f77 2.0. (e.g. Silicon Graphics, DECstations, ...) \ + - IBM AIX XL C and FORTRAN Compiler/6000 Version 01.01.0000.0000 \ + - VAX VMS CC 3.1 and FORTRAN 5.4. \ +@@ -152,12 +242,14 @@ + - VAXUltrix: vcc,cc or gcc with f2c. gcc or cc with f77. \ + - f77 with vcc works; but missing link magic for f77 I/O. \ + - NO fort. None of gcc, cc or vcc generate required names.\ +- - f2c : Use #define f2cFortran, or cc -Df2cFortran \ ++ - f2c/g77: Use #define f2cFortran, or cc -Df2cFortran \ ++ - gfortran: Use #define gFortran, or cc -DgFortran \ ++ (also necessary for g77 with -fno-f2c option) \ + - NAG f90: Use #define NAGf90Fortran, or cc -DNAGf90Fortran \ + - Absoft UNIX F77: Use #define AbsoftUNIXFortran or cc -DAbsoftUNIXFortran \ + - Absoft Pro Fortran: Use #define AbsoftProFortran \ + - Portland Group Fortran: Use #define pgiFortran \ +- - PathScale Fortran: Use #define PATHSCALE_COMPILER" ++ - Intel Fortran: Use #define INTEL_COMPILER" + /* Compiler must throw us out at this point! */ + #endif + #endif +@@ -170,7 +262,8 @@ + + /* Throughout cfortran.h we use: UN = Uppercase Name. LN = Lowercase Name. */ + +-#if defined(f2cFortran) || defined(NAGf90Fortran) || defined(DECFortran) || defined(mipsFortran) || defined(apolloFortran) || defined(sunFortran) || defined(CONVEXFortran) || defined(SXFortran) || defined(extname) || defined(PATHSCALE_COMPILER) || defined(gFortran) ++/* "extname" changed to "appendus" below (CFITSIO) */ ++#if defined(f2cFortran) || defined(NAGf90Fortran) || defined(DECFortran) || defined(mipsFortran) || defined(apolloFortran) || defined(sunFortran) || defined(CONVEXFortran) || defined(SXFortran) || defined(appendus) + #define CFC_(UN,LN) _(LN,_) /* Lowercase FORTRAN symbols. */ + #define orig_fcallsc(UN,LN) CFC_(UN,LN) + #else +@@ -349,7 +442,7 @@ + [DECFortran for Ultrix RISC is also called f77 but is the same as VAX/VMS.] + [MIPS f77 treats .eqv./.neqv. as .eq./.ne. and hence requires LOGICAL_STRICT.]*/ + +-#if defined(NAGf90Fortran) || defined(f2cFortran) || defined(mipsFortran) || defined(PowerStationFortran) || defined(hpuxFortran800) || defined(AbsoftUNIXFortran) || defined(AbsoftProFortran) || defined(SXFortran) || defined(PATHSCALE_COMPILER) ++#if defined(NAGf90Fortran) || defined(f2cFortran) || defined(mipsFortran) || defined(PowerStationFortran) || defined(hpuxFortran800) || defined(AbsoftUNIXFortran) || defined(AbsoftProFortran) || defined(SXFortran) + /* SX/PowerStationFortran have 0 and 1 defined, others are neither T nor F. */ + /* hpuxFortran800 has 0 and 0x01000000 defined. Others are unknown. */ + #define LOGICAL_STRICT /* Other Fortran have .eqv./.neqv. == .eq./.ne. */ +@@ -459,7 +552,7 @@ + {char *e; + e = s + strlen(s); + if (e>s) { /* Need this to handle NULL string.*/ +- while (e>s && *--e==t); /* Don't follow t's past beginning. */ ++ while (e>s && *--e==t) {;} /* Don't follow t's past beginning. */ + e[*e==t?0:1] = '\0'; /* Handle s[0]=t correctly. */ + } return s; } + +@@ -475,7 +568,7 @@ + { + if (e==s) *e = '\0'; /* Kill the string makes sense here.*/ + else if (e>s) { /* Watch out for neg. length string.*/ +- while (e>s && *--e==t); /* Don't follow t's past beginning. */ ++ while (e>s && *--e==t){;} /* Don't follow t's past beginning. */ + e[*e==t?0:1] = '\0'; /* Handle s[0]=t correctly. */ + } return s; } + +@@ -518,7 +611,7 @@ + *( (F).dsc$l_m[0]=(F).dsc$bounds[0].dsc$l_u=(ELEMNO) ), \ + (F).dsc$a_a0 = ( (F).dsc$a_pointer=(C) ) - (F).dsc$w_length ,(F)) + +-#else ++#endif /* PDW: 2/10/98 (CFITSIO) -- Let VMS see NUM_ELEMS definitions */ + #define _NUM_ELEMS -1 + #define _NUM_ELEM_ARG -2 + #define NUM_ELEMS(A) A,_NUM_ELEMS +@@ -540,13 +633,18 @@ + return term_char; + if (num_term <=0) num_term = (int)elem_len; + for (num=0; ; num++) { +- for (i=0; i<(unsigned)num_term && *strv==term_char; i++,strv++); ++ for (i=0; i<(unsigned)num_term && *strv==term_char; i++,strv++){;} + if (i==(unsigned)num_term) break; + else strv += elem_len-i; + } ++if (0) { /* to prevent not used warnings in gcc (added by ROOT) */ ++ c2fstrv(0, 0, 0, 0); f2cstrv(0, 0, 0, 0); kill_trailing(0, 0); ++ vkill_trailing(0, 0, 0, 0); num_elem(0, 0, 0, 0); ++} + return (int)num; + } +-#endif ++/* #endif removed 2/10/98 (CFITSIO) */ ++ + /*-------------------------------------------------------------------------*/ + + /* UTILITIES FOR C TO USE STRINGS IN FORTRAN COMMON BLOCKS */ +@@ -657,8 +755,8 @@ + #define PSTRINGV_cfV(T,A,B,F) static fstringvector B = \ + {0,DSC$K_DTYPE_T,DSC$K_CLASS_A,NULL,0,0,{0,0,1,1,1},1,0,NULL,0,{1,0}}; + #else +-#define STRING_cfV(T,A,B,F) struct {unsigned int clen, flen;} B; +-#define STRINGV_cfV(T,A,B,F) struct {char *s, *fs; unsigned flen;} B; ++#define STRING_cfV(T,A,B,F) struct {unsigned int clen, flen; char *nombre;} B; ++#define STRINGV_cfV(T,A,B,F) struct {char *s, *fs; unsigned flen; char *nombre;} B; + #define PSTRING_cfV(T,A,B,F) int B; + #define PSTRINGV_cfV(T,A,B,F) struct{char *fs; unsigned int sizeofA,flen;}B; + #endif +@@ -776,7 +874,7 @@ + #define DEFAULT_cfW(A,B) + #define LOGICAL_cfW(A,B) + #define PLOGICAL_cfW(A,B) *B=F2CLOGICAL(*B); +-#define STRING_cfW(A,B) (A[B.clen]!='\0'?A[B.clen]='\0':0); /* A?="constnt"*/ ++#define STRING_cfW(A,B) (B.nombre=A,B.nombre[B.clen]!='\0'?B.nombre[B.clen]='\0':0); /* A?="constnt"*/ + #define PSTRING_cfW(A,B) kill_trailing(A,' '); + #ifdef vmsFortran + #define STRINGV_cfW(A,B) _cf_free(B.dsc$a_pointer); +@@ -1324,6 +1422,7 @@ + #define INTVVVVVVV_cfTYPE int + #define LOGICALVVVVVVV_cfTYPE int + #define LONGVVVVVVV_cfTYPE long ++#define LONGLONGVVVVVVV_cfTYPE LONGLONG /* added by MR December 2005 */ + #define SHORTVVVVVVV_cfTYPE short + #define PBYTE_cfTYPE INTEGER_BYTE + #define PDOUBLE_cfTYPE DOUBLE_PRECISION +@@ -1331,6 +1430,7 @@ + #define PINT_cfTYPE int + #define PLOGICAL_cfTYPE int + #define PLONG_cfTYPE long ++#define PLONGLONG_cfTYPE LONGLONG /* added by MR December 2005 */ + #define PSHORT_cfTYPE short + + #define CFARGS0(A,T,V,W,X,Y,Z) _3(T,_cf,A) +@@ -1348,6 +1448,7 @@ + #define INT_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) + #define LOGICAL_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) + #define LONG_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) ++#define LONGLONG_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ + #define SHORT_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) + #define PBYTE_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) + #define PDOUBLE_cfINT(N,A,B,X,Y,Z) _(CFARGS,N)(A,PINT,B,X,Y,Z,0) +@@ -1355,6 +1456,7 @@ + #define PINT_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) + #define PLOGICAL_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) + #define PLONG_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) ++#define PLONGLONG_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ + #define PSHORT_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) + #define BYTEV_cfINT(N,A,B,X,Y,Z) DOUBLEV_cfINT(N,A,B,X,Y,Z) + #define BYTEVV_cfINT(N,A,B,X,Y,Z) DOUBLEVV_cfINT(N,A,B,X,Y,Z) +@@ -1398,6 +1500,13 @@ + #define LONGVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVV_cfINT(N,A,B,X,Y,Z) + #define LONGVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVV_cfINT(N,A,B,X,Y,Z) + #define LONGVVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVVV_cfINT(N,A,B,X,Y,Z) ++#define LONGLONGV_cfINT(N,A,B,X,Y,Z) DOUBLEV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVV_cfINT(N,A,B,X,Y,Z) DOUBLEVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ ++#define LONGLONGVVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */ + #define SHORTV_cfINT(N,A,B,X,Y,Z) DOUBLEV_cfINT(N,A,B,X,Y,Z) + #define SHORTVV_cfINT(N,A,B,X,Y,Z) DOUBLEVV_cfINT(N,A,B,X,Y,Z) + #define SHORTVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVV_cfINT(N,A,B,X,Y,Z) +@@ -1457,7 +1566,12 @@ + #define BYTE_cfPU(A) CFextern INTEGER_BYTE FCALLSC_QUALIFIER A + #define DOUBLE_cfPU(A) CFextern DOUBLE_PRECISION FCALLSC_QUALIFIER A + #if ! (defined(FLOATFUNCTIONTYPE)&&defined(ASSIGNFLOAT)&&defined(RETURNFLOAT)) ++#if defined (f2cFortran) && ! defined (gFortran) ++/* f2c/g77 return double from FORTRAN REAL functions. (KMCCARTY, 2005/12/09) */ ++#define FLOAT_cfPU(A) CFextern DOUBLE_PRECISION FCALLSC_QUALIFIER A ++#else + #define FLOAT_cfPU(A) CFextern FORTRAN_REAL FCALLSC_QUALIFIER A ++#endif + #else + #define FLOAT_cfPU(A) CFextern FLOATFUNCTIONTYPE FCALLSC_QUALIFIER A + #endif +@@ -1595,6 +1709,7 @@ + #define INT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define LOGICAL_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,LOGICAL,A,B,C,D,E) + #define LONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) ++#define LONGLONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ + #define SHORT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define BYTEV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define BYTEVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) +@@ -1638,6 +1753,13 @@ + #define LONGVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define LONGVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define LONGVVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) ++#define LONGLONGV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ ++#define LONGLONGVVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ + #define SHORTV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define SHORTVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define SHORTVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) +@@ -1651,6 +1773,7 @@ + #define PINT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define PLOGICAL_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,PLOGICAL,A,B,C,D,E) + #define PLONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) ++#define PLONGLONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */ + #define PSHORT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) + #define STRING_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,STRING,A,B,C,D,E) + #define PSTRING_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,PSTRING,A,B,C,D,E) +@@ -1679,9 +1802,9 @@ + B.dsc$w_length=strlen(A): (A[C-1]='\0',B.dsc$w_length=strlen(A), \ + memset((A)+B.dsc$w_length,' ',C-B.dsc$w_length-1), B.dsc$w_length=C-1)); + #else +-#define STRING_cfC(M,I,A,B,C) (B.clen=strlen(A), \ ++#define STRING_cfC(M,I,A,B,C) (B.nombre=A,B.clen=strlen(A), \ + C==sizeof(char*)||C==(unsigned)(B.clen+1)?B.flen=B.clen: \ +- (memset((A)+B.clen,' ',C-B.clen-1),A[B.flen=C-1]='\0')); ++ (memset(B.nombre+B.clen,' ',C-B.clen-1),B.nombre[B.flen=C-1]='\0')); + #define PSTRING_cfC(M,I,A,B,C) (C==sizeof(char*)? B=strlen(A): \ + (A[C-1]='\0',B=strlen(A),memset((A)+B,' ',C-B-1),B=C-1)); + #endif +@@ -1963,6 +2086,7 @@ + #define INT_cfT(M,I,A,B,D) *A + #define LOGICAL_cfT(M,I,A,B,D) F2CLOGICAL(*A) + #define LONG_cfT(M,I,A,B,D) *A ++#define LONGLONG_cfT(M,I,A,B,D) *A /* added by MR December 2005 */ + #define SHORT_cfT(M,I,A,B,D) *A + #define BYTEV_cfT(M,I,A,B,D) A + #define DOUBLEV_cfT(M,I,A,B,D) A +@@ -1970,6 +2094,7 @@ + #define INTV_cfT(M,I,A,B,D) A + #define LOGICALV_cfT(M,I,A,B,D) A + #define LONGV_cfT(M,I,A,B,D) A ++#define LONGLONGV_cfT(M,I,A,B,D) A /* added by MR December 2005 */ + #define SHORTV_cfT(M,I,A,B,D) A + #define BYTEVV_cfT(M,I,A,B,D) (void *)A /* We have to cast to void *,*/ + #define BYTEVVV_cfT(M,I,A,B,D) (void *)A /* since we don't know the */ +@@ -2007,6 +2132,12 @@ + #define LONGVVVVV_cfT(M,I,A,B,D) (void *)A + #define LONGVVVVVV_cfT(M,I,A,B,D) (void *)A + #define LONGVVVVVVV_cfT(M,I,A,B,D) (void *)A ++#define LONGLONGVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVVVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ ++#define LONGLONGVVVVVVV_cfT(M,I,A,B,D) (void *)A /* added by MR December 2005 */ + #define SHORTVV_cfT(M,I,A,B,D) (void *)A + #define SHORTVVV_cfT(M,I,A,B,D) (void *)A + #define SHORTVVVV_cfT(M,I,A,B,D) (void *)A +@@ -2019,6 +2150,7 @@ + #define PINT_cfT(M,I,A,B,D) A + #define PLOGICAL_cfT(M,I,A,B,D) ((*A=F2CLOGICAL(*A)),A) + #define PLONG_cfT(M,I,A,B,D) A ++#define PLONGLONG_cfT(M,I,A,B,D) A /* added by MR December 2005 */ + #define PSHORT_cfT(M,I,A,B,D) A + #define PVOID_cfT(M,I,A,B,D) A + #if defined(apolloFortran) || defined(hpuxFortran800) || defined(AbsoftUNIXFortran) +@@ -2089,12 +2221,18 @@ + #define INT_cfFZ(UN,LN) int FCALLSC_QUALIFIER fcallsc(UN,LN)( + #define LOGICAL_cfFZ(UN,LN) int FCALLSC_QUALIFIER fcallsc(UN,LN)( + #define LONG_cfFZ(UN,LN) long FCALLSC_QUALIFIER fcallsc(UN,LN)( ++#define LONGLONG_cfFZ(UN,LN) LONGLONG FCALLSC_QUALIFIER fcallsc(UN,LN)( /* added by MR December 2005 */ + #define SHORT_cfFZ(UN,LN) short FCALLSC_QUALIFIER fcallsc(UN,LN)( + #define VOID_cfFZ(UN,LN) void FCALLSC_QUALIFIER fcallsc(UN,LN)( + #ifndef __CF__KnR + /* The void is req'd by the Apollo, to make this an ANSI function declaration. + The Apollo promotes K&R float functions to double. */ +-#define FLOAT_cfFZ(UN,LN) FORTRAN_REAL FCALLSC_QUALIFIER fcallsc(UN,LN)(void ++#if defined (f2cFortran) && ! defined (gFortran) ++/* f2c/g77 return double from FORTRAN REAL functions. (KMCCARTY, 2005/12/09) */ ++#define FLOAT_cfFZ(UN,LN) DOUBLE_PRECISION FCALLSC_QUALIFIER fcallsc(UN,LN)(void ++#else ++#define FLOAT_cfFZ(UN,LN) FORTRAN_REAL FCALLSC_QUALIFIER fcallsc(UN,LN)(void ++#endif + #ifdef vmsFortran + #define STRING_cfFZ(UN,LN) void FCALLSC_QUALIFIER fcallsc(UN,LN)(fstring *AS + #else +@@ -2110,7 +2248,12 @@ + #endif + #else + #if ! (defined(FLOATFUNCTIONTYPE)&&defined(ASSIGNFLOAT)&&defined(RETURNFLOAT)) ++#if defined (f2cFortran) && ! defined (gFortran) ++/* f2c/g77 return double from FORTRAN REAL functions. (KMCCARTY, 2005/12/09) */ ++#define FLOAT_cfFZ(UN,LN) DOUBLE_PRECISION FCALLSC_QUALIFIER fcallsc(UN,LN)( ++#else + #define FLOAT_cfFZ(UN,LN) FORTRAN_REAL FCALLSC_QUALIFIER fcallsc(UN,LN)( ++#endif + #else + #define FLOAT_cfFZ(UN,LN) FLOATFUNCTIONTYPE FCALLSC_QUALIFIER fcallsc(UN,LN)( + #endif +@@ -2124,13 +2267,19 @@ + #define BYTE_cfF(UN,LN) BYTE_cfFZ(UN,LN) + #define DOUBLE_cfF(UN,LN) DOUBLE_cfFZ(UN,LN) + #ifndef __CF_KnR ++#if defined (f2cFortran) && ! defined (gFortran) ++/* f2c/g77 return double from FORTRAN REAL functions. (KMCCARTY, 2005/12/09) */ ++#define FLOAT_cfF(UN,LN) DOUBLE_PRECISION FCALLSC_QUALIFIER fcallsc(UN,LN)( ++#else + #define FLOAT_cfF(UN,LN) FORTRAN_REAL FCALLSC_QUALIFIER fcallsc(UN,LN)( ++#endif + #else + #define FLOAT_cfF(UN,LN) FLOAT_cfFZ(UN,LN) + #endif + #define INT_cfF(UN,LN) INT_cfFZ(UN,LN) + #define LOGICAL_cfF(UN,LN) LOGICAL_cfFZ(UN,LN) + #define LONG_cfF(UN,LN) LONG_cfFZ(UN,LN) ++#define LONGLONG_cfF(UN,LN) LONGLONG_cfFZ(UN,LN) /* added by MR December 2005 */ + #define SHORT_cfF(UN,LN) SHORT_cfFZ(UN,LN) + #define VOID_cfF(UN,LN) VOID_cfFZ(UN,LN) + #define STRING_cfF(UN,LN) STRING_cfFZ(UN,LN), +@@ -2193,6 +2342,7 @@ + #define LOGICAL_cfI return C2FLOGICAL(A0); + #endif + #define LONG_cfI return A0; ++#define LONGLONG_cfI return A0; /* added by MR December 2005 */ + #define SHORT_cfI return A0; + #define STRING_cfI return ; + #define VOID_cfI return ; +@@ -2367,4 +2517,3 @@ + + + #endif /* __CFORTRAN_LOADED */ +- +Index: netcdf-4.0.1/fortran/ncfortran.h +=================================================================== +--- netcdf-4.0.1.orig/fortran/ncfortran.h 2009-02-19 13:50:25.000000000 +0100 ++++ netcdf-4.0.1/fortran/ncfortran.h 2009-09-24 21:10:08.000000000 +0200 +@@ -660,7 +660,7 @@ + * The following is for f2c-support only. + */ + +-#if defined(f2cFortran) && !defined(pgiFortran) ++#if defined(f2cFortran) && !defined(pgiFortran) && !defined(gFortran) + + /* + * The f2c(1) utility on BSD/OS and Linux systems adds an additional +Index: netcdf-4.0.1/nf_test/fortlib.c +=================================================================== +--- netcdf-4.0.1.orig/nf_test/fortlib.c 2009-09-24 21:11:12.000000000 +0200 ++++ netcdf-4.0.1/nf_test/fortlib.c 2009-09-24 21:11:36.000000000 +0200 +@@ -14,7 +14,7 @@ + #include "../fortran/ncfortran.h" + + +-#if defined(f2cFortran) && !defined(pgiFortran) ++#if defined(f2cFortran) && !defined(pgiFortran) && !defined(gFortran) + /* + * The f2c(1) utility on BSD/OS and Linux systems adds an additional + * underscore suffix (besides the usual one) to global names that have Modified: packages/netcdf/trunk/debian/patches/series =================================================================== --- packages/netcdf/trunk/debian/patches/series 2009-09-24 10:17:31 UTC (rev 2495) +++ packages/netcdf/trunk/debian/patches/series 2009-09-25 08:53:42 UTC (rev 2496) @@ -1 +1,2 @@ # no patches currently +cfortran Modified: packages/netcdf/trunk/debian/rules =================================================================== --- packages/netcdf/trunk/debian/rules 2009-09-24 10:17:31 UTC (rev 2495) +++ packages/netcdf/trunk/debian/rules 2009-09-25 08:53:42 UTC (rev 2496) @@ -1,43 +1,45 @@ #!/usr/bin/make -f + +# change at every upstream upgrade +DEB_TAR_SRCDIR = netcdf-4.0.1 +DEB_TARBALL = $(CURDIR)/upstream/$(DEB_TAR_SRCDIR).tar.gz +SRC_TREE = $(CURDIR)/build-tree/$(DEB_TAR_SRCDIR) +include /usr/share/cdbs/1/rules/tarball.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk # Add here any variable or target overrides you need. -DEB_CONFIGURE_EXTRA_FLAGS := --enable-shared --enable-docs-install +# Note that hdf5 dir has to be specified due to a bug into fortran/Makefile.am which causes +# skipping of fort-nc4.c without that. +DEB_CONFIGURE_EXTRA_FLAGS := --enable-shared --enable-docs-install --enable-netcdf-4 --with-hdf5=/usr DEB_CONFIGURE_SCRIPT_ENV += FC="gfortran" DEB_CONFIGURE_SCRIPT_ENV += CXX="g++" DEB_CONFIGURE_SCRIPT_ENV += CC="gcc" +DEB_CONFIGURE_SCRIPT_ENV += CPPFLAGS="-DgFortran" DEB_MAKE_CHECK_TARGET = check -DEB_INSTALL_CHANGELOGS_ALL = RELEASE_NOTES +DEB_INSTALL_CHANGELOGS_ALL = $(CURDIR)/build-tree/$(DEB_TAR_SRCDIR)/RELEASE_NOTES # Any makebuilddir/binary would do, /source doesn't: -makebuilddir/libnetcdf4:: - autoreconf -vfi +#makebuilddir/libnetcdf4:: +# autoreconf -vfi -install/libnetcdf4:: - find debian/tmp/usr/lib/ ! -type d -a ! -name '*.so' -a ! -name '*.a' -a ! -name '*.la' -exec mv {} debian/libnetcdf4/usr/lib/ \; +install/libnetcdf6:: + find debian/tmp/usr/lib/ ! -type d -a ! -name '*.so' -a ! -name '*.a' -a ! -name '*.la' -exec mv {} debian/libnetcdf6/usr/lib/ \; install/libnetcdf-dev:: mv debian/tmp/usr/include/* debian/libnetcdf-dev/usr/include/ - find debian/tmp/usr/lib/ -type l -a -name '*.so' -exec mv {} debian/libnetcdf-dev/usr/lib/ \; - find debian/tmp/usr/lib/ -type f -a -name '*.a' -exec mv {} debian/libnetcdf-dev/usr/lib/ \; + install -m 644 -u root -g root $(SRC_TREE)/netcdf.pc debian/libnetcdf-dev/usr/lib/pkgconfig/. + find debian/tmp/usr/lib/ -type l -a -name '*.so' -exec cp {} debian/libnetcdf-dev/usr/lib/. \; + find debian/tmp/usr/lib/ -type f -a -name '*.a' -exec cp {} debian/libnetcdf-dev/usr/lib/. \; install/netcdf-bin:: mv debian/tmp/usr/bin/* debian/netcdf-bin/usr/bin/ -#clean:: -# for dir in netcdf netcdf-install netcdf-c netcdf-tutorial \ -# netcdf-f77 netcdf-f90 netcdf-cxx; do \ -# rm -rf man/$$dir; \ -# done -# netcdf-c netcdf-cxx netcdf-f77 netcdf-f90 \ -# netcdf-install netcdf-tutorial netcdf ; do \ -# rm -f man/$$file.ps man/$$file.pdf \ -# man/$$file.dvi; \ -# rm -f man/*.html -# rm -f ncdump/ctest.c ncdump/ctest64.c +install/netcdf-doc:: + install -m 644 -u root -g root $(SRC_TREE)/man4/*.html debian/tmp/doc/. + Modified: packages/netcdf/trunk/debian/watch =================================================================== --- packages/netcdf/trunk/debian/watch 2009-09-24 10:17:31 UTC (rev 2495) +++ packages/netcdf/trunk/debian/watch 2009-09-25 08:53:42 UTC (rev 2496) @@ -1,6 +1,3 @@ -# See uscan(1) for format - -# Compulsory line, this is a version 3 file version=3 #opts="uversionmangle=s/^[[:digit:]]*\.[[:digit:]]*-beta[[:digit:]]*/0.0.1/" \ ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-([[:digit:]\.]*)\.tar\.gz debian uupdate _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel