[Pkg-ocaml-maint-commits] [cudf] 02/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 cudf.

commit 93ac726bc2e9c8f2c8df2fb902f2e3351b795a1e
Merge: 9bc6785 ae0644a
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Jul 19 19:23:33 2017 +0200

    Merge branch 'ubuntu'

 debian/changelog | 8 ++++++++
 debian/control   | 1 +
 2 files changed, 9 insertions(+)

diff --cc debian/changelog
index 9918db9,3b634ec..6c31bdc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,35 +1,11 @@@
 -cudf (0.7-2ubuntu2) artful; urgency=high
 -
 -  * No change rebuild against ocaml 4.04.
 -
 - -- Dimitri John Ledkov <xnox at ubuntu.com>  Fri, 30 Jun 2017 12:23:36 +0100
 -
 -cudf (0.7-2ubuntu1) yakkety; urgency=medium
++cudf (0.7-3) UNRELEASED; urgency=medium
+ 
+   * Add ocaml-base-nox dependency to cudf-tools, otherwise results in
+     aspcud autopkgtest failure when invoking cudf-check without interpret
+     available.
+ 
+  -- Dimitri John Ledkov <xnox at ubuntu.com>  Mon, 12 Sep 2016 15:57:38 +0100
+ 
 -cudf (0.7-2build3) xenial; urgency=medium
 -
 -  * No-change rebuild against ocaml 4.02.
 -
 - -- Łukasz 'sil2100' Zemczak <lukasz.zemczak at canonical.com>  Wed, 04 Nov 2015 14:51:47 -0600
 -
 -cudf (0.7-2build2) wily; urgency=medium
 -
 -  * Rebuild for new OCaml ABIs.
 -
 - -- Matthias Klose <doko at ubuntu.com>  Sat, 03 Oct 2015 19:26:23 +0200
 -
 -cudf (0.7-2build1) utopic; urgency=medium
 -
 -  * Rebuild for new OCaml ABIs.
 -
 - -- Colin Watson <cjwatson at ubuntu.com>  Sat, 06 Sep 2014 22:42:10 +0100
 -
  cudf (0.7-2) unstable; urgency=medium
  
    * upload to unstable

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