[med-svn] [libbpp-seq] 03/03: Merge branch 'master' of ssh://git.debian.org/git/debian-med/libbpp-seq

[Julien Dutheil]

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

jdutheil-guest pushed a commit to branch master
in repository libbpp-seq.

commit b646be5408ad5575b240c94faac994760733f4eb
Merge: 8e98005 1be3807
Author: Julien Y. Dutheil <dutheil at evolbio.mpg.de>
Date:   Wed Aug 9 15:56:54 2017 +0200

    Merge branch 'master' of ssh://git.debian.org/git/debian-med/libbpp-seq

 debian/changelog                        | 2 +-
 debian/patches/relax_test_timeout.patch | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 419b86d,78cb722..24e0b5f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,8 +1,10 @@@
- libbpp-seq (2.3.1-7) UNRELEASED; urgency=medium
+ libbpp-seq (2.3.1-7) unstable; urgency=medium
  
 +  [ Julien Dutheil ]
    * Make tests work on 32 bits archs (enabled position independent code).
 +  * Do not override debian default CXX flags.
  
 - -- Julien Dutheil <julien.dutheil at univ-montp2.fr>  Tue, 18 Jul 2017 21:01:24 +0200
 + -- Julien Dutheil <julien.dutheil at univ-montp2.fr>  Wed, 09 Aug 2017 15:54:52 +0200
  
  libbpp-seq (2.3.1-6) unstable; urgency=medium
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libbpp-seq.git