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

commit a006e2cd7e0da203cb53b31551068482dfe1d538
Merge: 572e005 29699e4
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Jul 20 21:54:42 2017 +0200

    Merge branch 'ubuntu'

 debian/changelog              |  9 +++++++
 debian/patches/series         |  1 +
 debian/patches/ship-cmx.patch | 59 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 69 insertions(+)

diff --cc debian/changelog
index d186c81,add4e12..ada2b9a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,29 +1,12 @@@
 -ocamlnet (4.1.2-1ubuntu2) artful; urgency=medium
++ocamlnet (4.1.2-2) UNRELEASED; urgency=medium
+ 
++  * Import upstream patch to build with opaque files, instead of
++    installing cmx files. Should fix approx FTBFS.
+   * Revert previous patch. Building with opaque doesn't resolve
+     approx FTBFS. Ship cmx files instead.
+ 
+  -- Dimitri John Ledkov <xnox at ubuntu.com>  Mon, 10 Jul 2017 11:45:59 +0000
+ 
 -ocamlnet (4.1.2-1ubuntu1) artful; urgency=medium
 -
 -  * Import upstream patch to build with opaque files, instead of
 -    installing cmx files. Should fix approx FTBFS.
 -
 - -- Dimitri John Ledkov <xnox at ubuntu.com>  Sat, 08 Jul 2017 10:12:37 +0100
 -
 -ocamlnet (4.1.2-1build2) artful; urgency=high
 -
 -  * No change rebuild against ocaml 4.04.
 -
 - -- Dimitri John Ledkov <xnox at ubuntu.com>  Fri, 30 Jun 2017 14:52:31 +0100
 -
 -ocamlnet (4.1.2-1build1) zesty; urgency=medium
 -
 -  * Rebuild against new OCaml ABI.
 -
 - -- Gianfranco Costamagna <locutusofborg at debian.org>  Wed, 21 Dec 2016 15:11:33 +0100
 -
  ocamlnet (4.1.2-1) unstable; urgency=medium
  
    * New upstream release

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