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

commit 72fc8ea132305c4b0903b7e98d0377a3ea44a70f
Merge: 38915c0 9394914
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Jul 19 11:08:07 2017 +0200

    Merge branch 'ubuntu'

 debian/changelog                                   |  6 ++
 .../0001-Fix-use-of-CAMLparam-etc-macros.patch     | 41 +++++++++++++
 debian/patches/debian-changes-0.9.5-4              | 69 ++++++++++++++++++++++
 debian/patches/series                              |  2 +
 4 files changed, 118 insertions(+)

diff --cc debian/changelog
index cd6445e,7ca4ceb..ff7927c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,81 +1,9 @@@
 -perl4caml (0.9.5-4ubuntu1) artful; urgency=medium
++perl4caml (0.9.5-5) UNRELEASED; urgency=medium
+ 
+   * Cherrypick random patch from annexia.org to fix FTBFS with ocaml 4.04.
+ 
+  -- Dimitri John Ledkov <xnox at ubuntu.com>  Tue, 27 Jun 2017 03:57:49 +0100
+ 
 -perl4caml (0.9.5-4build12) artful; urgency=high
 -
 -  * No change rebuild against ocaml 4.04 transition.
 -
 - -- Dimitri John Ledkov <xnox at ubuntu.com>  Mon, 26 Jun 2017 22:49:35 +0100
 -
 -perl4caml (0.9.5-4build11) zesty; urgency=medium
 -
 -  * No-change rebuild for perl 5.24 transition
 -
 - -- Iain Lane <iain at orangesquash.org.uk>  Mon, 24 Oct 2016 10:38:25 +0100
 -
 -perl4caml (0.9.5-4build10) xenial; urgency=medium
 -
 -  * Rebuild for Perl 5.22.1.
 -
 - -- Colin Watson <cjwatson at ubuntu.com>  Fri, 18 Dec 2015 03:40:47 +0000
 -
 -perl4caml (0.9.5-4build9) xenial; urgency=medium
 -
 -  * No-change rebuild against ocaml 4.02.
 -
 - -- Łukasz 'sil2100' Zemczak <lukasz.zemczak at canonical.com>  Mon, 02 Nov 2015 15:39:48 -0500
 -
 -perl4caml (0.9.5-4build8) utopic; urgency=medium
 -
 -  * Rebuild for Perl 5.20.0.
 -
 - -- Colin Watson <cjwatson at ubuntu.com>  Thu, 21 Aug 2014 13:34:20 +0100
 -
 -perl4caml (0.9.5-4build7) trusty; urgency=medium
 -
 -  * Rebuild for ocaml-4.01.
 -
 - -- Matthias Klose <doko at ubuntu.com>  Mon, 23 Dec 2013 12:11:47 +0000
 -
 -perl4caml (0.9.5-4build6) trusty; urgency=low
 -
 -  * Rebuild for Perl 5.18.
 -
 - -- Colin Watson <cjwatson at ubuntu.com>  Mon, 21 Oct 2013 12:44:37 +0100
 -
 -perl4caml (0.9.5-4build5) precise; urgency=low
 -
 -  * Rebuild with ocamlopt on armhf.
 -
 - -- Colin Watson <cjwatson at ubuntu.com>  Tue, 24 Jan 2012 00:52:42 +0000
 -
 -perl4caml (0.9.5-4build4) precise; urgency=low
 -
 -  * Rebuild for OCaml 3.12.1.
 -
 - -- Colin Watson <cjwatson at ubuntu.com>  Fri, 18 Nov 2011 21:00:29 +0000
 -
 -perl4caml (0.9.5-4build3) precise; urgency=low
 -
 -  * Rebuild for Perl 5.14.
 -
 - -- Colin Watson <cjwatson at ubuntu.com>  Wed, 16 Nov 2011 11:52:23 +0000
 -
 -perl4caml (0.9.5-4build2) oneiric; urgency=low
 -
 -  * Rebuild for armel ocaml fixes.
 -
 - -- Adam Conrad <adconrad at ubuntu.com>  Fri, 19 Aug 2011 13:37:55 -0600
 -
 -perl4caml (0.9.5-4build1) oneiric; urgency=low
 -
 -  * Rebuild for Perl 5.12.
 -
 - -- Colin Watson <cjwatson at ubuntu.com>  Mon, 09 May 2011 10:19:48 +0100
 -
  perl4caml (0.9.5-4) unstable; urgency=low
  
    * Add 0003-Fix-for-Perl-5.12-SVt_RV-missing.patch (Closes: #578800)

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