[med-svn] [bedtools] 01/01: Fix changelog after wrong merge

[Andreas Tille]

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

tille pushed a commit to branch master
in repository bedtools.

commit e29b14afdd1226b83b6cf0e9ce63042f6b3c380a
Author: Andreas Tille <tille at debian.org>
Date:   Sat Jan 14 18:53:52 2017 +0100

    Fix changelog after wrong merge
---
 debian/changelog | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d49a31b..a102252 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,5 @@
-bedtools (2.26.0+dfsg-3) UNRELEASED; urgency=medium
+bedtools (2.26.0+dfsg-4) UNRELEASED; urgency=medium
 
-  [ Charles Plessy ]
-  d6d3452 Sync with upstream repo at commit 6bf23c, closes: #831833.
-
-  [ Andreas Tille ]
   * Fix autopkgtest
   * Ignore failures in the split feature for the moment
     (Related to bug #747337 but hesitating to close it)
@@ -12,6 +8,12 @@ bedtools (2.26.0+dfsg-3) UNRELEASED; urgency=medium
 
  -- Andreas Tille <tille at debian.org>  Sat, 14 Jan 2017 16:10:04 +0100
 
+bedtools (2.26.0+dfsg-3) unstable; urgency=medium
+
+  d6d3452 Sync with upstream repo at commit 6bf23c, closes: #831833.
+
+ -- Charles Plessy <plessy at debian.org>  Sat, 05 Nov 2016 21:48:09 +0900
+
 bedtools (2.26.0+dfsg-2) unstable; urgency=medium
 
   * Enable reproducible builds

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