[Pkg-ocaml-maint-commits] [obus] 05/05: Merge branch 'ubuntu'

[Stéphane Glondu]

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

glondu pushed a commit to branch master
in repository obus.

commit 1fe2d3e77051a99ad56c73d5ee642ec0b8a97574
Merge: 9e1c676 ac95811
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Jul 27 07:07:34 2017 +0200

    Merge branch 'ubuntu'

 debian/changelog                     |  6 +++++-
 debian/patches/ftbfs-ocaml4.04.patch | 28 ++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index cfbf0dc,848a056..448653f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,26 +1,13 @@@
 -obus (1.1.5-5ubuntu1) artful; urgency=medium
 +obus (1.1.5-6) unstable; urgency=medium
  
 -  * Remove duplicate constructor, to fix FTBFS with ocaml 4.04.
 -
 - -- Dimitri John Ledkov <xnox at ubuntu.com>  Tue, 11 Jul 2017 10:59:47 +0100
 -
 -obus (1.1.5-5build3) artful; urgency=high
 -
 -  * No change rebuild against ocaml 4.04.
 -
 - -- Dimitri John Ledkov <xnox at ubuntu.com>  Mon, 03 Jul 2017 14:39:06 +0100
++  [ Stéphane Glondu ]
 +  * Add ocamlbuild to Build-Depends
 +  * Update Vcs-*
  
-  -- Stéphane Glondu <glondu at debian.org>  Thu, 27 Jul 2017 06:50:46 +0200
 -obus (1.1.5-5build2) yakkety; urgency=medium
 -
 -  * No-change rebuild for ocaml ABIs.
 -
 - -- Matthias Klose <doko at ubuntu.com>  Fri, 02 Sep 2016 12:16:38 +0000
 -
 -obus (1.1.5-5build1) xenial; urgency=medium
 -
 -  * Rebuild for new OCaml ABIs.
++  [ Dimitri John Ledkov ]
++  * Remove duplicate constructor, to fix FTBFS with ocaml 4.04.
+ 
 - -- Colin Watson <cjwatson at ubuntu.com>  Wed, 06 Jan 2016 11:58:00 +0000
++ -- Stéphane Glondu <glondu at debian.org>  Thu, 27 Jul 2017 07:08:02 +0200
  
  obus (1.1.5-5) unstable; urgency=medium
  

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