[med-svn] [hilive] 02/02: Merge branch 'master' of ssh://anonscm.debian.org:/git/debian-med/hilive

[Steffen Möller]

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

moeller pushed a commit to branch master
in repository hilive.

commit d95999d29c04cd3131f3a599669d5d2ca6c8b4bd
Merge: 66f0373 419ff2d
Author: Steffen Moeller <moeller at debian.org>
Date:   Sat Jul 29 22:41:06 2017 +0200

    Merge branch 'master' of ssh://anonscm.debian.org:/git/debian-med/hilive

 CMakeLists.txt                     | 8 ++++----
 debian/changelog                   | 9 ++++++++-
 debian/patches/use_FindSeQan.patch | 7 ++++---
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --cc debian/changelog
index bb54c99,741c05b..43a11fb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
- hilive (0.3-2) UNRELEASED; urgency=medium
++hilive (0.3-3) UNRELEASED; urgency=medium
 +
 +  * debian/upstream: created metadata file.
 +
 + -- Steffen Moeller <moeller at debian.org>  Sat, 29 Jul 2017 22:38:07 +0200
 +
+ hilive (0.3-2) unstable; urgency=medium
+ 
+   * Adapt path to seqan cmake files
+     Closes: #852850
+ 
+  -- Andreas Tille <tille at debian.org>  Sat, 28 Jan 2017 07:18:15 +0100
+ 
  hilive (0.3-1) unstable; urgency=medium
  
    [Andreas Tille]

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