[SCM] netcdf branch, master, updated. upstream/4.1.3-22-ga424d81

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 13e6b654f8251e27e408a58c52c1d64f2e38824a
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Fri Feb 17 13:39:37 2012 +0100

    Merged debian/rules from sid.

diff --git a/debian/rules b/debian/rules
index 9f8e293..bef4791 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,16 +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' -a ! -name '*.pc' -a ! -name 'libcf*' \
+	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/libnetcdff5::
+	find debian/tmp/usr/lib/ -name 'libnetcdff.*' -a ! -type d \
+		-a ! -name '*.so' -a ! -name '*.a' -a ! -name '*.la' -a ! -name '*.pc' \
+		-exec cp -d {} debian/libnetcdff5/usr/lib/ \;
+
+install/libnetcdfc++5::
+	find debian/tmp/usr/lib/ -name 'libnetcdf_c++.*' -a ! -type d \
+		-a ! -name '*.so' -a ! -name '*.a' -a ! -name '*.la' -a ! -name '*.pc' \
+		-exec cp -d {} debian/libnetcdfc++5/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/ \;
+	find debian/tmp/usr/lib/ -name 'libcf.*' -a ! -type d \
+		-a ! -name '*.so' -a ! -name '*.a' -a ! -name '*.la' -a ! -name '*.pc' \
+		-exec cp -d {} debian/libcf0/usr/lib/ \;
 
 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,12 +55,6 @@ install/libnetcdf-dev::
 	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/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/. \;
-
 install/netcdf-bin::
 	mv debian/tmp/usr/bin/* debian/netcdf-bin/usr/bin/
 

-- 
The NetCDF Library