[Debian-astro-commits] [gyoto] 02/02: Merge branch 'debian' into lorene

[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 bc8c3807b6e582c23ae21ddb64e3888d9ebd674e
Merge: e1158c3 0d76d54
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date:   Tue Nov 1 19:44:16 2016 +0100

    Merge branch 'debian' into lorene
    
    Conflicts:
    	debian/changelog

 debian/changelog              | 13 ++++++++++++-
 debian/control                | 35 +++++++++++++++++++----------------
 debian/tests/python-gyoto     |  3 ++-
 debian/tests/python-gyoto-mpi |  3 ++-
 4 files changed, 35 insertions(+), 19 deletions(-)

diff --cc debian/changelog
index 1e0ed64,a68ef42..4861578
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,14 +1,20 @@@
- gyoto (1.1.1-1+lorene1) UNRELEASED; urgency=low
++gyoto (1.1.1-2+lorene1) UNRELEASED; urgency=low
 +
 +  * Compile LORENE plug-in.
 +
 + -- Thibaut Paumard <thibaut at debian.org>  Mon, 31 Oct 2016 16:23:45 +0100
 +
+ gyoto (1.1.1-2) unstable; urgency=low
+ 
+   * The gyoto meta-package depends on the corresponding version of
+     each actual gyoto package.
+   * The libgyoto5 package depends on the same version of gyoto-bin and on
+     mpi-default-bin.
+   * Fix the python auopkgtests by unsetting GYOTO_PLUGINS.
+   * Fix dependencies of gyoto-dbg.
+ 
+  -- Thibaut Paumard <thibaut at debian.org>  Tue, 01 Nov 2016 17:37:22 +0100
+ 
  gyoto (1.1.1-1) unstable; urgency=low
  
    * New upstream release.

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