[Debian-astro-commits] [gyoto] 04/05: Merge branch 'debian' into lorene
Thibaut Jean-Claude Paumard
thibaut at moszumanska.debian.org
Mon Oct 31 18:31:10 UTC 2016
This is an automated email from the git hooks/post-receive script.
thibaut pushed a commit to branch lorene
in repository gyoto.
commit e27ff1e4972904f32464ac650844a99d1229de80
Merge: f19cf04 f52b44f
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date: Mon Oct 31 16:23:58 2016 +0100
Merge branch 'debian' into lorene
Conflicts:
debian/changelog
ChangeLog | 106 +-
Makefile.in | 6 +
NEWS | 15 +
README.Developers | 11 +-
aclocal.m4 | 3 +
bin/Makefile.am | 4 +-
bin/Makefile.in | 11 +-
bin/gyoto.1 | 10 +-
configure | 555 +-
configure.ac | 41 +-
debian/changelog | 14 +-
debian/control | 19 +-
debian/libgyoto5-dev.examples | 1 +
debian/libgyoto5.links | 6 +-
debian/rules | 13 +-
doc/user_guide/GyotoManual.tex | 52 +-
git-post-merge | 2 +-
include/GyotoAstrobj.h | 4 +-
include/GyotoComplexSpectrometer.h | 3 +-
include/GyotoConverters.h | 4 +-
include/GyotoFactory.h | 18 +-
include/GyotoFactoryMessenger.h | 4 +-
include/GyotoMetric.h | 4 +-
include/GyotoPolishDoughnut.h | 4 +-
include/GyotoRegister.h | 6 +-
include/GyotoScenery.h | 4 +-
include/GyotoSmartPointer.h | 4 +-
include/GyotoSpectrometer.h | 4 +-
include/GyotoSpectrum.h | 4 +-
include/GyotoWorldline.h | 8 +-
lib/KerrBL.C | 6 +-
lib/Makefile.am | 3 +
lib/Makefile.in | 18 +-
lib/PageThorneDisk.C | 4 +-
lib/Register.C | 64 +-
lib/gyoto-uninstalled.pc.in | 5 +-
lib/gyoto.pc.in | 5 +-
m4/ax_append_compile_flags.m4 | 12 +-
m4/ax_append_flag.m4 | 30 +-
...nd_compile_flags.m4 => ax_append_link_flags.m4} | 38 +-
m4/{ax_append_flag.m4 => ax_check_link_flag.m4} | 57 +-
m4/ax_require_defined.m4 | 37 +
plugins/null/AUTHORS | 0
plugins/null/COPYING | 674 +
plugins/null/ChangeLog | 0
plugins/null/INSTALL | 370 +
plugins/null/Makefile.am | 5 +
Makefile.in => plugins/null/Makefile.in | 190 +-
plugins/null/NEWS | 1 +
plugins/null/README | 30 +
aclocal.m4 => plugins/null/aclocal.m4 | 8 -
plugins/null/bin/gyoto.in | 10 +
plugins/null/compile | 347 +
plugins/null/config.guess | 1558 +++
plugins/null/config.sub | 1791 +++
configure => plugins/null/configure | 13050 ++++++-------------
plugins/null/configure.ac | 115 +
plugins/null/depcomp | 791 ++
plugins/null/doc/doxyfile | 1510 +++
plugins/null/include/GyotoNull.h | 63 +
plugins/null/install-sh | 527 +
plugins/null/lib/InitPlug.C | 31 +
plugins/null/lib/Makefile.am | 17 +
plugins/null/lib/Makefile.in | 672 +
plugins/null/lib/Null.C | 30 +
plugins/null/ltmain.sh | 9661 ++++++++++++++
plugins/null/m4/libtool.m4 | 7983 ++++++++++++
plugins/null/m4/ltoptions.m4 | 384 +
plugins/null/m4/ltsugar.m4 | 123 +
plugins/null/m4/ltversion.m4 | 23 +
plugins/null/m4/lt~obsolete.m4 | 98 +
plugins/null/m4/pkg.m4 | 159 +
plugins/null/missing | 215 +
.../python/doc/examples/gyoto_sample_metrics.py | 2 +-
.../python/doc/examples/gyoto_sample_spectra.py | 2 +-
.../python/doc/examples/gyoto_sample_standard.py | 2 +-
.../python/doc/examples/gyoto_sample_thindisks.py | 2 +-
plugins/python/include/GyotoPython.h | 10 +-
plugins/python/lib/Base.C | 26 +-
python/example.py | 6 +-
python/gyoto.i | 4 +-
python/numpy.i | 2 +-
python/setup_lorene.py.in | 4 +-
yorick/gyoto.i | 148 +-
yorick/stdplug/gyoto_PatternDisk.C | 4 +-
85 files changed, 32087 insertions(+), 9780 deletions(-)
diff --cc debian/changelog
index 1e3e1f6,364bfe5..1e0ed64
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,12 +1,18 @@@
- gyoto (1.1.0-3+lorene1) UNRELEASED; urgency=low
++gyoto (1.1.1-1+lorene1) UNRELEASED; urgency=low
+
+ * Compile LORENE plug-in.
+
- -- Thibaut Paumard <thibaut at debian.org> Thu, 13 Oct 2016 16:55:09 +0200
++ -- Thibaut Paumard <thibaut at debian.org> Mon, 31 Oct 2016 16:23:45 +0100
++
+ gyoto (1.1.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Add Dependencies and Recommends as appropriate for libgyoto5-dev.
+ * Ship plug-ins/null as example for libgyoto5-dev.
+ * Make sure the right MPI implementation is used and patch gyoto.pc to
+ actually give useful information about MPICXX and CXX.
+
+ -- Thibaut Paumard <thibaut at debian.org> Mon, 31 Oct 2016 13:06:39 +0100
gyoto (1.1.0-3) unstable; urgency=low
--
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