[Pkg-ocaml-maint-commits] [ppx-deriving] 01/01: Import Debian changes 4.1-1.1

[Ralf Treinen]

This is an automated email from the git hooks/post-receive script.

treinen pushed a commit to branch master
in repository ppx-deriving.

commit 54af0720f59558a38ad86c9cb94a783459d76147
Author: Gianfranco Costamagna <locutusofborg at debian.org>
Date:   Sat Oct 28 13:37:32 2017 +0200

    Import Debian changes 4.1-1.1
    
    ppx-deriving (4.1-1.1) unstable; urgency=medium
    
      * Non-maintainer upload
      * debian/patches/b6b02c2ba051bde67c2b454724ff0bf36bc11060.patch:
        - upstream fix for ocaml build failure (Closes: #876725)
---
 debian/changelog                                   |  8 ++++
 .../b6b02c2ba051bde67c2b454724ff0bf36bc11060.patch | 43 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/source/local-options                        |  2 -
 4 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d3de52f..c98bb59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ppx-deriving (4.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * debian/patches/b6b02c2ba051bde67c2b454724ff0bf36bc11060.patch:
+    - upstream fix for ocaml build failure (Closes: #876725)
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Sat, 28 Oct 2017 13:37:32 +0200
+
 ppx-deriving (4.1-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/b6b02c2ba051bde67c2b454724ff0bf36bc11060.patch b/debian/patches/b6b02c2ba051bde67c2b454724ff0bf36bc11060.patch
new file mode 100644
index 0000000..e67532e
--- /dev/null
+++ b/debian/patches/b6b02c2ba051bde67c2b454724ff0bf36bc11060.patch
@@ -0,0 +1,43 @@
+From b6b02c2ba051bde67c2b454724ff0bf36bc11060 Mon Sep 17 00:00:00 2001
+From: Jeremie Dimino <jdimino at janestreet.com>
+Date: Wed, 7 Jun 2017 13:54:44 +0100
+Subject: [PATCH] Fix build with 4.05
+
+---
+ src/ppx_deriving.cppo.ml | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+Index: ppx-deriving/src/ppx_deriving.cppo.ml
+===================================================================
+--- ppx-deriving.orig/src/ppx_deriving.cppo.ml
++++ ppx-deriving/src/ppx_deriving.cppo.ml
+@@ -12,6 +12,21 @@
+ open Ast_helper
+ open Ast_convenience
+ 
++#if OCAML_VERSION >= (4, 05, 0)
++module Typ = struct
++  include Typ
++
++  let poly ?(loc= !Ast_helper.default_loc) ?attrs vars ty =
++    let vars = List.map (fun txt -> { Asttypes.loc; txt }) vars in
++    Typ.poly ~loc ?attrs vars ty
++end
++
++let rm_poly_locs =
++  List.map (fun x -> x.Asttypes.txt)
++#else
++let rm_poly_locs x = x
++#endif
++
+ type deriver = {
+   name : string ;
+   core_type : (core_type -> expression) option;
+@@ -310,6 +325,7 @@
+       List.map free_in xs |> List.concat
+     | { ptyp_desc = Ptyp_alias (x, name) } -> [name] @ free_in x
+     | { ptyp_desc = Ptyp_poly (bound, x) } ->
++      let bound = rm_poly_locs bound in
+       List.filter (fun y -> not (List.mem y bound)) (free_in x)
+     | { ptyp_desc = Ptyp_variant (rows, _, _) } ->
+       List.map (
diff --git a/debian/patches/series b/debian/patches/series
index 691d551..47ebe92 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Fix-install-target.patch
 0002-Fix-typo-in-ppx_deriving_make.mllib.patch
+b6b02c2ba051bde67c2b454724ff0bf36bc11060.patch
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index c4cf480..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1,2 +0,0 @@
-abort-on-upstream-changes
-unapply-patches

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