[Debian-astro-commits] [gyoto] 01/01: * Make lintian happy * Move the libgyoto-python* plug-ins to the python*-gyoto packages
Thibaut Jean-Claude Paumard
thibaut at moszumanska.debian.org
Wed Sep 14 10:56:02 UTC 2016
This is an automated email from the git hooks/post-receive script.
thibaut pushed a commit to branch master
in repository gyoto.
commit 706d48ed5ba2b0d3c8b522c16ce873db5778f6d5
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date: Wed Sep 14 12:54:52 2016 +0200
* Make lintian happy
* Move the libgyoto-python* plug-ins to the python*-gyoto packages
---
debian/changelog | 7 +++++--
debian/control | 38 ++++++++++++++++++++++++--------------
debian/gyoto-bin.examples | 2 --
debian/libgyoto5.examples | 1 +
debian/libgyoto5.install | 1 -
debian/python-gyoto.README.Debian | 15 +++++++++++++++
debian/python-gyoto.examples | 1 +
debian/python-gyoto.install | 3 +++
debian/python3-gyoto.README.Debian | 16 ++++++++++++++++
debian/python3-gyoto.examples | 1 +
debian/python3-gyoto.install | 2 ++
debian/rules | 10 +++++++++-
debian/tests/gyoto | 4 +++-
debian/tests/gyoto-mpi | 3 ++-
14 files changed, 82 insertions(+), 22 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index db711f3..577df0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,13 @@
gyoto (1.1.0-1) unstable; urgency=low
- * New upstram release
+ * New upstream release
* Rename the gyoto package to gyoto-bin and add a new gyoto meta-package
package that intalls everything a Gyoto user would expect.
+ * Move examples from gyoto-bin to libgyoto5 package.
+ * Include the Python plug-ins for Gyoto in the respective python*-gyoto
+ packages.
- -- Thibaut Paumard <thibaut at debian.org> Tue, 13 Sep 2016 22:55:27 +0200
+ -- Thibaut Paumard <thibaut at debian.org> Wed, 14 Sep 2016 11:40:40 +0200
gyoto (1.0.2-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index f841904..fcbe437 100644
--- a/debian/control
+++ b/debian/control
@@ -17,8 +17,8 @@ Standards-Version: 3.9.8
X-Python-Version: >= 2.6
X-Python3-Version: >= 3.2
Testsuite: autopkgtest
-Vcs-Git: git://anonscm.debian.org/debian-astro/packages/gyoto.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-astro/packages/gyoto.git
+Vcs-Git: https://anonscm.debian.org/git/debian-astro/packages/gyoto.git
+Vcs-Browser: https://anonscm.debian.org/gitweb/?p=debian-astro/packages/gyoto.git
Homepage: http://gyoto.obspm.fr
Package: gyoto
@@ -27,7 +27,7 @@ Depends: gyoto-bin, yorick-gyoto, python-gyoto, python3-gyoto,
${shlibs:Depends}, ${misc:Depends}
Recommends: mpi-default-bin, libgyoto5-dev
Suggests: gyoto-doc
-Description: General relativistic ray-tracing
+Description: General relativistic geodesic integration and ray-tracing
Gyoto is a framework for computing geodesics in curved
space-times. The gyoto utility program uses this framework to compute
images of astronomical objects in the vicinity of compact objects
@@ -36,12 +36,12 @@ Description: General relativistic ray-tracing
computes this scenery using relativistic ray-tracing, and saves the
result in FITS format.
.
- This meta-package depends on all the Gyoto interfaces (command-line, Yorick,
+ This metapackage depends on all the Gyoto interfaces (command-line, Yorick,
Python 2 and 3).
.
MPI parallelization requires the mpi-default-bin package. Compiling
your own Gyoto plug-in requires the libgyoto5-dev package. The Gyoto
- documention is provided in the gyoto-doc package.
+ documentation is provided in the gyoto-doc package.
Package: gyoto-bin
Architecture: any
@@ -49,7 +49,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: mpi-default-bin
Replaces: gyoto (<< 1.1.0~)
Breaks: gyoto (<< 1.1.0~)
-Description: General relativistic ray-tracing
+Description: General relativistic ray-tracing command-line interface
Gyoto is a framework for computing geodesics in curved
space-times. The gyoto utility program uses this framework to compute
images of astronomical objects in the vicinity of compact objects
@@ -70,21 +70,25 @@ Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
Recommends: gyoto
-Description: General relativistic geodesic integration and ray-tracing
+Description: Gyoto framework main library an standard plug-in
Gyoto aims at providing a framework for computing orbits and
ray-traced images in General relativity. It consists in a shared
library (this package), utility programs (in the gyoto package), and
- a plug-in for the Yorick and Python 2 and 3 programing languages (in
+ a plug-in for the Yorick and Python 2 and 3 programming languages (in
yorick-gyoto, python-gyoto and python3-gyoto respectively). Gyoto can
be extended with plug-ins (see libgyoto5-dev).
.
+ The standard plugin (stdplug) is included in this package. Plug-ins
+ for extending Gyoto in the Python 2 or 3 languages are shipped in the
+ python-gyoto and python3-gyoto packages respectively.
+ .
MPI parallelization requires the gyoto and mpi-default-bin packages.
Package: gyoto-dbg
Architecture: any
Section: debug
Depends: libgyoto5 (= ${binary:Version}),
- gyoto (= ${binary:Version}),
+ gyoto-bin (= ${binary:Version}),
yorick-gyoto (= ${binary:Version}),
python-gyoto (= ${binary:Version}),
python3-gyoto (= ${binary:Version}),
@@ -93,7 +97,7 @@ Description: debugging symbols for the Gyoto framework
Gyoto aims at providing a framework for computing orbits and
ray-traced images in General relativity. It consists in a shared
library (this package), utility programs (in the gyoto package), and
- a plug-in for the Yorick and Python 2 and 3 programing language (in
+ a plug-in for the Yorick and Python 2 and 3 programming language (in
yorick-gyoto, python-gyoto and python3-gyoto).
.
This package contains the debugging symbols for the gyoto, libgyoto5,
@@ -121,7 +125,7 @@ Description: General relativistic geodesic integration for the Yorick language
Gyoto aims at providing a framework for computing orbits and
ray-traced images in General relativity.
.
- This package provides a plug-in for the Yorick programing language
+ This package provides a plug-in for the Yorick programming language
exposing the Gyoto facilities. It allows using Gyoto interactively
from the yorick prompt or running complex Gyoto scripts.
@@ -133,7 +137,10 @@ Description: General relativistic geodesic integration for the Python 2 language
Gyoto aims at providing a framework for computing orbits and
ray-traced images in General relativity.
.
- This package provides an extension for the Python 2 programing language
+ This package also includes a Gyoto plug-in allowing to write new
+ Gyoto objects in the Python 2 language.
+ .
+ This package provides an extension for the Python 2 programming language
exposing the Gyoto facilities. It allows using Gyoto interactively
from the Python prompt or running complex Gyoto scripts.
@@ -145,7 +152,10 @@ Description: General relativistic geodesic integration for the Python 3 language
Gyoto aims at providing a framework for computing orbits and
ray-traced images in General relativity.
.
- This package provides an extension for the Python 3 programing language
+ This package also includes a Gyoto plug-in allowing to write new
+ Gyoto objects in the Python 3 language.
+ .
+ This package provides an extension for the Python 3 programming language
exposing the Gyoto facilities. It allows using Gyoto interactively
from the Python 3 prompt or running complex Gyoto scripts.
@@ -156,7 +166,7 @@ Depends: ${misc:Depends}
Description: documentation for the Gyoto library
Gyoto aims at providing a framework for computing orbits and
ray-traced images in General relativity. It consists in a library
- (libgyoto), utility programs, and a plug-in for the Yorick programing
+ (libgyoto), utility programs, and a plug-in for the Yorick programming
language.
.
This package contains the Gyoto Reference Manual.
diff --git a/debian/gyoto-bin.examples b/debian/gyoto-bin.examples
deleted file mode 100644
index fe1130f..0000000
--- a/debian/gyoto-bin.examples
+++ /dev/null
@@ -1,2 +0,0 @@
-doc/examples/*
-plugins/python/doc/examples/*
diff --git a/debian/libgyoto5.examples b/debian/libgyoto5.examples
new file mode 100644
index 0000000..09a90d6
--- /dev/null
+++ b/debian/libgyoto5.examples
@@ -0,0 +1 @@
+doc/examples/*
diff --git a/debian/libgyoto5.install b/debian/libgyoto5.install
index 6be261b..33afb49 100755
--- a/debian/libgyoto5.install
+++ b/debian/libgyoto5.install
@@ -1,4 +1,3 @@
#! /usr/bin/dh-exec
usr/lib/*/libgyoto.so.?.?.?
usr/lib/*/gyoto/*/libgyoto*.so*
-python-plugins/libgyoto-python*.so usr/lib/${DEB_HOST_MULTIARCH}/gyoto/${DEB_GYOTO_SOVERS}/
diff --git a/debian/python-gyoto.README.Debian b/debian/python-gyoto.README.Debian
new file mode 100644
index 0000000..bf6914f
--- /dev/null
+++ b/debian/python-gyoto.README.Debian
@@ -0,0 +1,15 @@
+Python bindings and plug-in for Gyoto
+-------------------------------------
+
+This packages comprises two components:
+ - a Python extension to use Gyoto from within Python;
+ - a Gyoto plug-in to use Python from within Gyoto.
+
+To use the latter, the simplest is to set the GYOTO_PLUGINS
+envirenment variable, for instance in your ~/.bashrc file:
+
+ export GYOTO_PLUGINS=python,stdplug,nofail:lorene
+
+The `examples' directory contains examples for both components.
+
+ -- Thibaut Paumard <thibaut at debian.org>, Wed, 14 Sep 2016 12:53:02 +0200
diff --git a/debian/python-gyoto.examples b/debian/python-gyoto.examples
index 17e2c7f..1350a2c 100644
--- a/debian/python-gyoto.examples
+++ b/debian/python-gyoto.examples
@@ -1 +1,2 @@
python/example*.py
+plugins/python/doc/examples/*
diff --git a/debian/python-gyoto.install b/debian/python-gyoto.install
new file mode 100755
index 0000000..09c693e
--- /dev/null
+++ b/debian/python-gyoto.install
@@ -0,0 +1,3 @@
+#! /usr/bin/dh-exec
+python-plugins/libgyoto-python.so
+python-plugins/libgyoto-python2*.so usr/lib/${DEB_HOST_MULTIARCH}/gyoto/${DEB_GYOTO_SOVERS}/
diff --git a/debian/python3-gyoto.README.Debian b/debian/python3-gyoto.README.Debian
new file mode 100644
index 0000000..449312d
--- /dev/null
+++ b/debian/python3-gyoto.README.Debian
@@ -0,0 +1,16 @@
+Python 3 bindings and plug-in for Gyoto
+---------------------------------------
+
+This packages comprises two components:
+ - a Python 3 extension to use Gyoto from within Python 3;
+ - a Gyoto plug-in to use Python 3 from within Gyoto.
+
+To use the latter, the simplest is to set the GYOTO_PLUGINS
+envirenment variable, for instance in your ~/.bashrc file:
+
+ export GYOTO_PLUGINS=python3,stdplug,nofail:lorene
+
+The `examples' directory contains examples for both components.
+
+
+ -- Thibaut Paumard <thibaut at debian.org>, Wed, 14 Sep 2016 12:54:16 +0200
diff --git a/debian/python3-gyoto.examples b/debian/python3-gyoto.examples
index 17e2c7f..1350a2c 100644
--- a/debian/python3-gyoto.examples
+++ b/debian/python3-gyoto.examples
@@ -1 +1,2 @@
python/example*.py
+plugins/python/doc/examples/*
diff --git a/debian/python3-gyoto.install b/debian/python3-gyoto.install
new file mode 100755
index 0000000..da17c83
--- /dev/null
+++ b/debian/python3-gyoto.install
@@ -0,0 +1,2 @@
+#! /usr/bin/dh-exec
+python-plugins/libgyoto-python3*.so usr/lib/${DEB_HOST_MULTIARCH}/gyoto/${DEB_GYOTO_SOVERS}/
diff --git a/debian/rules b/debian/rules
index e43e2e9..3ba5078 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,7 @@ export DH_OPTIONS
DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
# Hardened flags
+export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
@@ -64,7 +65,11 @@ override_dh_auto_build-arch:
cd ../../ ; \
cp plugins/python/lib/.libs/libgyoto-$$python.so python-plugins/ ; \
done
- cd python-plugins ; ln -s libgyoto-`which python | xargs readlink | xargs basename`.so libgyoto-python.so
+ cd python-plugins ; \
+ set -e; \
+ for python in python python2 python3 ; do \
+ ln -s libgyoto-`which $${python} | xargs readlink | xargs basename`.so libgyoto-$${python}.so ; \
+ done
override_dh_auto_build-indep:
$(MAKE) doc
@@ -72,6 +77,9 @@ override_dh_auto_build-indep:
override_dh_auto_configure:
dh_auto_configure -- $(configure_flags)
+override_dh_makeshlibs:
+ dh_makeshlibs -Xstdplug -Xpython
+
override_dh_auto_clean:
[ ! -f python/Makefile ] || make -C python clean
rm -Rf python-plugins
diff --git a/debian/tests/gyoto b/debian/tests/gyoto
index c8d8725..ab5faba 100755
--- a/debian/tests/gyoto
+++ b/debian/tests/gyoto
@@ -1,10 +1,12 @@
#!/bin/sh
set -e
-EXAMPLES_DIR=/usr/share/doc/gyoto-bin/examples
+EXAMPLES_DIR=/usr/share/doc/libgyoto5/examples
BASE_NAMES=`basename -s.xml ${EXAMPLES_DIR}/*.xml | sed 's/example-[^ ]*-rotstar3_1//'`
GYOTO="/usr/bin/gyoto --nprocesses=0 --nthreads=4 --resolution=32"
+export GYOTO_PLUGINS=stdplug,python
+
for base in ${BASE_NAMES} ; do
${GYOTO} ${EXAMPLES_DIR}/${base}.xml \!${ADT_ARTIFACTS}/${base}.fits ;
done
diff --git a/debian/tests/gyoto-mpi b/debian/tests/gyoto-mpi
index 25ea5d9..c4c1cae 100755
--- a/debian/tests/gyoto-mpi
+++ b/debian/tests/gyoto-mpi
@@ -1,11 +1,12 @@
#!/bin/sh
set -e
-EXAMPLES_DIR=/usr/share/doc/gyoto/examples
+EXAMPLES_DIR=/usr/share/doc/libgyoto5/examples
BASE_NAMES=`basename -s.xml ${EXAMPLES_DIR}/*.xml | sed 's/example-[^ ]*-rotstar3_1//'`
GYOTO="/usr/bin/gyoto --nprocesses=4 --nthreads=1 --resolution=32"
export OMPI_MCA_orte_rsh_agent=/bin/false
+export GYOTO_PLUGINS=stdplug,python
for base in ${BASE_NAMES} ; do
orterun --mca btl_tcp_if_include lo ${GYOTO} ${EXAMPLES_DIR}/${base}.xml \!${ADT_ARTIFACTS}/${base}-mpi.fits ;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/gyoto.git
More information about the Debian-astro-commits
mailing list