[med-svn] [art-nextgen-simulation-tools] 01/02: Merge branch 'master' into debian/jessie-backports

[Andreas Tille]

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

tille pushed a commit to branch debian/jessie-backports
in repository art-nextgen-simulation-tools.

commit 661bd51c08c77e15cc5d799e258978d7ce686a69
Merge: ccc3119 51fa3fa
Author: Andreas Tille <tille at debian.org>
Date:   Fri Mar 17 15:08:34 2017 +0100

    Merge branch 'master' into debian/jessie-backports

 debian/changelog           | 9 +++++++++
 debian/compat              | 2 +-
 debian/control             | 6 +++---
 debian/rules               | 5 ++++-
 debian/tests/run-unit-test | 1 +
 debian/watch               | 2 +-
 6 files changed, 19 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index 02977c8,c7afd3e..1246690
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,12 +1,19 @@@
+ art-nextgen-simulation-tools (20160605+dfsg-2) unstable; urgency=medium
+ 
+   * Make sure tests will not use the .pl suffixed script
+   * cme fix dpkg-control
+   * debhelper 10
+   * d/watch: version=4
+ 
+  -- Andreas Tille <tille at debian.org>  Sat, 14 Jan 2017 10:56:30 +0100
+ 
 +art-nextgen-simulation-tools (20160605+dfsg-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +  * s/libgsl-dev/libgsl0-dev/
 +
 + -- Andreas Tille <tille at debian.org>  Tue, 12 Jul 2016 22:50:41 +0200
 +
  art-nextgen-simulation-tools (20160605+dfsg-1) unstable; urgency=medium
  
    * Initial release (Closes: #820810)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/art-nextgen-simulation-tools.git