[SCM] netcdf branch, master, updated. upstream/4.1.1-16-g43d06e9

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 43d06e9ee1006689dd5823a43537c6f375cd6cd3
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue Feb 7 00:03:44 2012 +0100

    Fixed #656103

diff --git a/debian/changelog b/debian/changelog
index 6701d35..26f5cfc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+netcdf (1:4.1.3-1~exp2) experimental; urgency=low
+
+  * Remove libcf.h from libnetcdf-dev package, still around since last version.
+  * Now libnetcdf7 Breaks libnetcdf6 as a temporary measure. It needs a better
+    approach for a smooth upgrade from previous version.
+    (closes: #656103)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 06 Feb 2012 23:51:36 +0100
+
 netcdf (1:4.1.3-1~exp1) experimental; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index e4ea163..9326f62 100644
--- a/debian/control
+++ b/debian/control
@@ -29,6 +29,7 @@ Package: libnetcdf7
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: libnetcdf6
 Description: An interface for scientific data access to large binary data
  NetCDF (network Common Data Form) is an interface for scientific
  data access and a freely-distributed software library that provides an
diff --git a/debian/rules b/debian/rules
index 373d7ac..9f8e293 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,6 +36,7 @@ install/libcf0::
 
 install/libnetcdf-dev::
 	cp debian/tmp/usr/include/* debian/libnetcdf-dev/usr/include/.
+	rm -f debian/libnetcdf-dev/usr/include/libcf.h
 	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
@@ -44,7 +45,7 @@ install/libnetcdf-dev::
 	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/.
+	cp debian/tmp/usr/include/libcf.h debian/libcf-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/. \;

-- 
The NetCDF Library