Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv29930/stable/main/finkinfo/sci
Modified Files:
netcdf-g.info netcdf.info
Log Message:
Sync with stable since netcdf7 has been moved (and because it's the same
in 10.7).
Index: netcdf-g.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/netcdf-g.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- netcdf-g.info 19 May 2011 20:16:49 -0000 1.4
+++ netcdf-g.info 15 Oct 2011 12:43:34 -0000 1.5
@@ -2,14 +2,16 @@
Package: netcdf-g%type_raw[fort]
Type: fort (95 fortran)
Version: 3.6.3
-Revision: 6
-Distribution: (%type_pkg[fort] = 95) 10.4, (%type_pkg[fort] = 95) 10.5
-BuildDepends: (%type_raw[fort] = fortran)gcc44, (%type_raw[fort] = 95)g95
+Revision: 8
+# Doesn't build on Lion, so DON'T MOVE IT.
+# Packages that depend on this should migrate to netcdf7-gfortran, if possible.
+Distribution: (%type_pkg[fort] = 95) 10.5, 10.6
+BuildDepends: (%type_raw[fort] = fortran)gcc44 | (%type_raw[fort] =
fortran)gcc45 | (%type_raw[fort] = fortran)gcc46, (%type_raw[fort] = 95)g95,
netcdf
BuildDependsOnly: True
Maintainer: Alexander Hansen <[email protected]>
Depends: %n-shlibs (= %v-%r)
-Conflicts: netcdf (<= 3.6.1-1003), netcdf-absoft
-Replaces: netcdf (<= 3.6.1-1003), netcdf-absoft, netcdf-g95, netcdf-gfortran
+Conflicts: netcdf (<= 3.6.1-1003), netcdf-absoft, netcdf7-gfortran
+Replaces: netcdf (<= 3.6.1-1003), netcdf-absoft, netcdf-g95, netcdf-gfortran,
netcdf7-gfortran
Source: ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-%v.tar.gz
Source-MD5: e03ca6eb3a0d9126162b9fe1725cfed3
SourceDirectory: netcdf-%v
@@ -60,7 +62,7 @@
with Fortran 77 and Fortran 90 code using the g%type_raw[fort] compiler.
Installs library and include files in %p/lib/%N to allow
-the netcdf-g95 and netcdf-gfortran packages to coexist.
+the netcdf-g95, netcdf-gfortran, and netcdf7-gfortran packages to coexist.
<<
DescPackaging: <<
This Fortran interface is created as a different package so that users
Index: netcdf.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/netcdf.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- netcdf.info 19 May 2011 11:49:17 -0000 1.7
+++ netcdf.info 15 Oct 2011 12:43:34 -0000 1.8
@@ -1,18 +1,17 @@
Package: netcdf
Version: 3.6.3
-Revision: 3
+Revision: 4
BuildDependsOnly: True
GCC: 4.0
Maintainer: Alexander Hansen <[email protected]>
Depends: %n-shlibs (= %v-%r), %n-bin (= %v-%r)
-Conflicts: %n-absoft
-Replaces: %n-absoft
+Conflicts: %n-absoft, %N7
+Replaces: %n-absoft, %N7
BuildConflicts: g95
Source: ftp://ftp.unidata.ucar.edu/pub/%n/%n-%v.tar.gz
Source-MD5: e03ca6eb3a0d9126162b9fe1725cfed3
SourceDirectory: %n-%v
NoSetCPPFlags: true
-#Patch: %n.patch
ConfigureParams: <<
--enable-shared CFLAGS=-O2 CXXFLAGS=-O2 --disable-static \
--mandir='${prefix}/share/man' --enable-docs-install
--docdir='${prefix}/share/doc/%n' \
@@ -48,8 +47,8 @@
SplitOff2: <<
Package: %N-bin
Depends: %N-shlibs (= %v-%r)
- Conflicts: %N-absoft-bin
- Replaces: %N-absoft-bin, %N (<= 3.5.0-6), %N-absoft (<= 3.5.1-2)
+ Conflicts: %N-absoft-bin, %N7-bin
+ Replaces: %N-absoft-bin, %N (<= 3.5.0-6), %N-absoft (<= 3.5.1-2), %N7-bin
Files: bin share/man/man1 share/doc/%N/*-man-1.html
DocFiles: COPYRIGHT README RELEASE_NOTES
<<
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2d-oct
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
