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

commit 38b716b028f48d31180c6cc460c5325246c1b8be
Merge: 7e767a5 d2cff79
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Jul 19 10:41:01 2017 +0200

    Merge branch 'ubuntu'

 cf_tai64_p.c                                       | 18 +++++-----
 cf_tai64_p.h                                       |  2 +-
 cf_tai64n_p.c                                      | 42 +++++++++++-----------
 cf_tai64n_p.h                                      |  2 +-
 debian/changelog                                   |  6 +++-
 .../patches/01_polymorphic_variant_bugfix.dpatch   |  0
 6 files changed, 37 insertions(+), 33 deletions(-)

diff --cc debian/changelog
index 0938b4d,0e10899..6a41904
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,51 +1,13 @@@
 -pagodacf (0.10-3ubuntu1) artful; urgency=medium
 +pagodacf (0.10-4) UNRELEASED; urgency=low
  
++  [ Sylvain Le Gall ]
 +  * Remove Sylvain Le Gall from uploaders
 +
-  -- Sylvain Le Gall <gildor at debian.org>  Fri, 21 Sep 2012 01:23:55 +0000
++  [ Dimitri John Ledkov ]
+   * Fix ftbfs with ocaml 4.04.
+ 
+  -- Dimitri John Ledkov <xnox at ubuntu.com>  Fri, 07 Jul 2017 16:01:45 +0100
  
 -pagodacf (0.10-3build7) xenial; urgency=medium
 -
 -  * No-change rebuild against ocaml 4.02.
 -
 - -- Łukasz 'sil2100' Zemczak <lukasz.zemczak at canonical.com>  Tue, 03 Nov 2015 15:01:57 -0600
 -
 -pagodacf (0.10-3build6) trusty; urgency=medium
 -
 -  * Rebuild for ocaml-4.01.
 -
 - -- Matthias Klose <doko at ubuntu.com>  Mon, 23 Dec 2013 16:18:11 +0000
 -
 -pagodacf (0.10-3build5) precise; urgency=low
 -
 -  * Rebuild with ocamlopt on armhf.
 -
 - -- Colin Watson <cjwatson at ubuntu.com>  Tue, 24 Jan 2012 10:52:05 +0000
 -
 -pagodacf (0.10-3build4) precise; urgency=low
 -
 -  * Rebuild for OCaml 3.12.1.
 -
 - -- Colin Watson <cjwatson at ubuntu.com>  Sat, 19 Nov 2011 00:59:59 +0000
 -
 -pagodacf (0.10-3build3) oneiric; urgency=low
 -
 -  * Rebuild to pick up ocaml fixes on armel.
 -
 - -- Adam Conrad <adconrad at ubuntu.com>  Wed, 24 Aug 2011 16:28:23 -0600
 -
 -pagodacf (0.10-3build2) oneiric; urgency=low
 -
 -  * Rebuild for OCaml 3.12.0.
 -
 - -- Colin Watson <cjwatson at ubuntu.com>  Mon, 16 May 2011 20:50:05 +0100
 -
 -pagodacf (0.10-3build1) lucid; urgency=low
 -
 -  * No-change rebuild for OCaml 3.11.2 transition (LP: #526073).
 -
 - -- Ilya Barygin <barygin at gmail.com>  Wed, 24 Feb 2010 23:02:48 +0300
 -
  pagodacf (0.10-3) unstable; urgency=low
  
    * Use dh-ocaml 0.9.1 features

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