[SCM] netcdf branch, master, updated. upstream/4.1.3-38-g62ea32a

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 62ea32ad2bad16016ca8c6f0c1b0658447be5cca
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Mon Mar 5 11:20:51 2012 +0100

    Moved to libnetcdfc++4 (wrong SONAME considered) and adds proper Replaces.

diff --git a/debian/changelog b/debian/changelog
index bd22404..3243aef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,18 @@
+netcdf (1:4.1.3-5) unstable; urgency=low
+
+  * Added a Replaces against past libnetcdf6/4 all-in-one package.
+  * The C++ binding is versioned as 4, not 5.
+  * Added a temporary breaks/replaces against libnetcdfc++5 to allow
+    a smooth upgrade in unstable.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 05 Mar 2012 11:18:37 +0100
+
 netcdf (1:4.1.3-4) unstable; urgency=low
 
   * Re-disabling DAP remote tests to avoid failures on some build boxes.
+  * Added a specific homepage for libcf.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 02 Mar 2012 10:06:49 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Sun, 04 Mar 2012 11:32:19 +0100
 
 netcdf (1:4.1.3-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 0726ac6..81f8e99 100644
--- a/debian/control
+++ b/debian/control
@@ -29,6 +29,7 @@ Package: libnetcdfc7
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: libnetcdf6 (<< 1:4.1.1-7~), libnetcdf4
 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
@@ -45,6 +46,7 @@ Package: libnetcdff5
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: libnetcdf6 (<< 1:4.1.1-7~), libnetcdf4
 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
@@ -57,11 +59,12 @@ Description: An interface for scientific data access to large binary data
  This package contains the Fortran77/90 run-time shared libraries 
  required by programs.
 
-Package: libnetcdfc++5
+Package: libnetcdfc++4
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: libnetcdf6 (<< 1:4.1.1-7~), libnetcdf4
+Replaces: libnetcdf6 (<< 1:4.1.1-7~), libnetcdf4, libnetcdfc++5 (<= 1:4.1.3-4~)
+Breaks: libnetcdf6 (<< 1:4.1.1-7~), libnetcdf4, libnetcdfc++5 (<= 1:4.1.3-4~)
 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 +80,9 @@ Package: libcf0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: libnetcdf6 (<< 1:4.1.1-7~), libnetcdf4
 Breaks: libnetcdf6 (<< 1:4.1.1-7~), libnetcdf4
+Homepage: http://www.unidata.ucar.edu/software/libcf/
 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
@@ -95,7 +100,7 @@ Section: debug
 Priority: extra
 Architecture: any
 Depends: libnetcdfc7 (= ${binary:Version}), libnetcdff5 (= ${binary:Version}), 
- libnetcdfc++5 (= ${binary:Version}), libcf0 (= ${binary:Version}), ${misc:Depends}
+ libnetcdfc++4 (= ${binary:Version}), libcf0 (= ${binary:Version}), ${misc:Depends}
 Suggests: gdb
 Description: debugging symbols for NetCDF
  This package contains the files that make it possible to debug the
@@ -106,7 +111,7 @@ Package: libnetcdf-dev
 Section: libdevel
 Architecture: any
 Depends: libnetcdfc7 (= ${binary:Version}), libnetcdff5 (= ${binary:Version}), 
- libnetcdfc++5 (= ${binary:Version}), libcf0 (= ${binary:Version}), ${misc:Depends}
+ libnetcdfc++4 (= ${binary:Version}), libcf0 (= ${binary:Version}), ${misc:Depends}
 Suggests: netcdf-bin, netcdf-doc
 Recommends: pkg-config
 Description: Development kit for NetCDF
diff --git a/debian/libnetcdfc++5.dirs b/debian/libnetcdfc++4.dirs
similarity index 100%
rename from debian/libnetcdfc++5.dirs
rename to debian/libnetcdfc++4.dirs
diff --git a/debian/rules b/debian/rules
index 8dd1682..3a945c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,10 +38,10 @@ install/libnetcdff5::
 		-a ! -name '*.so' -a ! -name '*.a' -a ! -name '*.la' -a ! -name '*.pc' \
 		-exec cp -d {} debian/libnetcdff5/usr/lib/ \;
 
-install/libnetcdfc++5::
+install/libnetcdfc++4::
 	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/ \;
+		-exec cp -d {} debian/libnetcdfc++4/usr/lib/ \;
 
 install/libcf0::
 	find debian/tmp/usr/lib/ -name 'libcf.*' -a ! -type d \

-- 
The NetCDF Library