[SCM] netcdf branch, master, updated. upstream/4.1.3-22-ga424d81
The following commit has been merged in the master branch: commit a424d811e4fafe8c0456fb9c4516d277654a117d Author: Francesco Paolo Lovergine Date: Fri Feb 17 13:56:55 2012 +0100 Added required dirs files. diff --git a/debian/libcf-dev.dirs b/debian/libcf-dev.dirs deleted file mode 100644 index 4418816..000 --- a/debian/libcf-dev.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib -usr/include diff --git a/debian/libnetcdf7.dirs b/debian/libnetcdfc++5.dirs similarity index 100% rename from debian/libnetcdf7.dirs rename to debian/libnetcdfc++5.dirs diff --git a/debian/libcf0.dirs b/debian/libnetcdfc7.dirs similarity index 100% copy from debian/libcf0.dirs copy to debian/libnetcdfc7.dirs diff --git a/debian/libcf0.dirs b/debian/libnetcdff5.dirs similarity index 100% copy from debian/libcf0.dirs copy to debian/libnetcdff5.dirs -- 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
[SCM] netcdf branch, master, updated. upstream/4.1.3-22-ga424d81
The following commit has been merged in the master branch:
commit 13e6b654f8251e27e408a58c52c1d64f2e38824a
Author: Francesco Paolo Lovergine
Date: Fri Feb 17 13:39:37 2012 +0100
Merged debian/rules from sid.
diff --git a/debian/rules b/debian/rules
index 9f8e293..bef4791 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,16 +27,27 @@ DEB_MAKE_CHECK_TARGET = check
# autoreconf -vfi
install/libnetcdf7::
- find debian/tmp/usr/lib/ ! -type d -a ! -name '*.so' -a ! -name '*.a'
-a ! -name '*.la' -a ! -name '*.pc' -a ! -name 'libcf*' \
+ find debian/tmp/usr/lib/ ! -type d -a ! -name '*.so' -a ! -name '*.a' \
+ -a ! -name '*.la' -a ! -name '*.pc' -a ! -name 'libcf*'
\
-exec cp {} debian/libnetcdf7/usr/lib/ \;
+install/libnetcdff5::
+ find debian/tmp/usr/lib/ -name 'libnetcdff.*' -a ! -type d \
+ -a ! -name '*.so' -a ! -name '*.a' -a ! -name '*.la' -a ! -name
'*.pc' \
+ -exec cp -d {} debian/libnetcdff5/usr/lib/ \;
+
+install/libnetcdfc++5::
+ 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/ \;
+
install/libcf0::
- find debian/tmp/usr/lib/ -name "libcf*" -a ! -name '*.so' -a ! -name
'*.a' -a ! -name '*.la' \
- -exec cp {} debian/libcf0/usr/lib/ \;
+ find debian/tmp/usr/lib/ -name 'libcf.*' -a ! -type d \
+ -a ! -name '*.so' -a ! -name '*.a' -a ! -name '*.la' -a ! -name
'*.pc' \
+ -exec cp -d {} debian/libcf0/usr/lib/ \;
install/libnetcdf-dev::
cp debian/tmp/usr/include/* debian/libnetcdf-dev/usr/include/.
- rm -f debian/libnetcdf-dev/usr/include/libcf.h
install -m 644 -o root -g root $(CURDIR)/netcdf.pc
debian/libnetcdf-dev/usr/lib/pkgconfig/.
# removes an erroneous libpath due to an upstream oversight in
configure.ac
sed -i -e 's,-L/usr ,,' -e 's,@FLIBS@,,'
debian/libnetcdf-dev/usr/lib/pkgconfig/netcdf.pc
@@ -44,12 +55,6 @@ install/libnetcdf-dev::
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/. \;
-install/libcf-dev::
- cp debian/tmp/usr/include/libcf.h debian/libcf-dev/usr/include/.
- # move links and files
- find debian/tmp/usr/lib/ -type l -a -name "libcf*" -a -name '*.so'
-exec cp -P {} debian/libcf-dev/usr/lib/. \;
- find debian/tmp/usr/lib/ -type f -a -name "libcf*" -a -name '*.a' -exec
cp {} debian/libcf-dev/usr/lib/. \;
-
install/netcdf-bin::
mv debian/tmp/usr/bin/* debian/netcdf-bin/usr/bin/
--
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
[SCM] netcdf branch, master, updated. upstream/4.1.3-22-ga424d81
The following commit has been merged in the master branch:
commit 31bb6982f863894c23188a3e67217dc19850ed5c
Author: Francesco Paolo Lovergine
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 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 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/conve
[SCM] netcdf branch, master, updated. upstream/4.1.3-22-ga424d81
The following commit has been merged in the master branch: commit ced1bafe66f5f8cac98221e51de300c0b7c34a1f Author: Francesco Paolo Lovergine Date: Fri Feb 17 13:33:24 2012 +0100 Updated changelog for merge. diff --git a/debian/changelog b/debian/changelog index 8f36327..791ec16 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,16 @@ netcdf (1:4.1.3-1~exp2) experimental; urgency=low * Merged changes from sid 4.1.1 branch to allow a smooth upgrade from -previous version. +previous version: + + o Splitted C/C++/Fortran bindings for a better and sane migration path +towards 4.1.3 and beyond. Also the CF library now lives in its own +binary package. Note that all libraries now provide their own +SONAMEs and API versionings. + o The libnetcdf6 package is now a dummy removable onei used only +for migration. + o Removed duplicated pkgconfig file under /usr/lib. + o Added missing libcf0 to netcdf-dbg package in debian/control. -- Francesco Paolo Lovergine Fri, 17 Feb 2012 13:25:36 +0100 -- 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
