[SCM] netcdf branch, master, updated. upstream/4.1.1-15-g7508c4c
The following commit has been merged in the master branch:
commit af035b60c784b48796fe2f244712126976ea2d62
Author: Francesco Paolo Lovergine
Date: Tue Nov 29 17:47:27 2011 +0100
Moved netcdf6 -> netcdf7
diff --git a/debian/control b/debian/control
index ae21ff3..66176b4 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Description: Documentation for NetCDF
This package contains documentation for the NetCDF library in a
variety of formats.
-Package: libnetcdf6
+Package: libnetcdf7
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -44,7 +44,7 @@ Package: netcdf-dbg
Section: debug
Priority: extra
Architecture: any
-Depends: libnetcdf6 (= ${binary:Version}), ${misc:Depends}
+Depends: libnetcdf7 (= ${binary:Version}), ${misc:Depends}
Suggests: gdb
Description: debugging symbols for NetCDF
This package contains the files that make it possible to debug the
@@ -54,7 +54,7 @@ Description: debugging symbols for NetCDF
Package: libnetcdf-dev
Section: libdevel
Architecture: any
-Depends: libnetcdf6 (= ${binary:Version}), ${misc:Depends}
+Depends: libnetcdf7 (= ${binary:Version}), ${misc:Depends}
Suggests: netcdf-bin, netcdf-doc
Recommends: pkg-config
Description: Development kit for NetCDF
diff --git a/debian/rules b/debian/rules
index 97fd90d..a21332c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,8 +26,8 @@ DEB_MAKE_CHECK_TARGET = check
#makebuilddir/libnetcdf4::
# autoreconf -vfi
-install/libnetcdf6::
- find debian/tmp/usr/lib/ ! -type d -a ! -name '*.so' -a ! -name '*.a'
-a ! -name '*.la' -exec mv {} debian/libnetcdf6/usr/lib/ \;
+install/libnetcdf7::
+ find debian/tmp/usr/lib/ ! -type d -a ! -name '*.so' -a ! -name '*.a'
-a ! -name '*.la' -exec mv {} debian/libnetcdf7/usr/lib/ \;
install/libnetcdf-dev::
mv debian/tmp/usr/include/* debian/libnetcdf-dev/usr/include/
--
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.1-15-g7508c4c
The following commit has been merged in the master branch:
commit 7508c4caebc99760ee1afae4927eee83ea809b0e
Author: Francesco Paolo Lovergine
Date: Wed Nov 30 13:46:54 2011 +0100
Splitted libcf and libnetcdf for a better support of different APIs.
diff --git a/debian/changelog b/debian/changelog
index 9963e98..6701d35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,13 @@ netcdf (1:4.1.3-1~exp1) experimental; urgency=low
* Moved to source format 3.0 with direct quilt support.
* Dropped all current patches (obsolete or applied upstream).
* Added build-dep on CUnit for unit tests.
+ * Moved to new SONAMEs and added new libcf and libcf-dev packages
+to split up the libCF embedded library. It necessarily introduces
+a break at this stage against 4.1.1 version. It is unfortunate but
+necessary, because API/ABI does not necessarily change in sync at
+every release of NetCDF, as in this case.
- -- Francesco Paolo Lovergine Tue, 25 Oct 2011 14:55:16
+0200
+ -- Francesco Paolo Lovergine Wed, 30 Nov 2011 12:42:22
+0100
netcdf (1:4.1.1-6) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 66176b4..e4ea163 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Package: netcdf-doc
Section: doc
Architecture: all
Depends: dpkg (>= 1.15.4) | install-info, ${misc:Depends}
-Description: Documentation for NetCDF
+Description: Documentation for NetCDF and CF
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
@@ -40,17 +40,48 @@ Description: An interface for scientific data access to
large binary data
This package contains the C, C++ and Fortran77/90 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
+Description: An interface for scientific data access to large binary data
+ 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 contains the C/Fortran run-time shared libraries required by
+ programs.
+
Package: netcdf-dbg
Section: debug
Priority: extra
Architecture: any
-Depends: libnetcdf7 (= ${binary:Version}), ${misc:Depends}
+Depends: libnetcdf7 (= ${binary:Version}), libcf0 (= ${binary:Version}),
${misc:Depends}
Suggests: gdb
-Description: debugging symbols for NetCDF
+Description: debugging symbols for NetCDF and libCF
This package contains the files that make it possible to debug the
- NetCDF binaries and programs that use the NetCDF libraries with a
+ NetCDF binaries and programs that use the NetCDF/CF 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
diff --git a/debian/libnetcdf-dev.dirs b/debian/libcf-dev.dirs
similarity index 100%
copy from debian/libnetcdf-dev.dirs
copy to debian/libcf-dev.dirs
diff --git a/debian/libnetcdf7.dirs b/debian/libcf0.dirs
similarity index 100%
copy from debian/libnetcdf7.dirs
copy to debian/libcf0.dirs
diff --git a/debian/rules b/debian/rules
index 7e93dfd..373d7ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,18 +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' -exec mv {} debian/libnetcdf7/usr/lib/ \;
- # removes pkg-config file which should go into the -dev pkg
- rm -f debian/libnetcdf7/usr/lib/netcdf.pc
+ 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/libcf0::
+ find debian/tmp/usr/lib/ -name "libcf*" -a ! -name '*.so' -a ! -name
'*.a' -a ! -name '*.la' \
+ -exec cp {} debian/libcf0/usr/lib/ \;
install/libnetcdf-dev::
- mv debian/tmp/usr/include/* debian/libnetcdf-dev/usr/include/
+ cp debian
[SCM] netcdf branch, master, updated. upstream/4.1.1-15-g7508c4c
The following commit has been merged in the master branch: commit 9bfa23595e7f8c8661658cea7d71ef8fcc30b433 Author: Francesco Paolo Lovergine Date: Tue Oct 25 15:24:48 2011 +0200 NetCDF 4.1.3 depends on a 1.8.6+ HDF5 library. diff --git a/debian/changelog b/debian/changelog index 1afc8a0..de3e63b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ netcdf (1:4.1.3-1) unstable; urgency=low * New upstream release. * Moved to source format 3.0 with direct quilt support. * Dropped all current patches (obsolete or applied upstream). + * Added build-dep on CUnit for unit tests. - -- Francesco Paolo Lovergine Tue, 25 Oct 2011 14:43:38 +0200 + -- Francesco Paolo Lovergine Tue, 25 Oct 2011 14:55:16 +0200 netcdf (1:4.1.1-6) unstable; urgency=low diff --git a/debian/control b/debian/control index 2c75ffd..071850b 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,8 @@ Section: science Priority: optional Maintainer: Debian GIS Project Uploaders: Francesco Paolo Lovergine -Build-Depends: debhelper (>= 8), cdbs, gfortran, texinfo, zlib1g-dev, libhdf5-serial-dev, libdap-dev, libcurl4-gnutls-dev, - texlive-base, texlive-latex-base +Build-Depends: debhelper (>= 8), cdbs, gfortran, texinfo, zlib1g-dev, libhdf5-serial-dev (>= 1.8.6-1~), libdap-dev, libcurl4-gnutls-dev, + texlive-base, texlive-latex-base, libcunit1-dev Standards-Version: 3.9.2 Homepage: http://www.unidata.ucar.edu/software/netcdf/ Vcs-Browser: http://git.debian.org/?p=pkg-grass/netcdf.git -- 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.1-15-g7508c4c
The following commit has been merged in the master branch:
commit 34b3c36013269c70c3ceb239b53fde70b47357fc
Author: Francesco Paolo Lovergine
Date: Wed Nov 30 12:24:14 2011 +0100
Removes the netcdf.pc erroneously installed under /usr/lib
diff --git a/debian/rules b/debian/rules
index a21332c..7e93dfd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,6 +28,8 @@ DEB_MAKE_CHECK_TARGET = check
install/libnetcdf7::
find debian/tmp/usr/lib/ ! -type d -a ! -name '*.so' -a ! -name '*.a'
-a ! -name '*.la' -exec mv {} debian/libnetcdf7/usr/lib/ \;
+ # removes pkg-config file which should go into the -dev pkg
+ rm -f debian/libnetcdf7/usr/lib/netcdf.pc
install/libnetcdf-dev::
mv debian/tmp/usr/include/* debian/libnetcdf-dev/usr/include/
--
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.1-15-g7508c4c
The following commit has been merged in the master branch: commit 4c9504c9389f7eb70061682b83299d68a53a6c1b Author: Francesco Paolo Lovergine Date: Tue Nov 29 18:09:58 2011 +0100 Missing .dirs file. diff --git a/debian/libnetcdf6.dirs b/debian/libnetcdf7.dirs similarity index 100% rename from debian/libnetcdf6.dirs rename to debian/libnetcdf7.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.1-15-g7508c4c
The following commit has been merged in the master branch: commit 564918d4865990fde4237b3458401dcd2e78b861 Author: Francesco Paolo Lovergine Date: Tue Oct 25 14:48:16 2011 +0200 Moving to new upstream release. diff --git a/debian/changelog b/debian/changelog index fda53bc..1afc8a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +netcdf (1:4.1.3-1) unstable; urgency=low + + * New upstream release. + * Moved to source format 3.0 with direct quilt support. + * Dropped all current patches (obsolete or applied upstream). + + -- Francesco Paolo Lovergine Tue, 25 Oct 2011 14:43:38 +0200 + netcdf (1:4.1.1-6) unstable; urgency=low * Moved repository to git. diff --git a/debian/control b/debian/control index 09669e5..2c75ffd 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: science Priority: optional Maintainer: Debian GIS Project Uploaders: Francesco Paolo Lovergine -Build-Depends: debhelper (>= 8), cdbs, gfortran, texinfo, quilt, zlib1g-dev, libhdf5-serial-dev, libdap-dev, libcurl4-gnutls-dev, +Build-Depends: debhelper (>= 8), cdbs, gfortran, texinfo, zlib1g-dev, libhdf5-serial-dev, libdap-dev, libcurl4-gnutls-dev, texlive-base, texlive-latex-base Standards-Version: 3.9.2 Homepage: http://www.unidata.ucar.edu/software/netcdf/ diff --git a/debian/patches/series b/debian/patches/series index 7f09501..ca0aa34 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,3 @@ -la_libadd_fix -noshutdown -dumplib +#la_libadd_fix +#noshutdown +#dumplib diff --git a/debian/rules b/debian/rules index ff1f983..0f475d1 100755 --- a/debian/rules +++ b/debian/rules @@ -1,14 +1,7 @@ #!/usr/bin/make -f -# change at every upstream upgrade -DEB_TAR_SRCDIR = netcdf-4.1.1 -DEB_TARBALL = $(CURDIR)/upstream/$(DEB_TAR_SRCDIR).tar.gz -SRC_TREE = $(CURDIR)/build-tree/$(DEB_TAR_SRCDIR) - -include /usr/share/cdbs/1/rules/tarball.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk # Add here any variable or target overrides you need. @@ -25,9 +18,9 @@ DEB_CONFIGURE_SCRIPT_ENV += CC="gcc" DEB_CONFIGURE_SCRIPT_ENV += CPPFLAGS="-DgFortran" # Test fails under buildds currently -#DEB_MAKE_CHECK_TARGET = check +DEB_MAKE_CHECK_TARGET = check -DEB_INSTALL_CHANGELOGS_ALL = $(CURDIR)/build-tree/$(DEB_TAR_SRCDIR)/RELEASE_NOTES +#DEB_INSTALL_CHANGELOGS_ALL = $(CURDIR)/build-tree/$(DEB_TAR_SRCDIR)/RELEASE_NOTES # Any makebuilddir/binary would do, /source doesn't: #makebuilddir/libnetcdf4:: -- 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.1-15-g7508c4c
The following commit has been merged in the master branch: commit a7c4109b97d71464e0f57f89db3326045b43fe91 Author: Francesco Paolo Lovergine Date: Tue Nov 29 17:25:53 2011 +0100 Now using CURDIR for source tree. diff --git a/debian/rules b/debian/rules index 471066c..97fd90d 100755 --- a/debian/rules +++ b/debian/rules @@ -20,8 +20,6 @@ DEB_CONFIGURE_SCRIPT_ENV += CPPFLAGS="-DgFortran" # Test fails under buildds currently DEB_MAKE_CHECK_TARGET = check -SRC_TREE = . - #DEB_INSTALL_CHANGELOGS_ALL = $(CURDIR)/build-tree/$(DEB_TAR_SRCDIR)/RELEASE_NOTES # Any makebuilddir/binary would do, /source doesn't: @@ -33,7 +31,7 @@ install/libnetcdf6:: install/libnetcdf-dev:: mv debian/tmp/usr/include/* debian/libnetcdf-dev/usr/include/ - install -m 644 -o root -g root $(SRC_TREE)/netcdf.pc debian/libnetcdf-dev/usr/lib/pkgconfig/. + 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 # move links and files @@ -47,9 +45,9 @@ install/netcdf-doc:: install -d debian/tmp/doc install -d debian/tmp/usr/share/doc/netcdf install -d debian/tmp/usr/share/info - install -m 644 -o root -g root $(SRC_TREE)/man4/*.html debian/tmp/doc/. - install -m 644 -o root -g root $(SRC_TREE)/man4/*.pdf debian/tmp/usr/share/doc/netcdf/. - install -m 644 -o root -g root $(SRC_TREE)/man4/*.txt debian/tmp/usr/share/doc/netcdf/. - install -m 644 -o root -g root $(SRC_TREE)/man4/*.ps debian/tmp/usr/share/doc/netcdf/. - install -m 644 -o root -g root $(SRC_TREE)/man4/*.info debian/tmp/usr/share/info/. + install -m 644 -o root -g root $(CURDIR)/man4/*.html debian/tmp/doc/. + install -m 644 -o root -g root $(CURDIR)/man4/*.pdf debian/tmp/usr/share/doc/netcdf/. + install -m 644 -o root -g root $(CURDIR)/man4/*.txt debian/tmp/usr/share/doc/netcdf/. + install -m 644 -o root -g root $(CURDIR)/man4/*.ps debian/tmp/usr/share/doc/netcdf/. + install -m 644 -o root -g root $(CURDIR)/man4/*.info debian/tmp/usr/share/info/. -- 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.1-15-g7508c4c
The following commit has been merged in the master branch: commit b7af0c336792657f66a6ea5d3c53beb115968293 Author: Francesco Paolo Lovergine Date: Tue Nov 29 16:58:37 2011 +0100 Changed b-d and moved to experimental for pre-releasing. diff --git a/debian/changelog b/debian/changelog index de3e63b..9963e98 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -netcdf (1:4.1.3-1) unstable; urgency=low +netcdf (1:4.1.3-1~exp1) experimental; urgency=low * New upstream release. * Moved to source format 3.0 with direct quilt support. diff --git a/debian/control b/debian/control index 071850b..ae21ff3 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: science Priority: optional Maintainer: Debian GIS Project Uploaders: Francesco Paolo Lovergine -Build-Depends: debhelper (>= 8), cdbs, gfortran, texinfo, zlib1g-dev, libhdf5-serial-dev (>= 1.8.6-1~), libdap-dev, libcurl4-gnutls-dev, +Build-Depends: debhelper (>= 8), cdbs, gfortran, texinfo, zlib1g-dev, libhdf5-dev (>= 1.8.6-1~), libdap-dev, libcurl4-gnutls-dev, texlive-base, texlive-latex-base, libcunit1-dev Standards-Version: 3.9.2 Homepage: http://www.unidata.ucar.edu/software/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
[SCM] netcdf branch, master, updated. upstream/4.1.1-15-g7508c4c
The following commit has been merged in the master branch: commit b937548e921d1c5d1a4a611b2a7d9abfb589af89 Author: Francesco Paolo Lovergine Date: Tue Nov 29 17:15:57 2011 +0100 Defining SRC_TREE diff --git a/debian/rules b/debian/rules index 0f475d1..471066c 100755 --- a/debian/rules +++ b/debian/rules @@ -20,6 +20,8 @@ DEB_CONFIGURE_SCRIPT_ENV += CPPFLAGS="-DgFortran" # Test fails under buildds currently DEB_MAKE_CHECK_TARGET = check +SRC_TREE = . + #DEB_INSTALL_CHANGELOGS_ALL = $(CURDIR)/build-tree/$(DEB_TAR_SRCDIR)/RELEASE_NOTES # Any makebuilddir/binary would do, /source doesn't: -- 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.1-15-g7508c4c
The following commit has been merged in the master branch: commit 52b4a6eb726689bf37d3bace2a333086cde603e2 Author: Francesco Paolo Lovergine Date: Tue Oct 25 14:49:51 2011 +0200 Moved to source format 3.0 diff --git a/debian/source/format b/debian/source/format index d3827e7..163aaf8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -1.0 +3.0 (quilt) -- 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.1-15-g7508c4c
The following commit has been merged in the master branch: commit 5119d9ea307e655ffdddbf8501f2af9529804b76 Merge: abd331769d7b1266acfe907c85681ab67c99bb3a ef4f22f99cb670b67eb455d8c60b91208858e6eb Author: Francesco Paolo Lovergine Date: Tue Oct 25 14:33:54 2011 +0200 Merge commit 'upstream/4.1.3' -- 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
