This is an automated email from the git hooks/post-receive script. nschloe-guest pushed a commit to branch split-c-f-cxx in repository netcdf.
commit cce50ff92a6f3234bbe4e06d5a5b671c3f617bf4 Author: Nico Schlömer <nico.schloe...@gmail.com> Date: Mon May 12 14:31:56 2014 +0200 Got package to build again, this time using CMake --- debian/changelog | 10 +++++++++ debian/control | 52 ----------------------------------------------- debian/libnetcdfc++4.dirs | 1 - debian/libnetcdff5.dirs | 1 - debian/netcdf-doc.docs | 52 +++++++++++++++++------------------------------ debian/netcdf-doc.info | 11 ++++------ debian/rules | 44 ++++++++++++++++++++------------------- 7 files changed, 56 insertions(+), 115 deletions(-) diff --git a/debian/changelog b/debian/changelog index b681f17..ba66561 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +netcdf (1:4.3.2-1ubuntu1) UNRELEASED; urgency=medium + + * Upgrade to 4.3.2 (C-only) + (Closes: #735075) + * Switch to CMake build + * Proper multiarch support + (Closes: #676477) + + -- Nico Schlömer <nico.schloe...@gmail.com> Mon, 12 May 2014 14:27:06 +0200 + netcdf (1:4.1.3-7) unstable; urgency=low * Team upload diff --git a/debian/control b/debian/control index 669e8b8..5a5e0da 100644 --- a/debian/control +++ b/debian/control @@ -42,40 +42,6 @@ Description: Interface for scientific data access to large binary data This package contains the C run-time shared libraries required by programs. -Package: libnetcdff5 -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: libnetcdf6 (<< 1:4.1.1-7~), libnetcdf4 -Breaks: libnetcdf6 (<< 1:4.1.1-7~), libnetcdf4 -Description: 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++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) -Description: 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 @@ -107,24 +73,6 @@ Description: debugging symbols for NetCDF NetCDF binaries and programs that use the NetCDF libraries with a source-level debugger like gdb. -Package: libnetcdf-dev -Section: libdevel -Architecture: any -Depends: libnetcdfc7 (= ${binary:Version}), libnetcdff5 (= ${binary:Version}), - libnetcdfc++4 (= ${binary:Version}), libcf0 (= ${binary:Version}), ${misc:Depends} -Suggests: netcdf-bin, netcdf-doc -Recommends: pkg-config -Description: Development kit for NetCDF - 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 includes everything needed for developing in C, C++, - Fortran 77, and Fortran 90. - Package: netcdf-bin Section: science Architecture: any diff --git a/debian/libnetcdfc++4.dirs b/debian/libnetcdfc++4.dirs deleted file mode 100644 index 6845771..0000000 --- a/debian/libnetcdfc++4.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib diff --git a/debian/libnetcdff5.dirs b/debian/libnetcdff5.dirs deleted file mode 100644 index 6845771..0000000 --- a/debian/libnetcdff5.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib diff --git a/debian/netcdf-doc.docs b/debian/netcdf-doc.docs index 296e8c9..5682b70 100644 --- a/debian/netcdf-doc.docs +++ b/debian/netcdf-doc.docs @@ -1,33 +1,19 @@ -debian/tmp/doc/ncdump-man-1.html -debian/tmp/doc/ncgen-man-1.html -debian/tmp/doc/netcdf-c.html -debian/tmp/doc/netcdf-cxx.html -debian/tmp/doc/netcdf-f77.html -debian/tmp/doc/netcdf_f77-man.html -debian/tmp/doc/netcdf-f90.html -debian/tmp/doc/netcdf_f90-man.html -debian/tmp/doc/netcdf.html -debian/tmp/doc/netcdf-install.html -debian/tmp/doc/netcdf-man-3.html -debian/tmp/doc/netcdf-tutorial.html -debian/tmp/usr/share/doc/netcdf/netcdf.ps -debian/tmp/usr/share/doc/netcdf/netcdf-install.ps -debian/tmp/usr/share/doc/netcdf/netcdf-c.ps -debian/tmp/usr/share/doc/netcdf/netcdf-f77.ps -debian/tmp/usr/share/doc/netcdf/netcdf-f90.ps -debian/tmp/usr/share/doc/netcdf/netcdf-cxx.ps -debian/tmp/usr/share/doc/netcdf/netcdf-tutorial.ps -debian/tmp/usr/share/doc/netcdf/netcdf.pdf -debian/tmp/usr/share/doc/netcdf/netcdf-install.pdf -debian/tmp/usr/share/doc/netcdf/netcdf-c.pdf -debian/tmp/usr/share/doc/netcdf/netcdf-f77.pdf -debian/tmp/usr/share/doc/netcdf/netcdf-f90.pdf -debian/tmp/usr/share/doc/netcdf/netcdf-cxx.pdf -debian/tmp/usr/share/doc/netcdf/netcdf-tutorial.pdf -debian/tmp/usr/share/doc/netcdf/netcdf.txt -debian/tmp/usr/share/doc/netcdf/netcdf-install.txt -debian/tmp/usr/share/doc/netcdf/netcdf-c.txt -debian/tmp/usr/share/doc/netcdf/netcdf-f77.txt -debian/tmp/usr/share/doc/netcdf/netcdf-f90.txt -debian/tmp/usr/share/doc/netcdf/netcdf-cxx.txt -debian/tmp/usr/share/doc/netcdf/netcdf-tutorial.txt +#debian/tmp/doc/ncdump-man-1.html +#debian/tmp/doc/ncgen-man-1.html +#debian/tmp/doc/netcdf-c.html +#debian/tmp/doc/netcdf.html +#debian/tmp/doc/netcdf-install.html +#debian/tmp/doc/netcdf-man-3.html +#debian/tmp/doc/netcdf-tutorial.html +#debian/tmp/usr/share/doc/netcdf/netcdf.ps +#debian/tmp/usr/share/doc/netcdf/netcdf-install.ps +#debian/tmp/usr/share/doc/netcdf/netcdf-c.ps +#debian/tmp/usr/share/doc/netcdf/netcdf-tutorial.ps +#debian/tmp/usr/share/doc/netcdf/netcdf.pdf +#debian/tmp/usr/share/doc/netcdf/netcdf-install.pdf +#debian/tmp/usr/share/doc/netcdf/netcdf-c.pdf +#debian/tmp/usr/share/doc/netcdf/netcdf-tutorial.pdf +#debian/tmp/usr/share/doc/netcdf/netcdf.txt +#debian/tmp/usr/share/doc/netcdf/netcdf-install.txt +#debian/tmp/usr/share/doc/netcdf/netcdf-c.txt +#debian/tmp/usr/share/doc/netcdf/netcdf-tutorial.txt diff --git a/debian/netcdf-doc.info b/debian/netcdf-doc.info index 1283534..b696e05 100644 --- a/debian/netcdf-doc.info +++ b/debian/netcdf-doc.info @@ -1,7 +1,4 @@ -debian/tmp/usr/share/info/netcdf-tutorial.info -debian/tmp/usr/share/info/netcdf-cxx.info -debian/tmp/usr/share/info/netcdf-c.info -debian/tmp/usr/share/info/netcdf-f77.info -debian/tmp/usr/share/info/netcdf.info -debian/tmp/usr/share/info/netcdf-f90.info -debian/tmp/usr/share/info/netcdf-install.info +#debian/tmp/usr/share/info/netcdf-tutorial.info +#debian/tmp/usr/share/info/netcdf-c.info +#debian/tmp/usr/share/info/netcdf.info +#debian/tmp/usr/share/info/netcdf-install.info diff --git a/debian/rules b/debian/rules index 3a945c5..4d81220 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools.mk +#include /usr/share/cdbs/1/rules/debhelper.mk +#include /usr/share/cdbs/1/class/autotools.mk # Add here any variable or target overrides you need. @@ -11,17 +11,29 @@ include /usr/share/cdbs/1/class/autotools.mk # Remote sites could be not available at check time, so disabling some tests... #DEB_CONFIGURE_EXTRA_FLAGS := --enable-shared --enable-pic --enable-docs-install --enable-netcdf-4 --with-hdf5=/usr --with-libcf --enable-dap # This is useful to avoid remote Nap checks -DEB_CONFIGURE_EXTRA_FLAGS := --enable-shared --enable-pic --enable-docs-install --enable-netcdf-4 --with-hdf5=/usr --with-libcf --enable-dap --disable-dap-remote-tests -DEB_CONFIGURE_SCRIPT_ENV += FC="gfortran" -DEB_CONFIGURE_SCRIPT_ENV += CXX="g++" -DEB_CONFIGURE_SCRIPT_ENV += CC="gcc" -DEB_CONFIGURE_SCRIPT_ENV += CPPFLAGS="-DgFortran" +#DEB_CONFIGURE_EXTRA_FLAGS := --enable-shared --with-pic --enable-internal-docs --enable-netcdf-4 --enable-dap --disable-dap-remote-tests +#DEB_CONFIGURE_SCRIPT_ENV += CC="gcc" +# +#DEB_MAKE_CHECK_TARGET = check +# +#DEB_INSTALL_CHANGELOGS_ALL = $(CURDIR)/RELEASE_NOTES +# +#DEB_SHLIBDEPS_INCLUDE := debian/tmp/usr/lib/ -DEB_MAKE_CHECK_TARGET = check +# Default stuff for everything +%: + dh $@ --buildsystem=cmake -DEB_INSTALL_CHANGELOGS_ALL = $(CURDIR)/RELEASE_NOTES +# Don't BUILD_DOCS, cf. <https://github.com/Unidata/netcdf-c/issues/56>. +override_dh_auto_configure: + dh_auto_configure -- \ + -DCMAKE_SKIP_RPATH:BOOL=ON \ + -DENABLE_DAP_REMOTE_TESTS:BOOL=OFF \ + -DENABLE_PARALLEL_TESTS:BOOL=OFF \ + -DENABLE_TESTS:BOOL=OFF \ + -DBUILD_DOCS:BOOL=OFF -DEB_SHLIBDEPS_INCLUDE := debian/tmp/usr/lib/ +# -DCMAKE_C_COMPILER=mpicc \ # Any makebuilddir/binary would do, /source doesn't: #makebuilddir/libnetcdf4:: @@ -33,16 +45,6 @@ install/libnetcdfc7:: -a ! -name '*.la' -a ! -name '*.pc' \ -exec cp -d {} debian/libnetcdfc7/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++4:: - 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++4/usr/lib/ \; - install/libcf0:: find debian/tmp/usr/lib/ -name 'libcf.*' -a ! -type d \ -a ! -name '*.so' -a ! -name '*.a' -a ! -name '*.la' -a ! -name '*.pc' \ @@ -64,9 +66,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 $(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/. +# install -m 644 -o root -g root $(CURDIR)/man4/*.html debian/tmp/doc/. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel