[netcdf] 02/02: First changes for supporting 4.3 series.
Francesco Lovergine
frankie at moszumanska.debian.org
Sat Mar 22 17:01:53 UTC 2014
This is an automated email from the git hooks/post-receive script.
frankie pushed a commit to branch netcdf4.3
in repository netcdf.
commit 5e2d6c94a8b4824bce4bd8f995e57c72aaa14248
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date: Sat Mar 22 17:56:32 2014 +0100
First changes for supporting 4.3 series.
---
debian/README.source | 13 --------
debian/changelog | 11 +++++++
debian/compat | 2 +-
debian/control | 78 ++++++++++-------------------------------------
debian/libcf0.dirs | 1 -
debian/libnetcdfc++4.dirs | 1 -
debian/libnetcdff5.dirs | 1 -
debian/rules | 69 ++++++++---------------------------------
8 files changed, 41 insertions(+), 135 deletions(-)
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index ef8549e..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,13 +0,0 @@
-The upstream tarball is now maintained as a separate archive within
-the .orig.tar.gz. It has to be saved in netcdf-<version>/upstream/ and the .orig tarball
-needs to be crated running a command like:
-
-tar czvf tarballs/netcdf-<version>/netcdf_<version>.orig.tar.gz netcdf-<version>
-
-At build time, cdbs will create a build-tree/netcdf-<version> sub-tree in parallel
-with the debian/ directory. Quilt can be as follows
-
-cd build-tree/netcdf-<version>
-QUILT_PATCHES=$(pwd)/../debian/patches quilt <command>
-
-i.e. you have to consider the build-tree as its root tree.
diff --git a/debian/changelog b/debian/changelog
index b681f17..1e6c6a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+netcdf (1:4.3.1.1-0~exp1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ * Moved to debhelper level 9.
+ * Now using modern debhelper instead of cdbs.
+ * Drop C++/Fortran support. They will be provided by new source packages.
+ * The libnetcdf-dev now provides only the traditional C interface.
+ * Added new b-d on doxgen and graphviz.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Sat, 22 Mar 2014 15:19:36 +0100
+
netcdf (1:4.1.3-7) unstable; urgency=low
* Team upload
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 669e8b8..9935efe 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,19 @@ Section: science
Priority: optional
Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
-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.4
+Build-Depends: debhelper (>= 9)
+ , texinfo
+ , zlib1g-dev
+ , libhdf5-dev (>= 1.8.8-1~)
+ , libdap-dev
+ , libcurl4-gnutls-dev
+ , texlive-base
+ , texlive-latex-base
+ , libcunit1-dev
+ , autotools-dev
+ , doxygen
+ , graphviz
+Standards-Version: 3.9.5
Homepage: http://www.unidata.ucar.edu/software/netcdf/
Vcs-Browser: http://git.debian.org/?p=pkg-grass/netcdf.git
Vcs-Git: git://git.debian.org/git/pkg-grass/netcdf.git
@@ -42,65 +52,11 @@ 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
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libnetcdf6 (<< 1:4.1.1-7~), libnetcdf4
-Breaks: libnetcdf6 (<< 1:4.1.1-7~), libnetcdf4
-Homepage: http://www.unidata.ucar.edu/software/libcf/
-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 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: libnetcdfc7 (= ${binary:Version}), libnetcdff5 (= ${binary:Version}),
- libnetcdfc++4 (= ${binary:Version}), libcf0 (= ${binary:Version}), ${misc:Depends}
+Depends: libnetcdfc7 (= ${binary:Version}), ${misc:Depends}
Suggests: gdb
Description: debugging symbols for NetCDF
This package contains the files that make it possible to debug the
@@ -110,8 +66,7 @@ Description: debugging symbols for NetCDF
Package: libnetcdf-dev
Section: libdevel
Architecture: any
-Depends: libnetcdfc7 (= ${binary:Version}), libnetcdff5 (= ${binary:Version}),
- libnetcdfc++4 (= ${binary:Version}), libcf0 (= ${binary:Version}), ${misc:Depends}
+Depends: libnetcdfc7 (= ${binary:Version}), ${misc:Depends}
Suggests: netcdf-bin, netcdf-doc
Recommends: pkg-config
Description: Development kit for NetCDF
@@ -122,8 +77,7 @@ Description: Development kit for NetCDF
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.
+ This package includes everything needed for developing in C.
Package: netcdf-bin
Section: science
diff --git a/debian/libcf0.dirs b/debian/libcf0.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/libcf0.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
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/rules b/debian/rules
index 3a945c5..56cdcdc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,72 +1,29 @@
#!/usr/bin/make -f
-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.
-
# Note that hdf5 dir has to be specified due to a bug into fortran/Makefile.am which causes
# skipping of fort-nc4.c without that.
#
# 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"
+CONFIGURE_EXTRA_FLAGS := --enable-shared --enable-pic --enable-docs-install \
+ --enable-netcdf-4 --with-hdf5=/usr --with-libcf \
+ --enable-diskless \
+ --enable-doxygen \
+ --enable-dot \
+ --enable-dap --disable-dap-remote-tests \
DEB_MAKE_CHECK_TARGET = check
-DEB_INSTALL_CHANGELOGS_ALL = $(CURDIR)/RELEASE_NOTES
-
-DEB_SHLIBDEPS_INCLUDE := debian/tmp/usr/lib/
+%:
+ dh $@ --buildsystem autoconf --sourcedirectory $(CURDIR)
# Any makebuilddir/binary would do, /source doesn't:
#makebuilddir/libnetcdf4::
# autoreconf -vfi
-install/libnetcdfc7::
- find debian/tmp/usr/lib/ -name 'libnetcdf.*' -a ! -type d \
- -a ! -name '*.so' -a ! -name '*.a' \
- -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' \
- -exec cp -d {} debian/libcf0/usr/lib/ \;
-
-install/libnetcdf-dev::
- cp debian/tmp/usr/include/* debian/libnetcdf-dev/usr/include/.
- 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, at FLIBS@,,' debian/libnetcdf-dev/usr/lib/pkgconfig/netcdf.pc
- # move links and files
- find debian/tmp/usr/lib/ -type l -a -name "libnetcdf*" -a -name '*.so' -exec cp -d {} debian/libnetcdf-dev/usr/lib/. \;
- find debian/tmp/usr/lib/ -type f -a -name "libnetcdf*" -a -name '*.a' -exec cp -d {} debian/libnetcdf-dev/usr/lib/. \;
-
-install/netcdf-bin::
- mv debian/tmp/usr/bin/* debian/netcdf-bin/usr/bin/
-
-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/.
+override_dh_auto_configure:
+ dh_auto_configure -- $(CONFIGURE_EXTRA_FLAGS)
+override_dh_auto_clean:
+ dh_auto_clean
+ rm -f libsrc/netcdf.3
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git
More information about the Pkg-grass-devel
mailing list