[otb] 01/08: Merge changelog entries.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository otb.

commit dd0b7df9591dc0d3b69ca921527f8b08f04fcc0a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Dec 24 15:01:14 2015 +0100

    Merge changelog entries.
---
 debian/changelog | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d881a85..401ebef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,6 @@
-otb (5.2.0-1) UNRELEASED; urgency=medium
-
-  * New upstream release.
-
- -- Rashad Kanavath <rashad.kanavath at c-s.fr>  Tue, 22 Dec 2015 10:58:33 +0100
-
-otb (5.0.0+dfsg-1) experimental; urgency=medium
+otb (5.2.0+dfsg-1) experimental; urgency=medium
 
   * Initial upload to Debian (Closes: #764860), new version and repackaged
     after previous reject
 
- -- Rashad Kanavath <rashad.kanavath at c-s.fr>  Mon, 24 Aug 2015 10:45:17 +0200
+ -- Rashad Kanavath <rashad.kanavath at c-s.fr>  Tue, 22 Dec 2015 10:58:33 +0100

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/otb.git