The following commit has been merged in the master branch: commit 31bb6982f863894c23188a3e67217dc19850ed5c Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Fri Feb 17 13:26:27 2012 +0100
Starting re-syncing with sid branch. diff --git a/debian/changelog b/debian/changelog index 0aaf92e..8f36327 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,9 @@ 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 16:08:09 +0100 + * Merged changes from sid 4.1.1 branch to allow a smooth upgrade from + previous version. + + -- Francesco Paolo Lovergine <fran...@debian.org> Fri, 17 Feb 2012 13:25:36 +0100 netcdf (1:4.1.3-1~exp1) experimental; urgency=low diff --git a/debian/control b/debian/control index 68de50f..16424f2 100644 --- a/debian/control +++ b/debian/control @@ -25,11 +25,27 @@ Description: Documentation for NetCDF and CF This package contains documentation for the NetCDF library in a variety of formats. -Package: libnetcdf7 +Package: libnetcdf6 +Section: libs +Architecture: any +Depends: libnetcdfc7, libnetcdff5, libnetcdfc++5, libcf0, ${misc:Depends} +Description: An interface for scientific data access to large binary data (transitional package) + 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 is a dummy package used for migration to multiple separate + packages for C, C++ and Fortran bindings. You can safely remove it + after installing. + +Package: libnetcdfc7 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: libnetcdf6 +Breaks: libnetcdf6 (<< 1:4.1.1-7~) 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 @@ -38,14 +54,14 @@ Description: An interface for scientific data access to large binary data Together, the interface, library, and format support the creation, access, and sharing of scientific data. . - This package contains the C, C++ run-time shared libraries required + This package contains the C run-time shared libraries required by programs. Package: libnetcdff5 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: libnetcdf6 +Breaks: libnetcdf6 (<< 1:4.1.1-7~) 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 @@ -54,13 +70,14 @@ Description: An interface for scientific data access to large binary 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. + 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} +Breaks: libnetcdf6 (<< 1:4.1.1-7~) 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 @@ -69,55 +86,43 @@ Description: An interface for scientific data access to large binary 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. + This package contains the C++ run-time shared libraries + required by programs. Package: libcf0 Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Homepage: http://www.unidata.ucar.edu/software/libcf/ -Breaks: libnetcdf6 +Depends: ${shlibs:Depends}, ${misc:Depends} +Breaks: libnetcdf6 (<< 1:4.1.1-7~) Description: An interface for scientific data access to large binary data - LibCF (Climate and Forecast) is an interface for scientific + NetCDF (network Common Data Form) is an interface for scientific data access and a freely-distributed software library that provides an - implementation of the CF interface/conventions and works closely with the - more general NetCDF library. + 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/Fortran run-time shared libraries required by - programs. + This package contains the add-on CF run-time C shared library that uses + the NetCDF API to manage Climate and Forecasts standards complaining + data files. Package: netcdf-dbg Section: debug Priority: extra Architecture: any -Depends: libnetcdf7 (= ${binary:Version}), libcf0 (= ${binary:Version}), ${misc:Depends} +Depends: libnetcdfc7 (= ${binary:Version}), libnetcdff5 (= ${binary:Version}), + libnetcdfc++5 (= ${binary:Version}), libcf0 (= ${binary:Version}), ${misc:Depends} Suggests: gdb -Description: debugging symbols for NetCDF and libCF +Description: debugging symbols for NetCDF This package contains the files that make it possible to debug the - NetCDF binaries and programs that use the NetCDF/CF libraries with a + NetCDF binaries and programs that use the NetCDF libraries with a source-level debugger like gdb. -Package: libcf-dev -Section: libdevel -Architecture: any -Depends: libcf0 (= ${binary:Version}), libnetcdf-dev, ${misc:Depends} -Suggests: netcdf-bin, netcdf-doc -Recommends: pkg-config -Breaks: libnetcdf-dev (<= 4.1.3-1~) -Homepage: http://www.unidata.ucar.edu/software/libcf/ -Description: Development kit for libCF - LibCF (Climate and Forecast) is an interface for scientific - data access and a freely-distributed software library that provides an - implementation of the CF interface/conventions and works closely with the - more general NetCDF library. - . - This package includes everything needed for developing in C/Fortran language. - Package: libnetcdf-dev Section: libdevel Architecture: any -Depends: libnetcdf7 (= ${binary:Version}), libnetcdff5 (= ${binary:Version}), ${misc:Depends} +Depends: libnetcdfc7 (= ${binary:Version}), libnetcdff5 (= ${binary:Version}), + libnetcdfc++5 (= ${binary:Version}), libcf0 (= ${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