The following commit has been merged in the master branch: commit 7620caa32572a789adb5c8e9398713457fbd8816 Merge: 110779659e267c38f0d2afc865cd44dde68410cb 43d06e9ee1006689dd5823a43537c6f375cd6cd3 Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Tue Feb 14 15:37:13 2012 +0100
Merged changes and fixed changelog. Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/netcdf Conflicts: debian/changelog diff --combined debian/changelog index 30da31e,26f5cfc..0aaf92e --- a/debian/changelog +++ b/debian/changelog @@@ -1,10 -1,11 +1,14 @@@ netcdf (1:4.1.3-1~exp2) experimental; urgency=low + * Splitted Fortran 77/90 in a separate 'libnetcdff5' library. Note that again + we need to conflict against the old libnetcdf6 which provided all binding + together. + * 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 <fran...@debian.org> Mon, 06 Feb 2012 23:51:36 +0100 + -- Francesco Paolo Lovergine <fran...@debian.org> Mon, 06 Feb 2012 16:08:09 +0100 netcdf (1:4.1.3-1~exp1) experimental; urgency=low diff --combined debian/control index d14264c,9326f62..68de50f --- a/debian/control +++ b/debian/control @@@ -29,6 -29,7 +29,7 @@@ Package: libnetcdf 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 @@@ -37,40 -38,9 +38,40 @@@ Together, the interface, library, and format support the creation, access, and sharing of scientific data. . - This package contains the C, C++ and Fortran77/90 run-time shared + This package contains the C, C++ run-time shared libraries required + by programs. + +Package: libnetcdff5 +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 + implementation of the interface. The netCDF library also defines a + machine-independent format for representing scientific data. + Together, the interface, library, and format support the creation, + access, and sharing of scientific data. + . + This package contains the Fortran77/90 run-time shared libraries required by programs. +Package: libnetcdfc++5 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +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 + implementation of the interface. The netCDF library also defines a + machine-independent format for representing scientific data. + Together, the interface, library, and format support the creation, + access, and sharing of scientific data. + . + This package contains the C++ run-time shared libraries required + by programs. + Package: libcf0 Section: libs Architecture: any @@@ -116,7 -86,7 +117,7 @@@ Description: Development kit for libC Package: libnetcdf-dev Section: libdevel Architecture: any -Depends: libnetcdf7 (= ${binary:Version}), ${misc:Depends} +Depends: libnetcdf7 (= ${binary:Version}), libnetcdff5 (= ${binary:Version}), ${misc:Depends} Suggests: netcdf-bin, netcdf-doc Recommends: pkg-config Description: Development kit for NetCDF -- The NetCDF Library _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel