[SCM] netcdf branch, master, updated. upstream/4.1.3-39-g763fe32

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 763fe3248bfd27c6703dbaf08583c9d823cbd778
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue Mar 6 16:00:28 2012 +0100

    Fixed versioned conflict.

diff --git a/debian/changelog b/debian/changelog
index 3243aef..ba06937 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+netcdf (1:4.1.3-6) unstable; urgency=low
+
+  * Fixed version for conflicting/breaking against libnetcdfc++5.
+    (closes: #662749)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 06 Mar 2012 15:46:18 +0100
+
 netcdf (1:4.1.3-5) unstable; urgency=low
 
   * Added a Replaces against past libnetcdf6/4 all-in-one package.
diff --git a/debian/control b/debian/control
index 81f8e99..4697f8d 100644
--- a/debian/control
+++ b/debian/control
@@ -63,8 +63,8 @@ Package: libnetcdfc++4
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-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~)
+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

-- 
The NetCDF Library