[odb-api] 10/21: WIP: Next round of build changes
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Aug 30 06:42:54 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository odb-api.
commit b5e2cbeeb08e955513df8169b3829a88d851a502
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Tue Aug 29 15:36:15 2017 +0100
WIP: Next round of build changes
---
debian/control | 56 +++++++++++++++++++++++++++++++---------
debian/libodb-api-0.install.in | 1 +
debian/libodb-api-bin.install | 1 +
debian/libodb-api-dev.install.in | 3 +++
debian/rules | 14 +++++-----
debian/watch | 2 +-
6 files changed, 58 insertions(+), 19 deletions(-)
diff --git a/debian/control b/debian/control
index 80dae0d..44af90a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: odb-api
Section: utils
Priority: optional
Maintainer: Alastair McKinstry <mckinstry at debian.org>
-Build-Depends: debhelper (>=10),
+Build-Depends: debhelper (>=10),
+ dh-python,
gfortran,
cmake (>= 2.8.11),
libboost-dev (>= 1.47.0), libboost-test-dev,
@@ -14,31 +15,46 @@ Build-Depends: debhelper (>=10),
libeigen3-dev,
libviennacl-dev,
libarmadillo-dev,
- libpython2.7-dev,
+ python-all-dev,
libnetcdf-dev
Standards-Version: 4.1.0
Homepage: https://software.ecmwf.int/wiki/display/ODBAPI
Vcs-Git: git://anonscm.debian.org/debian-science/packages/odb-api.git
-Package: libemos0d
+Package: libodb-api-0
Section: libs
Architecture: any
Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}, libemos-data
-Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Observational Data processing API for meteorology
- The Interpolation library (EMOSLIB) includes Interpolation software and GRIB,
- BUFR, CREX encoding/decoding routines. It is used by the ECMWF meteorological
- archival and retrieval system (MARS) and also by the ECMWF graphics
- package MetView.
+ ODB API is a software developed at ECMWF for encoding and processing of
+ observational data. It includes a SQL filtering and statistics engine,
+ command line tools and APIs for C/C++, Fortran and Python.
+ .
+ ODB API works with data formats used in the ECMWF observational feedback archive.
+ Development of ODB API has been partially funded by the UK Met Office.
+Package: libodb-api-bin
+Section: libs
+Architecture: any
+Multi-Arch: allowed
+Depends: lib-odb-api-0 ( = ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: Tools for the Observational Data Processing (ODB) API
+ ODB API is a software developed at ECMWF for encoding and processing of
+ observational data. It includes a SQL filtering and statistics engine,
+ command line tools and APIs for C/C++, Fortran and Python.
+ .
+ ODB API works with data formats used in the ECMWF observational feedback archive.
+ Development of ODB API has been partially funded by the UK Met Office.
+ .
+ This package provides tools
+
Package: libodb-api-dev
Section: libdevel
Architecture: any
Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: libemos0d ( = ${binary:Version}), ${misc:Depends}, libeccodes-tools | libemos-bin:any
-Recommends: pkg-config
+Depends: libodb-api-0 ( = ${binary:Version}), ${misc:Depends}
+Recommends: pkg-config, gfortran
Description: Observational Data processing API for meteorology
ODB API is a software developed at ECMWF for encoding and processing of
observational data. It includes a SQL filtering and statistics engine,
@@ -46,3 +62,19 @@ Description: Observational Data processing API for meteorology
.
ODB API works with data formats used in the ECMWF observational feedback archive.
Development of ODB API has been partially funded by the UK Met Office.
+
+Package: python-odb-api
+Section: python
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Python Observational Data processing API for meteorology
+ ODB API is a software developed at ECMWF for encoding and processing of
+ observational data. It includes a SQL filtering and statistics engine,
+ command line tools and APIs for C/C++, Fortran and Python.
+ .
+ ODB API works with data formats used in the ECMWF observational feedback archive.
+ Development of ODB API has been partially funded by the UK Met Office.
+ .
+ This package provides the Python wrappers to the ODB API.
+
diff --git a/debian/libodb-api-0.install.in b/debian/libodb-api-0.install.in
new file mode 100644
index 0000000..3903ce2
--- /dev/null
+++ b/debian/libodb-api-0.install.in
@@ -0,0 +1 @@
+lib/*.so /usr/lib/@ARCH@/
diff --git a/debian/libodb-api-bin.install b/debian/libodb-api-bin.install
new file mode 100644
index 0000000..10fd086
--- /dev/null
+++ b/debian/libodb-api-bin.install
@@ -0,0 +1 @@
+bin/* /usr/bin
\ No newline at end of file
diff --git a/debian/libodb-api-dev.install.in b/debian/libodb-api-dev.install.in
new file mode 100644
index 0000000..60e9ec5
--- /dev/null
+++ b/debian/libodb-api-dev.install.in
@@ -0,0 +1,3 @@
+include/* /usr/include
+lib/pkgconfig/* /usr/include/@ARCH@/pkgconfig
+share/eckit/cmake/* /usr/lib/@ARCH@/cmake/eckit
diff --git a/debian/rules b/debian/rules
index 4b795ab..276a5eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,17 +4,16 @@
# The magic debhelper rule
%:
- dh $@ --buildsystem=cmake
+ dh $@ --buildsystem=cmake,python2
DESTDIR:=$(shell pwd)/debian/tmp
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
ARCH:=$(shell dpkg --print-architecture)
-#AUTOGENERATED:= libemos-dev.install libemos-dev.links libemos0d.install
+AUTOGENERATED:= libodb-api-0.install libodb-api-dev.install
LIBDIR:=/usr/lib/${DEB_HOST_MULTIARCH}
CMAKE_CFLAGS:= \
- -DCMAKE_INSTALL_PREFIX=${DESTDIR} \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_SHARED_LIBS=ON \
-DENABLE_EIGEN=ON \
@@ -23,13 +22,16 @@ CMAKE_CFLAGS:= \
-DENABLE_PYTHON=ON \
-DENABLE_VIENNACL=ON
-# for f in ${AUTOGENERATED} ; do \
-# sed -e 's%@ARCH@%${DEB_HOST_MULTIARCH}%g' < debian/$$f.in > debian/$$f ; \
-# done
+override_dh_auto_clean:
+ rm -f $(patsubst %, debian/%, ${AUTOGENERATED})
+ dh_auto_clean
override_dh_auto_test:
@echo Tests currently disabled - overflow disk space
override_dh_auto_configure:
+ for f in ${AUTOGENERATED} ; do \
+ sed -e 's%@ARCH@%${DEB_HOST_MULTIARCH}%g' < debian/$$f.in > debian/$$f ; \
+ done
dh_auto_configure -- ${CMAKE_CFLAGS}
diff --git a/debian/watch b/debian/watch
index c26b521..d9f5feb 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-https://software.ecmwf.int/wiki/display/EMOS/Releases /wiki/download/attachments/3473472/libemos\-(.+)\-Source\.tar\.gz\?api=v2
+https://software.ecmwf.int/wiki/display/ODBAPI/Releases /wiki/download/attachments/3473472/odbapi\-(.+)\-Source\.tar\.gz\?api=v2
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/odb-api.git
More information about the debian-science-commits
mailing list