[Pkg-ocaml-maint-commits] [ocamlpam] 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 ocamlpam.

commit a0f0ae2834634d75ba6690683b2266f7c481479e
Merge: 8c6c6f9 f7952a0
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Jul 18 22:03:55 2017 +0200

    Merge branch 'ubuntu'

 debian/changelog                |  6 ++++++
 debian/control                  |  1 -
 debian/patches/ocaml-4.04.patch | 13 +++++++++++++
 debian/patches/series           |  1 +
 debian/rules                    |  1 -
 debian/source/format            |  1 +
 6 files changed, 21 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 4b17370,f96934c..174b053
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,57 +1,9 @@@
 -ocamlpam (1.1-4ubuntu1) artful; urgency=medium
++ocamlpam (1.1-5) UNRELEASED; urgency=medium
+ 
+   * Call CAMLParam0 before CAMLlocal to resolve FTBFS with ocaml 4.04.
+ 
+  -- Dimitri John Ledkov <xnox at ubuntu.com>  Mon, 03 Jul 2017 15:39:57 +0100
+ 
 -ocamlpam (1.1-4build8) artful; urgency=high
 -
 -  * No change rebuild against ocaml 4.04 transition.
 -
 - -- Dimitri John Ledkov <xnox at ubuntu.com>  Mon, 26 Jun 2017 22:49:25 +0100
 -
 -ocamlpam (1.1-4build7) xenial; urgency=medium
 -
 -  * No-change rebuild against ocaml 4.02.
 -
 - -- Łukasz 'sil2100' Zemczak <lukasz.zemczak at canonical.com>  Mon, 02 Nov 2015 15:34:46 -0500
 -
 -ocamlpam (1.1-4build6) trusty; urgency=medium
 -
 -  * Rebuild for ocaml-4.01.
 -
 - -- Matthias Klose <doko at ubuntu.com>  Mon, 23 Dec 2013 12:11:42 +0000
 -
 -ocamlpam (1.1-4build5) precise; urgency=low
 -
 -  * Rebuild with ocamlopt on armhf.
 -
 - -- Colin Watson <cjwatson at ubuntu.com>  Tue, 24 Jan 2012 00:52:23 +0000
 -
 -ocamlpam (1.1-4build4) precise; urgency=low
 -
 -  * Rebuild for OCaml 3.12.1.
 -
 - -- Colin Watson <cjwatson at ubuntu.com>  Fri, 18 Nov 2011 20:59:32 +0000
 -
 -ocamlpam (1.1-4build3) oneiric; urgency=low
 -
 -  * Rebuild to pick up armel ocaml fixes.
 -
 - -- Adam Conrad <adconrad at ubuntu.com>  Fri, 19 Aug 2011 13:34:09 -0600
 -
 -ocamlpam (1.1-4build2) oneiric; urgency=low
 -
 -  * Rebuild for OCaml 3.12.0.
 -
 - -- Colin Watson <cjwatson at ubuntu.com>  Mon, 16 May 2011 19:55:12 +0100
 -
 -ocamlpam (1.1-4build1) lucid; urgency=low
 -
 -  * No-change rebuild for OCaml 3.11.2 transition (LP: #522363).
 -
 - -- Ilya Barygin <barygin at gmail.com>  Wed, 17 Feb 2010 18:13:37 +0300
 -
  ocamlpam (1.1-4) unstable; urgency=low
  
    * Switch packaging to dh-ocaml 0.9

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