[SCM] netcdf branch, master, updated. upstream/4.1.1-15-g7508c4c

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 7508c4caebc99760ee1afae4927eee83ea809b0e
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Nov 30 13:46:54 2011 +0100

    Splitted libcf and libnetcdf for a better support of different APIs.

diff --git a/debian/changelog b/debian/changelog
index 9963e98..6701d35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,13 @@ netcdf (1:4.1.3-1~exp1) experimental; urgency=low
   * Moved to source format 3.0 with direct quilt support.
   * Dropped all current patches (obsolete or applied upstream).
   * Added build-dep on CUnit for unit tests.
+  * Moved to new SONAMEs and added new libcf and libcf-dev packages
+    to split up the libCF embedded library. It necessarily introduces
+    a break at this stage against 4.1.1 version. It is unfortunate but
+    necessary, because API/ABI does not necessarily change in sync at 
+    every release of NetCDF, as in this case.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 25 Oct 2011 14:55:16 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 30 Nov 2011 12:42:22 +0100
 
 netcdf (1:4.1.1-6) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 66176b4..e4ea163 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Package: netcdf-doc
 Section: doc
 Architecture: all
 Depends: dpkg (>= 1.15.4) | install-info, ${misc:Depends}
-Description: Documentation for NetCDF
+Description: Documentation for NetCDF and CF
  NetCDF (network Common Data Form) is an interface for scientific
  data access and a freely-distributed software library that provides an
  implementation of the interface.  The netCDF library also defines a
@@ -40,17 +40,48 @@ Description: An interface for scientific data access to large binary data
  This package contains the C, C++ and Fortran77/90 run-time shared
  libraries required by programs.
 
+Package: libcf0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends} 
+Homepage: http://www.unidata.ucar.edu/software/libcf/
+Breaks: libnetcdf6
+Description: An interface for scientific data access to large binary data
+ LibCF (Climate and Forecast) is an interface for scientific
+ data access and a freely-distributed software library that provides an
+ implementation of the CF interface/conventions and works closely with the
+ more general NetCDF library.
+ .
+ This package contains the C/Fortran run-time shared libraries required by 
+ programs.
+
 Package: netcdf-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: libnetcdf7 (= ${binary:Version}), ${misc:Depends}
+Depends: libnetcdf7 (= ${binary:Version}), libcf0 (= ${binary:Version}), ${misc:Depends}
 Suggests: gdb
-Description: debugging symbols for NetCDF
+Description: debugging symbols for NetCDF and libCF
  This package contains the files that make it possible to debug the
- NetCDF binaries and programs that use the NetCDF libraries with a
+ NetCDF binaries and programs that use the NetCDF/CF libraries with a
  source-level debugger like gdb.
 
+Package: libcf-dev
+Section: libdevel
+Architecture: any
+Depends: libcf0 (= ${binary:Version}), libnetcdf-dev, ${misc:Depends}
+Suggests: netcdf-bin, netcdf-doc
+Recommends: pkg-config
+Breaks: libnetcdf-dev (<= 4.1.3-1~)
+Homepage: http://www.unidata.ucar.edu/software/libcf/
+Description: Development kit for libCF
+ LibCF (Climate and Forecast) is an interface for scientific
+ data access and a freely-distributed software library that provides an
+ implementation of the CF interface/conventions and works closely with the
+ more general NetCDF library.
+ .
+ This package includes everything needed for developing in C/Fortran language.
+
 Package: libnetcdf-dev
 Section: libdevel
 Architecture: any
diff --git a/debian/libnetcdf-dev.dirs b/debian/libcf-dev.dirs
similarity index 100%
copy from debian/libnetcdf-dev.dirs
copy to debian/libcf-dev.dirs
diff --git a/debian/libnetcdf7.dirs b/debian/libcf0.dirs
similarity index 100%
copy from debian/libnetcdf7.dirs
copy to debian/libcf0.dirs
diff --git a/debian/rules b/debian/rules
index 7e93dfd..373d7ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,18 +27,27 @@ DEB_MAKE_CHECK_TARGET = check
 #	autoreconf -vfi
 
 install/libnetcdf7::
-	find debian/tmp/usr/lib/ ! -type d -a ! -name '*.so' -a ! -name '*.a' -a ! -name '*.la' -exec mv {} debian/libnetcdf7/usr/lib/ \;
-	# removes pkg-config file which should go into the -dev pkg
-	rm -f debian/libnetcdf7/usr/lib/netcdf.pc
+	find debian/tmp/usr/lib/ ! -type d -a ! -name '*.so' -a ! -name '*.a' -a ! -name '*.la' -a ! -name '*.pc' -a ! -name 'libcf*' \
+			-exec cp {} debian/libnetcdf7/usr/lib/ \;
+
+install/libcf0::
+	find debian/tmp/usr/lib/ -name "libcf*" -a ! -name '*.so' -a ! -name '*.a' -a ! -name '*.la' \
+			-exec cp {} debian/libcf0/usr/lib/ \;
 
 install/libnetcdf-dev::
-	mv debian/tmp/usr/include/* debian/libnetcdf-dev/usr/include/
+	cp debian/tmp/usr/include/* debian/libnetcdf-dev/usr/include/.
 	install -m 644 -o root -g root  $(CURDIR)/netcdf.pc debian/libnetcdf-dev/usr/lib/pkgconfig/.
 	# removes an erroneous libpath due to an upstream oversight in configure.ac
 	sed -i -e 's,-L/usr ,,' -e 's, at FLIBS@,,' debian/libnetcdf-dev/usr/lib/pkgconfig/netcdf.pc
 	# move links and files
-	find debian/tmp/usr/lib/ -type l -a -name '*.so' -exec cp -P {} debian/libnetcdf-dev/usr/lib/. \;
-	find debian/tmp/usr/lib/ -type f -a -name '*.a' -exec cp {} debian/libnetcdf-dev/usr/lib/. \;
+	find debian/tmp/usr/lib/ -type l -a -name "libnetcdf*" -a -name '*.so' -exec cp -P {} debian/libnetcdf-dev/usr/lib/. \;
+	find debian/tmp/usr/lib/ -type f -a -name "libnetcdf*" -a -name '*.a' -exec cp {} debian/libnetcdf-dev/usr/lib/. \;
+
+install/libcf-dev::
+	cp debian/tmp/usr/include/libcf.h debian/libnetcdf-dev/usr/include/.
+	# move links and files
+	find debian/tmp/usr/lib/ -type l -a -name "libcf*" -a -name '*.so' -exec cp -P {} debian/libcf-dev/usr/lib/. \;
+	find debian/tmp/usr/lib/ -type f -a -name "libcf*" -a -name '*.a' -exec cp {} debian/libcf-dev/usr/lib/. \;
 
 install/netcdf-bin::
 	mv debian/tmp/usr/bin/* debian/netcdf-bin/usr/bin/

-- 
The NetCDF Library