[Pkg-ocaml-maint-commits] [dose3] 01/01: fix changelog: merge artifact, location of 5.0.1-2~bpo8+1

[Ralf Treinen]

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

treinen pushed a commit to branch jessie-backports/master
in repository dose3.

commit a02b3f62a7e46f1703e311b5b2fdae4574a924bd
Author: Ralf Treinen <treinen at irif.fr>
Date:   Sun Feb 5 10:40:36 2017 +0100

    fix changelog: merge artifact, location of 5.0.1-2~bpo8+1
---
 debian/changelog | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6da0a96..585541c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,13 +18,6 @@ dose3 (5.0.1-8) unstable; urgency=medium
 
  -- Ralf Treinen <treinen at debian.org>  Tue, 17 Jan 2017 22:14:21 +0100
 
-dose3 (5.0.1-2~bpo8+1) jessie-backports; urgency=medium
-
-  * backport to Debian Jessie
-  * Refreshed patch debian/patches/jessie-backports.patch
-
- -- Ralf Treinen <treinen at debian.org>  Fri, 28 Oct 2016 20:12:28 +0200
-
 dose3 (5.0.1-7) unstable; urgency=medium
 
   * use pic options only on native architectures.
@@ -51,7 +44,13 @@ dose3 (5.0.1-3) unstable; urgency=medium
     transition to ocaml 4.03 which does no longer include ocamlbuild.
 
  -- Ralf Treinen <treinen at debian.org>  Tue, 25 Oct 2016 22:03:12 +0200
->>>>>>> master
+
+dose3 (5.0.1-2~bpo8+1) jessie-backports; urgency=medium
+
+  * backport to Debian Jessie
+  * Refreshed patch debian/patches/jessie-backports.patch
+
+ -- Ralf Treinen <treinen at debian.org>  Fri, 28 Oct 2016 20:12:28 +0200
 
 dose3 (5.0.1-2) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git