[SCM] netcdf branch, master, updated. upstream/4.1.3-29-g7f3c934

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 7f3c9347917093e9a647964a8c3ac004a493dced
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Mon Feb 27 23:41:25 2012 +0100

    Fixed #661553 and an oversight in copying files.

diff --git a/debian/changelog b/debian/changelog
index d2b9e5d..2e7803c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+netcdf (1:4.1.3-2) unstable; urgency=low
+
+  * Always copy symlinks instead of dereferencing, in debian/rules.
+  * This version also breaks oldstable libnetcdf4, if still around.
+    (closes: #661553)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 27 Feb 2012 23:39:59 +0100
+
 netcdf (1:4.1.3-1) unstable; urgency=low
 
   * Promoted to unstable.
diff --git a/debian/control b/debian/control
index 16424f2..b17be53 100644
--- a/debian/control
+++ b/debian/control
@@ -45,7 +45,7 @@ Package: libnetcdfc7
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: libnetcdf6 (<< 1:4.1.1-7~)
+Breaks: libnetcdf6 (<< 1:4.1.1-7~), libnetcdf4
 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
@@ -61,7 +61,7 @@ Package: libnetcdff5
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: libnetcdf6 (<< 1:4.1.1-7~)
+Breaks: libnetcdf6 (<< 1:4.1.1-7~), libnetcdf4
 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
@@ -77,7 +77,7 @@ Package: libnetcdfc++5
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: libnetcdf6 (<< 1:4.1.1-7~)
+Breaks: libnetcdf6 (<< 1:4.1.1-7~), libnetcdf4
 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
@@ -93,7 +93,7 @@ Package: libcf0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: libnetcdf6 (<< 1:4.1.1-7~)
+Breaks: libnetcdf6 (<< 1:4.1.1-7~), libnetcdf4
 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 e227c82..bba8c65 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ install/libnetcdfc7::
 	find debian/tmp/usr/lib/ -name 'libnetcdf.*' -a ! -type d \
 			-a ! -name '*.so' -a ! -name '*.a' \
 			-a ! -name '*.la' -a ! -name '*.pc' \
-			-exec cp {} debian/libnetcdfc7/usr/lib/ \;
+			-exec cp -d {} debian/libnetcdfc7/usr/lib/ \;
 
 install/libnetcdff5::
 	find debian/tmp/usr/lib/ -name 'libnetcdff.*' -a ! -type d \
@@ -54,8 +54,8 @@ install/libnetcdf-dev::
 	# 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 "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/. \;
+	find debian/tmp/usr/lib/ -type l -a -name "libnetcdf*" -a -name '*.so' -exec cp -d {} debian/libnetcdf-dev/usr/lib/. \;
+	find debian/tmp/usr/lib/ -type f -a -name "libnetcdf*" -a -name '*.a' -exec cp -d {} debian/libnetcdf-dev/usr/lib/. \;
 
 install/netcdf-bin::
 	mv debian/tmp/usr/bin/* debian/netcdf-bin/usr/bin/

-- 
The NetCDF Library