[odb-api] 20/21: Add missing symlink
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Aug 30 06:42:58 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 911df4794e924630f391037795a44db31e58efb4
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Tue Aug 29 20:05:50 2017 +0100
Add missing symlink
---
debian/control | 12 ++++++------
debian/libodb-api-dev.links.in | 3 ++-
debian/rules | 7 ++++---
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/debian/control b/debian/control
index 6b81968..be31bda 100644
--- a/debian/control
+++ b/debian/control
@@ -18,13 +18,13 @@ Build-Depends: debhelper (>=10),
libeigen3-dev,
libviennacl-dev,
libarmadillo-dev,
- python-all-dev,
+ python3-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: libodb-api-0
+Package: libodb-api-0d
Section: libs
Architecture: any
Multi-Arch: same
@@ -41,7 +41,7 @@ Package: libodb-api-bin
Section: libs
Architecture: any
Multi-Arch: allowed
-Depends: lib-odb-api-0 ( = ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libodb-api-0d ( = ${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,
@@ -56,7 +56,7 @@ Package: libodb-api-dev
Section: libdevel
Architecture: any
Multi-Arch: same
-Depends: libodb-api-0 ( = ${binary:Version}), ${misc:Depends}
+Depends: libodb-api-0d ( = ${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
@@ -66,11 +66,11 @@ 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
+Package: python3-odb-api
Section: python
Architecture: any
Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}, ${python3: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,
diff --git a/debian/libodb-api-dev.links.in b/debian/libodb-api-dev.links.in
index 12d59b7..1736d61 100644
--- a/debian/libodb-api-dev.links.in
+++ b/debian/libodb-api-dev.links.in
@@ -2,6 +2,7 @@
/usr/lib/@ARCH@/libeckit_geometry.so.0d /usr/lib/@ARCH@/libeckit_geometry.so
/usr/lib/@ARCH@/libeckit_linalg.so.0d /usr/lib/@ARCH@/libeckit_linalg.so
/usr/lib/@ARCH@/libeckit_mpi.so.0d /usr/lib/@ARCH@/libeckit_mpi.so
+/usr/lib/@ARCH@/libeckit_maths.so.0d /usr/lib/@ARCH@/libeckit_maths.so
/usr/lib/@ARCH@/libeckit_option.so.0d /usr/lib/@ARCH@/libeckit_option.so
/usr/lib/@ARCH@/libeckit.so.0d /usr/lib/@ARCH@/libeckit.so
/usr/lib/@ARCH@/libeckit_testing.so.0d /usr/lib/@ARCH@/libeckit_testing.so
@@ -12,4 +13,4 @@
/usr/lib/@ARCH@/libOdb_fortran.so.0d /usr/lib/@ARCH@/libOdb_fortran.so
/usr/lib/@ARCH@/libOdb.so.0d /usr/lib/@ARCH@/libOdb.so
/usr/lib/@ARCH@/libodbtest.so.0d /usr/lib/@ARCH@/libodbtest.so
-/usr/lib/@ARCH@/libodbtools.so.0d /usr/lib/@ARCH@/libodbtools.so
\ No newline at end of file
+/usr/lib/@ARCH@/libodbtools.so.0d /usr/lib/@ARCH@/libodbtools.so
diff --git a/debian/rules b/debian/rules
index 244bc3e..06486ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,13 +4,13 @@
# The magic debhelper rule
%:
- dh $@ --buildsystem=cmake --with=python2
+ dh $@ --buildsystem=cmake --with=python3
DESTDIR:=$(shell pwd)/debian/tmp
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
ARCH:=$(shell dpkg --print-architecture)
-AUTOGENERATED:= libodb-api-0.install libodb-api-dev.install libodb-api-dev.links
+AUTOGENERATED:= libodb-api-0d.install libodb-api-dev.install libodb-api-dev.links
LIBDIR:=/usr/lib/${DEB_HOST_MULTIARCH}
CMAKE_CFLAGS:= \
@@ -20,7 +20,8 @@ CMAKE_CFLAGS:= \
-DENABLE_NETCDF=ON \
-DENABLE_FORTRAN=ON \
-DENABLE_PYTHON=ON \
- -DENABLE_VIENNACL=ON
+ -DENABLE_VIENNACL=ON \
+ -DPYTHON_EXECUTABLE=/usr/bin/python3
override_dh_auto_clean:
--
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