[Debian-astro-commits] [gyoto] 03/05: gyoto (1.1.1-1) unstable; urgency=low

[Thibaut Jean-Claude Paumard]

This is an automated email from the git hooks/post-receive script.

thibaut pushed a commit to branch lorene
in repository gyoto.

commit f52b44f70ab72b2b376c99308a2330e31a11636f
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date:   Mon Oct 31 15:46:13 2016 +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
---
 debian/changelog              |  8 ++++++--
 debian/control                | 17 ++++++++---------
 debian/libgyoto5-dev.examples |  1 +
 debian/libgyoto5.links        |  6 ++++--
 debian/rules                  | 13 +++++++++++--
 5 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index df9f427..364bfe5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-gyoto (1.1.0-4) UNRELEASED; urgency=low
+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>  Fri, 28 Oct 2016 17:35:33 +0200
+ -- Thibaut Paumard <thibaut at debian.org>  Mon, 31 Oct 2016 13:06:39 +0100
 
 gyoto (1.1.0-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 8d866ec..852ae8e 100644
--- a/debian/control
+++ b/debian/control
@@ -85,17 +85,17 @@ Description: Gyoto framework main library an standard plug-in
  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.
+ MPI parallelization requires the gyoto-bin and mpi-default-bin packages.
 
 Package: gyoto-dbg
 Architecture: any
 Multi-Arch: same
 Section: debug
 Depends: libgyoto5 (= ${binary:Version}),
-	 gyoto-bin (= ${binary:Version}),
-	 yorick-gyoto (= ${binary:Version}),
-	 python-gyoto (= ${binary:Version}),
-	 python3-gyoto (= ${binary:Version}),
+	 gyoto-bin:same (= ${binary:Version}),
+	 yorick-gyoto:same (= ${binary:Version}),
+	 python-gyoto:same (= ${binary:Version}),
+	 python3-gyoto:same (= ${binary:Version}),
 	 ${misc:Depends}
 Description: debugging symbols for the Gyoto framework
  Gyoto aims at providing a framework for computing orbits and
@@ -104,16 +104,15 @@ Description: debugging symbols for the Gyoto framework
  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,
- yorick-gyoto, python-gyoto and python3-gyoto packages.
+ This package contains the debugging symbols for the gyoto-bin,
+ libgyoto5, yorick-gyoto, python-gyoto and python3-gyoto packages.
 
 Package: libgyoto5-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, libgyoto5 (= ${binary:Version}),
-	 libc-dev, libxerces-c3.1,
-	 libxerces-c-dev, libcfitsio-dev, libudunits2-dev,
+	 libc-dev, libxerces-c-dev, libcfitsio-dev, libudunits2-dev,
 	 libboost-dev (>= 1.53.1), libboost-mpi-dev,
 	 mpi-default-dev
 Recommends: pkg-config
diff --git a/debian/libgyoto5-dev.examples b/debian/libgyoto5-dev.examples
new file mode 100644
index 0000000..1b8abf6
--- /dev/null
+++ b/debian/libgyoto5-dev.examples
@@ -0,0 +1 @@
+plugins/null
diff --git a/debian/libgyoto5.links b/debian/libgyoto5.links
index 10ba0e5..6b7d37c 100755
--- a/debian/libgyoto5.links
+++ b/debian/libgyoto5.links
@@ -1,2 +1,4 @@
-#! /usr/bin/dh-exec
-usr/lib/${DEB_HOST_MULTIARCH}/libgyoto.so.5.0.0 usr/lib/${DEB_HOST_MULTIARCH}/libgyoto.so.5
+#! /bin/sh
+src=`ls debian/tmp/usr/lib/*/libgyoto.so.?.?.? | sed 's|debian/tmp/||'`
+dst=`echo $src | sed 's/\.[0-9]*\.[0-9]*$//'`
+echo $src $dst
diff --git a/debian/rules b/debian/rules
index faae970..083e6b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,8 +16,16 @@ 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 : _)
+# Make sure we build with the right MPI implementation
+include /usr/share/mpi-default-dev/debian_defaults
+MPICXX := /usr/bin/mpic++.$(ARCH_DEFAULT_MPI_IMPL)
+export MPICXX
+CXX := $(shell readlink -e $(shell which $(firstword $(shell $(MPICXX) -show))))
+
+# For python*-gyoto.install
+DEB_GYOTO_SOVERS := $(shell expr \
+	  $(shell grep VERSINFO_C= configure.ac | sed s/VERSINFO_C=//) \
+	- $(shell grep VERSINFO_A= configure.ac | sed s/VERSINFO_A=//))
 export DEB_GYOTO_SOVERS
 
 configure_flags = --with-yorick=/usr/bin/yorick --with-udunits --with-xerces \
@@ -78,6 +86,7 @@ override_dh_auto_build-indep:
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(configure_flags)
+	sed -i 's|^CXX=.*|CXX=$(CXX)|' lib/gyoto.pc
 
 override_dh_makeshlibs:
 	dh_makeshlibs -Xstdplug -Xpython

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/gyoto.git