[Pkg-ocaml-maint-commits] [ppx-deriving] 03/10: new upstream, drop 2 patches

[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 6ef1f485a626589e5edc2dcc7da8707e825a784a
Author: Ralf Treinen <treinen at debian.org>
Date:   Mon Mar 19 21:32:02 2018 +0100

    new upstream, drop 2 patches
---
 debian/changelog                                   | 11 ++++++
 .../0002-Fix-typo-in-ppx_deriving_make.mllib.patch | 15 --------
 .../b6b02c2ba051bde67c2b454724ff0bf36bc11060.patch | 43 ----------------------
 debian/patches/series                              |  2 -
 4 files changed, 11 insertions(+), 60 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c98bb59..e0a48a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ppx-deriving (4.2.1-1) unstable; urgency=medium
+
+  * Team upload
+  * New upstream version.
+    - Dropped patch 0002-Fix-typo-in-ppx_deriving_make.mllib.patch which has
+      been applied upstream.
+    - Dropped patch b6b02c2ba051bde67c2b454724ff0bf36bc11060.patch since
+      issue is resolved upstream.
+
+ -- Ralf Treinen <treinen at debian.org>  Mon, 19 Mar 2018 21:31:09 +0100
+
 ppx-deriving (4.1-1.1) unstable; urgency=medium
 
   * Non-maintainer upload
diff --git a/debian/patches/0002-Fix-typo-in-ppx_deriving_make.mllib.patch b/debian/patches/0002-Fix-typo-in-ppx_deriving_make.mllib.patch
deleted file mode 100644
index 9e8e609..0000000
--- a/debian/patches/0002-Fix-typo-in-ppx_deriving_make.mllib.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Thu, 4 Aug 2016 10:04:03 +0200
-Subject: Fix typo in ppx_deriving_make.mllib
-
----
- src_plugins/ppx_deriving_make.mllib | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src_plugins/ppx_deriving_make.mllib b/src_plugins/ppx_deriving_make.mllib
-index 1b2681b..7f23204 100644
---- a/src_plugins/ppx_deriving_make.mllib
-+++ b/src_plugins/ppx_deriving_make.mllib
-@@ -1 +1 @@
--ppx_deriving_create
-+ppx_deriving_make
diff --git a/debian/patches/b6b02c2ba051bde67c2b454724ff0bf36bc11060.patch b/debian/patches/b6b02c2ba051bde67c2b454724ff0bf36bc11060.patch
deleted file mode 100644
index e67532e..0000000
--- a/debian/patches/b6b02c2ba051bde67c2b454724ff0bf36bc11060.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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 47ebe92..ebacac8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 0001-Fix-install-target.patch
-0002-Fix-typo-in-ppx_deriving_make.mllib.patch
-b6b02c2ba051bde67c2b454724ff0bf36bc11060.patch

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