[Pkg-ocaml-maint-commits] [jocaml] 08/15: Remove 0002-Add-option-v-to-expunge-to-select-modules-to-filter-.patch (applied upstream).

[Mehdi Dogguy]

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

mehdi pushed a commit to branch master
in repository jocaml.

commit 4497de248e107768c8d15e3bae47b893e0b8fa43
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu May 8 21:35:08 2014 +0200

    Remove 0002-Add-option-v-to-expunge-to-select-modules-to-filter-.patch (applied upstream).
---
 debian/changelog                                   |  2 +
 ...v-to-expunge-to-select-modules-to-filter-.patch | 51 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 2 insertions(+), 52 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e17d1fb..9d39b7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 jocaml (4.01.0-1) UNRELEASED; urgency=medium
 
   * New upstream release
+    - Remove 0002-Add-option-v-to-expunge-to-select-modules-to-filter-.patch
+      (applied upstream).
   * Keep only JoCaml specific patches, and import OCaml patches from
     ocaml-source package. This lets jocaml package benefit from work
     done on the ocaml package, automatically.
diff --git a/debian/patches/0002-Add-option-v-to-expunge-to-select-modules-to-filter-.patch b/debian/patches/0002-Add-option-v-to-expunge-to-select-modules-to-filter-.patch
deleted file mode 100644
index edd706b..0000000
--- a/debian/patches/0002-Add-option-v-to-expunge-to-select-modules-to-filter-.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From: Mehdi Dogguy <dogguy at pps.jussieu.fr>
-Date: Tue, 7 Jul 2009 18:03:42 +0200
-Subject: [PATCH] Add option -v to expunge to select modules to filter instead of modules to keep
-
----
- toplevel/expunge.ml |   22 ++++++++++++++--------
- 1 files changed, 14 insertions(+), 8 deletions(-)
-
-diff --git a/toplevel/expunge.ml b/toplevel/expunge.ml
-index 5e405a9..bdfef8e 100644
---- a/toplevel/expunge.ml
-+++ b/toplevel/expunge.ml
-@@ -24,23 +24,29 @@ module StringSet =
-     let compare = compare
-   end)
- 
-+let is_exn =
-+  let h = Hashtbl.create 64 in
-+  Array.iter (fun n -> Hashtbl.add h n ()) Runtimedef.builtin_exceptions;
-+  Hashtbl.mem h
-+
- let to_keep = ref StringSet.empty
- 
-+let negate = Sys.argv.(3) = "-v"
-+
-+let keep =
-+  if negate then fun name -> is_exn name || not (StringSet.mem name !to_keep)
-+  else fun name -> is_exn name || (StringSet.mem name !to_keep)
-+
- let expunge_map tbl =
--  Symtable.filter_global_map
--    (fun id -> StringSet.mem (Ident.name id) !to_keep)
--    tbl
-+  Symtable.filter_global_map (fun id -> keep (Ident.name id)) tbl
- 
- let expunge_crcs tbl =
--  List.filter (fun (unit, crc) -> StringSet.mem unit !to_keep) tbl
-+  List.filter (fun (unit, crc) -> keep unit) tbl
- 
- let main () =
-   let input_name = Sys.argv.(1) in
-   let output_name = Sys.argv.(2) in
--  Array.iter
--    (fun exn -> to_keep := StringSet.add exn !to_keep)
--    Runtimedef.builtin_exceptions;
--  for i = 3 to Array.length Sys.argv - 1 do
-+  for i = (if negate then 4 else 3) to Array.length Sys.argv - 1 do
-     to_keep := StringSet.add (String.capitalize Sys.argv.(i)) !to_keep
-   done;
-   let ic = open_in_bin input_name in
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 3937513..2a3c543 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-Replace-Otyp_proc-with-Otyp_stuff-to-make-outcometre.patch
-0002-Add-option-v-to-expunge-to-select-modules-to-filter-.patch

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