[Debian-astro-commits] [gyoto] 01/01: Build 1.1.0, include the python plug-ins, rename old gyoto package and create gyoto meta-package.
Thibaut Jean-Claude Paumard
thibaut at moszumanska.debian.org
Tue Sep 13 21:24:37 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 a906f46113b593c84439f5c52b5b0f9ef295a60f
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date: Tue Sep 13 23:23:21 2016 +0200
Build 1.1.0, include the python plug-ins, rename old gyoto package and create gyoto meta-package.
---
debian/changelog | 8 ++++
debian/control | 54 ++++++++++++++++------
debian/docs | 2 -
debian/gyoto-bin.docs | 1 +
debian/gyoto-bin.examples | 2 +
debian/{gyoto.install => gyoto-bin.install} | 0
debian/{gyoto.manpages => gyoto-bin.manpages} | 0
debian/gyoto-doc.docs | 1 +
debian/gyoto.examples | 1 -
debian/install_for_all_pythons | 4 +-
debian/libgyoto4-dev.links | 2 -
debian/libgyoto4.install | 2 -
debian/libgyoto4.links | 2 -
...libgyoto4-dev.install => libgyoto5-dev.install} | 0
debian/libgyoto5-dev.links | 2 +
debian/libgyoto5.install | 4 ++
debian/libgyoto5.links | 2 +
debian/patches/check-ld-library-path | 23 ---------
debian/patches/check-locale | 28 -----------
debian/patches/series | 2 -
debian/patches/user_guide-timestamp | 25 ----------
debian/rules | 18 +++++++-
debian/tests/control | 6 +--
debian/tests/gyoto | 2 +-
24 files changed, 83 insertions(+), 108 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 76bfc58..db711f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gyoto (1.1.0-1) unstable; urgency=low
+
+ * New upstram release
+ * Rename the gyoto package to gyoto-bin and add a new gyoto meta-package
+ package that intalls everything a Gyoto user would expect.
+
+ -- Thibaut Paumard <thibaut at debian.org> Tue, 13 Sep 2016 22:55:27 +0200
+
gyoto (1.0.2-3) unstable; urgency=low
* Bug fix: "building on kfreebsd", thanks to Jon Boden (Closes:
diff --git a/debian/control b/debian/control
index c054f77..f841904 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,8 @@ Build-Depends: debhelper (>= 9~), yorick-dev, yorick-yutils,
libboost-dev (>= 1.53.1), libboost-mpi-dev, dh-autoreconf,
mpi-default-dev, dh-python, python-all-dev (>= 2.6.6-3~),
python-setuptools, python3-all-dev, python3-setuptools,
- swig3.0, python-numpy, python3-numpy, doxygen, dh-exec (>=0.3)
+ swig3.0, python-numpy, python3-numpy, doxygen, dh-exec (>=0.3),
+ pkg-config
Build-Depends-Indep: doxygen-latex,
texlive-bibtex-extra, texlive-latex-base,
texlive-lang-french, tipa
@@ -21,9 +22,33 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-astro/packages/gyoto.git
Homepage: http://gyoto.obspm.fr
Package: gyoto
+Architecture: all
+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
+ 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
+ (e.g. black-holes). Such images are distorted by strong gravitational
+ lensing. The gyoto program takes a scenery description in XML format,
+ 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,
+ 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.
+
+Package: gyoto-bin
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: mpi-default-bin
+Replaces: gyoto (<< 1.1.0~)
+Breaks: gyoto (<< 1.1.0~)
Description: General relativistic ray-tracing
Gyoto is a framework for computing geodesics in curved
space-times. The gyoto utility program uses this framework to compute
@@ -33,13 +58,14 @@ Description: General relativistic ray-tracing
computes this scenery using relativistic ray-tracing, and saves the
result in FITS format.
.
- More complex uses of the Gyoto framework can be achieved using the
- yorick-gyoto, python-gyoto or python3-gyoto packages. Gyoto can be
- extended with plug-ins (see libgyoto4-dev).
+ This package contains the `gyoto' command-line utility. More complex
+ uses of the Gyoto framework can be achieved using the yorick-gyoto,
+ python-gyoto or python3-gyoto packages. Gyoto can be extended with
+ plug-ins (see libgyoto5-dev).
.
MPI parallelization requires the mpi-default-bin package.
-Package: libgyoto4
+Package: libgyoto5
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
@@ -50,36 +76,36 @@ Description: General relativistic geodesic integration and ray-tracing
library (this package), utility programs (in the gyoto package), and
a plug-in for the Yorick and Python 2 and 3 programing languages (in
yorick-gyoto, python-gyoto and python3-gyoto respectively). Gyoto can
- be extended with plug-ins (see libgyoto4-dev).
+ be extended with plug-ins (see libgyoto5-dev).
.
MPI parallelization requires the gyoto and mpi-default-bin packages.
Package: gyoto-dbg
Architecture: any
Section: debug
-Depends: libgyoto4 (= ${binary:Version}),
- gyoto (= ${binary:Version}) [!kfreebsd-any],
+Depends: libgyoto5 (= ${binary:Version}),
+ gyoto (= ${binary:Version}),
yorick-gyoto (= ${binary:Version}),
python-gyoto (= ${binary:Version}),
python3-gyoto (= ${binary:Version}),
${misc:Depends}
-Description: debugging symbols for gyoto, libgyoto4 and yorick-gyoto
+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
yorick-gyoto, python-gyoto and python3-gyoto).
.
- This package contains the debugging symbols for the gyoto, libgyoto4,
+ This package contains the debugging symbols for the gyoto, libgyoto5,
yorick-gyoto, python-gyoto and python3-gyoto packages.
-Package: libgyoto4-dev
+Package: libgyoto5-dev
Architecture: any
Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libgyoto4 (= ${binary:Version}),
+Depends: ${shlibs:Depends}, ${misc:Depends}, libgyoto5 (= ${binary:Version}),
libc-dev, libxerces-c3.1
-Replaces: libgyoto0-dev, libgyoto1-dev, libgyoto2-dev
-Breaks: libgyoto0-dev, libgyoto1-dev, libgyoto2-dev
+Replaces: libgyoto0-dev, libgyoto1-dev, libgyoto2-dev, libgyoto4-dev
+Breaks: libgyoto0-dev, libgyoto1-dev, libgyoto2-dev, libgyoto4-dev
Description: development files for libgyoto
Gyoto aims at providing a framework for computing orbits and
ray-traced images in General relativity.
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index a68e45a..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,2 +0,0 @@
-README
-README.lorene
diff --git a/debian/gyoto-bin.docs b/debian/gyoto-bin.docs
new file mode 100644
index 0000000..e845566
--- /dev/null
+++ b/debian/gyoto-bin.docs
@@ -0,0 +1 @@
+README
diff --git a/debian/gyoto-bin.examples b/debian/gyoto-bin.examples
new file mode 100644
index 0000000..fe1130f
--- /dev/null
+++ b/debian/gyoto-bin.examples
@@ -0,0 +1,2 @@
+doc/examples/*
+plugins/python/doc/examples/*
diff --git a/debian/gyoto.install b/debian/gyoto-bin.install
similarity index 100%
rename from debian/gyoto.install
rename to debian/gyoto-bin.install
diff --git a/debian/gyoto.manpages b/debian/gyoto-bin.manpages
similarity index 100%
rename from debian/gyoto.manpages
rename to debian/gyoto-bin.manpages
diff --git a/debian/gyoto-doc.docs b/debian/gyoto-doc.docs
index 9a507e9..ea14563 100644
--- a/debian/gyoto-doc.docs
+++ b/debian/gyoto-doc.docs
@@ -1,2 +1,3 @@
doc/html
doc/user_guide/GyotoManual.pdf
+README
diff --git a/debian/gyoto.examples b/debian/gyoto.examples
deleted file mode 100644
index 09a90d6..0000000
--- a/debian/gyoto.examples
+++ /dev/null
@@ -1 +0,0 @@
-doc/examples/*
diff --git a/debian/install_for_all_pythons b/debian/install_for_all_pythons
index 47137ec..8950c2a 100644
--- a/debian/install_for_all_pythons
+++ b/debian/install_for_all_pythons
@@ -4,8 +4,8 @@ cd python
for pytag in "" 3 ; do
for python in `py${pytag}versions -s`; do
for component in "" _std ; do
- $python setup${component}.py install --install-layout=deb --prefix=../debian/python${pytag}-gyoto/usr ;
+ $python setup${component}.py install --install-layout=deb --root=../debian/python${pytag}-gyoto ;
done ;
done ;
done
-exit 0
\ No newline at end of file
+exit 0
diff --git a/debian/libgyoto4-dev.links b/debian/libgyoto4-dev.links
deleted file mode 100755
index 8a291d1..0000000
--- a/debian/libgyoto4-dev.links
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /usr/bin/dh-exec
-usr/lib/${DEB_HOST_MULTIARCH}/libgyoto.so.4 usr/lib/${DEB_HOST_MULTIARCH}/libgyoto.so
diff --git a/debian/libgyoto4.install b/debian/libgyoto4.install
deleted file mode 100644
index 535fca9..0000000
--- a/debian/libgyoto4.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libgyoto.so.?.?.?
-usr/lib/*/gyoto/*/libgyoto*.so*
diff --git a/debian/libgyoto4.links b/debian/libgyoto4.links
deleted file mode 100755
index 69440c6..0000000
--- a/debian/libgyoto4.links
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /usr/bin/dh-exec
-usr/lib/${DEB_HOST_MULTIARCH}/libgyoto.so.4.0.0 usr/lib/${DEB_HOST_MULTIARCH}/libgyoto.so.4
diff --git a/debian/libgyoto4-dev.install b/debian/libgyoto5-dev.install
similarity index 100%
rename from debian/libgyoto4-dev.install
rename to debian/libgyoto5-dev.install
diff --git a/debian/libgyoto5-dev.links b/debian/libgyoto5-dev.links
new file mode 100755
index 0000000..1f00179
--- /dev/null
+++ b/debian/libgyoto5-dev.links
@@ -0,0 +1,2 @@
+#! /usr/bin/dh-exec
+usr/lib/${DEB_HOST_MULTIARCH}/libgyoto.so.5 usr/lib/${DEB_HOST_MULTIARCH}/libgyoto.so
diff --git a/debian/libgyoto5.install b/debian/libgyoto5.install
new file mode 100755
index 0000000..6be261b
--- /dev/null
+++ b/debian/libgyoto5.install
@@ -0,0 +1,4 @@
+#! /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/libgyoto5.links b/debian/libgyoto5.links
new file mode 100755
index 0000000..10ba0e5
--- /dev/null
+++ b/debian/libgyoto5.links
@@ -0,0 +1,2 @@
+#! /usr/bin/dh-exec
+usr/lib/${DEB_HOST_MULTIARCH}/libgyoto.so.5.0.0 usr/lib/${DEB_HOST_MULTIARCH}/libgyoto.so.5
diff --git a/debian/patches/check-ld-library-path b/debian/patches/check-ld-library-path
deleted file mode 100644
index fe937e6..0000000
--- a/debian/patches/check-ld-library-path
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Fix LD_LIBRARY_PATH in CHECK_CMD
- Sometimes the libtool wrapper around gyoto fails to find the plug-ins in
- lib/.libs. This causes FTBFS. Set LD_LIBRARY_PATH to include this directory.
-Author: Thibaut Paumard
-Origin: upstream
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=813725
-Applied-Upstream: 9006be3211f0daeaf32f1ff49a4b8accb1e7eb48
-Last-Update: 2016-02-10
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-diff --git a/bin/Makefile.am b/bin/Makefile.am
-index d443134..7985a1e 100644
---- a/bin/Makefile.am
-+++ b/bin/Makefile.am
-@@ -62,7 +62,7 @@ CLEANFILES += $(CHECK_RESULTS) $(CHECK_MPI_RESULTS)
-
- MPIRUN = mpirun
-
--CHECK_CMD = ./gyoto -pstdplug -r32 -T8 -P0
-+CHECK_CMD = LD_LIBRARY_PATH=@top_builddir@/lib/.libs/:$(LD_LIBRARY_PATH) ./gyoto -pstdplug -r32 -T8 -P0
-
- check-nompi-clean:
- rm -f $(CHECK_RESULTS)
diff --git a/debian/patches/check-locale b/debian/patches/check-locale
deleted file mode 100644
index dfc5824..0000000
--- a/debian/patches/check-locale
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Make sure checks are done with UTF8 locale
-Author: Thibaut Paumard <thibaut at debian.org>
-Origin: vendor
-Forwarded: no
-Last-Update: 2013-07-28
-
---- a/bin/Makefile.am
-+++ b/bin/Makefile.am
-@@ -11,7 +11,7 @@
- gyoto_CPPFLAGS = $(AM_CPPFLAGS) $(CFITSIOCPPFLAGS)
- gyoto_LDFLAGS = $(AM_LDFLAGS) $(CFITSIOLDFLAGS) -export-dynamic
-
--CHECK_CMD = unset GYOTO_PLUGINS && ./gyoto
-+CHECK_CMD = unset GYOTO_PLUGINS && LANG=C.UTF-8 ./gyoto
- check: gyoto
- $(CHECK_CMD) ../doc/examples/example-thin-disk.xml \
- \!example-thin-disk.fits
---- a/bin/Makefile.in
-+++ b/bin/Makefile.in
-@@ -301,7 +301,7 @@
- gyoto_LDADD = @top_builddir@/lib/libgyoto.la
- gyoto_CPPFLAGS = $(AM_CPPFLAGS) $(CFITSIOCPPFLAGS)
- gyoto_LDFLAGS = $(AM_LDFLAGS) $(CFITSIOLDFLAGS) -export-dynamic
--CHECK_CMD = unset GYOTO_PLUGINS && ./gyoto
-+CHECK_CMD = unset GYOTO_PLUGINS && LANG=C.UTF-8 ./gyoto
- all: all-am
-
- .SUFFIXES:
diff --git a/debian/patches/series b/debian/patches/series
index c7cea01..b8c491c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
interpreter-path
-check-ld-library-path
-user_guide-timestamp
diff --git a/debian/patches/user_guide-timestamp b/debian/patches/user_guide-timestamp
deleted file mode 100644
index b899125..0000000
--- a/debian/patches/user_guide-timestamp
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Hardcode last-change date in user manual
-Author: Thibaut Paumard
-Origin: upstream
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=797518
-Applied-Upstream: 67dc38bcaba46606f51fc62ecda177093d643603
-Last-Update: 2016-02-10
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-diff --git a/doc/user_guide/GyotoManual.tex b/doc/user_guide/GyotoManual.tex
-index c774735..af1b294 100644
---- a/doc/user_guide/GyotoManual.tex
-+++ b/doc/user_guide/GyotoManual.tex
-@@ -58,8 +58,10 @@
-
- \vspace{0.5cm}
-
--\Large{Updated}
--\today
-+% Let's enter the date manually. Need to update it at least for each
-+% release. Use git log to find out the last change to the user manual.
-+\Large{Updated June 22, 2015}
-+%\today
-
- \vspace{4cm}
-
diff --git a/debian/rules b/debian/rules
index ba3936c..e43e2e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,10 @@ DPKG_EXPORT_BUILDFLAGS = 1
# Don't accidentally build the lorene plug-in
unexport HOME_LORENE
+# For libgyotoX.install
+DEB_GYOTO_SOVERS := $(shell grep VERSINFO= configure.ac | sed s/VERSINFO=// | tr : _)
+export DEB_GYOTO_SOVERS
+
configure_flags = --with-yorick=/usr/bin/yorick --with-udunits --with-xerces \
--without-lorene --enable-static --enable-shared \
--with-boost --enable-c++11 --enable-release \
@@ -23,7 +27,10 @@ configure_flags = --with-yorick=/usr/bin/yorick --with-udunits --with-xerces \
dh $@ --with python2,python3,autoreconf
override_dh_auto_install-arch:
- dh_auto_install -a
+ifneq ($(wildcard plugins/python/Makefile),)
+ make -C plugins/python distclean
+endif
+ dh_auto_install -a -- SUBDIRS="lib bin doc yorick"
sh debian/install_for_all_pythons
dh_numpy -a
dh_numpy3 -a
@@ -46,10 +53,18 @@ override_dh_auto_build-arch:
for badflag in -g -O2 -Werror=format-security -Wformat ; do \
sed s/$${badflag}// -i lib/gyoto.pc ; \
done
+ mkdir -p python-plugins
set -e; \
for python in `pyversions -s` `py3versions -s`; do \
make -C python PYTHON=$$python ; \
+ make -C plugins/python distclean ; \
+ cd plugins/python ; \
+ ./configure PYTHON=`which $$python` ; \
+ make ; \
+ 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
override_dh_auto_build-indep:
$(MAKE) doc
@@ -59,6 +74,7 @@ override_dh_auto_configure:
override_dh_auto_clean:
[ ! -f python/Makefile ] || make -C python clean
+ rm -Rf python-plugins
dh_auto_clean
override_dh_auto_test-indep:
diff --git a/debian/tests/control b/debian/tests/control
index 33bc64d..a627786 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,5 @@
Tests: gyoto gyoto-mpi
-Depends: gyoto, openmpi-bin
+Depends: gyoto-bin, openmpi-bin
Restrictions: allow-stderr
Tests: yorick-gyoto
@@ -7,7 +7,7 @@ Depends: yorick-gyoto
Restrictions: allow-stderr
Test-Command: env OMPI_MCA_orte_rsh_agent=/bin/false orterun --mca btl_tcp_if_include lo /usr/bin/yorick -i debian/tests/yorick-gyoto-mpi
-Depends: yorick-gyoto, gyoto, openmpi-bin
+Depends: yorick-gyoto, gyoto-bin, openmpi-bin
Restrictions: allow-stderr
Tests: python-gyoto
@@ -18,7 +18,7 @@ Depends: python-gyoto, python3-gyoto,
Restrictions: allow-stderr
Tests: python-gyoto-mpi
-Depends: python-gyoto, python3-gyoto, gyoto,
+Depends: python-gyoto, python3-gyoto, gyoto-bin,
python-all, python3-all,
python-numpy, python3-numpy,
python-matplotlib, python3-matplotlib,
diff --git a/debian/tests/gyoto b/debian/tests/gyoto
index 5543cb3..c8d8725 100755
--- a/debian/tests/gyoto
+++ b/debian/tests/gyoto
@@ -1,7 +1,7 @@
#!/bin/sh
set -e
-EXAMPLES_DIR=/usr/share/doc/gyoto/examples
+EXAMPLES_DIR=/usr/share/doc/gyoto-bin/examples
BASE_NAMES=`basename -s.xml ${EXAMPLES_DIR}/*.xml | sed 's/example-[^ ]*-rotstar3_1//'`
GYOTO="/usr/bin/gyoto --nprocesses=0 --nthreads=4 --resolution=32"
--
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