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

commit 03b3674134e4405dac6a6fd438b63498241c2f1d
Merge: 6aa4754 d9e215a
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Jul 16 11:19:08 2017 +0200

    Merge branch 'ubuntu'

 debian/changelog                                   |   6 +-
 .../b58227902eb69a5c38819f587fcb02c92d5627d4.patch | 941 +++++++++++++++++++++
 debian/patches/series                              |   1 +
 3 files changed, 947 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index a026889,1bca6ad..f635b23
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,27 +1,13 @@@
 -camlidl (1.05-14ubuntu1) artful; urgency=medium
 +camlidl (1.05-15) UNRELEASED; urgency=low
  
++  [ Sylvain Le Gall ]
 +  * Remove Sylvain Le Gall from uploaders
 +
-  -- Sylvain Le Gall <gildor at debian.org>  Fri, 21 Sep 2012 01:10:08 +0000
++  [ Dimitri John Ledkov ]
+   * Import upstream patch to fix compatibility with ocaml 4.03+.
+ 
+  -- Dimitri John Ledkov <xnox at ubuntu.com>  Mon, 26 Jun 2017 23:59:51 +0100
  
 -camlidl (1.05-14build3) artful; urgency=high
 -
 -  * No change rebuild against ocaml 4.04 transition.
 -
 - -- Dimitri John Ledkov <xnox at ubuntu.com>  Mon, 26 Jun 2017 22:47:56 +0100
 -
 -camlidl (1.05-14build2) xenial; urgency=medium
 -
 -  * No-change rebuild against ocaml-4.02.
 -
 - -- Łukasz 'sil2100' Zemczak <lukasz.zemczak at canonical.com>  Fri, 30 Oct 2015 17:38:17 +0100
 -
 -camlidl (1.05-14build1) trusty; urgency=medium
 -
 -  * Rebuild for ocaml-4.01.
 -
 - -- Matthias Klose <doko at ubuntu.com>  Mon, 23 Dec 2013 12:10:19 +0000
 -
  camlidl (1.05-14) unstable; urgency=low
  
    * debian/mk/docbook-manpage.mk: build-arch, not build, must depend on

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