[Pkg-ocaml-maint-commits] [why] 05/14: drop patch 0003-Fix-non-exhaustive-pattern-matching-in-jc_annot_infe

[Ralf Treinen]

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

treinen pushed a commit to branch master
in repository why.

commit 3d31b03cb49c100362773a042e5a056d58dee81b
Author: Ralf Treinen <treinen at free.fr>
Date:   Fri Jan 17 20:16:18 2014 +0100

    drop patch 0003-Fix-non-exhaustive-pattern-matching-in-jc_annot_infe
---
 debian/changelog                                   |  3 +-
 ...austive-pattern-matching-in-jc_annot_infe.patch | 40 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 73ae6a0..20e624a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
 why (2.33-1) unstable; urgency=low
 
   * New upstream release. 
-    Drop patches adopted by upstream:
+    Drop patches adopted or otherwise fixed by upstream:
     - 0001-Why-2.29-do-support-Coq-8.3.patch
     - 0002-Mark-alt-ergo-0.93-as-compatible.patch
+    - 0003-Fix-non-exhaustive-pattern-matching-in-jc_annot_infe.patch
 
  --
 
diff --git a/debian/patches/0003-Fix-non-exhaustive-pattern-matching-in-jc_annot_infe.patch b/debian/patches/0003-Fix-non-exhaustive-pattern-matching-in-jc_annot_infe.patch
deleted file mode 100644
index c328685..0000000
--- a/debian/patches/0003-Fix-non-exhaustive-pattern-matching-in-jc_annot_infe.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Mehdi Dogguy <mehdi at debian.org>
-Date: Sat, 23 Apr 2011 20:15:35 +0200
-Subject: Fix non-exhaustive pattern-matching in jc_annot_inference.ml
-
----
- jc/jc_annot_inference.ml |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/jc/jc_annot_inference.ml b/jc/jc_annot_inference.ml
-index f4c9791..d9dbbd7 100644
---- a/jc/jc_annot_inference.ml
-+++ b/jc/jc_annot_inference.ml
-@@ -148,7 +148,7 @@ let rec destruct_pointer t =
- 	      Some(tptr,offt)
- 	end
-     | JCTvar _ | JCTderef _ | JCTapp _ | JCTold _ | JCTat _ | JCTif _ 
--    | JCTrange _ | JCTmatch _ | JCTaddress _ | JCTbase_block _
-+    | JCTrange _ | JCTmatch _ | JCTaddress _ | JCTbase_block _ | JCTlet _
-     | JCTconst _ | JCTbinary _ | JCTunary _ | JCToffset _ | JCTinstanceof _ 
-     | JCTreal_cast _ | JCTrange_cast _ | JCTbitwise_cast _ | JCTcast _ ->
- 	None
-@@ -609,7 +609,7 @@ let rec atp_of_term t =
-     | JCTvar _ | JCTderef _ | JCTapp _ | JCToffset _ ->
- 	Atp.Var (Vwp.variable_for_term t)
-     | JCTshift _ | JCTold _ | JCTat _ | JCTmatch _ | JCTinstanceof _ 
--    | JCTcast _ | JCTrange_cast _ | JCTbitwise_cast _ | JCTreal_cast _ 
-+    | JCTcast _ | JCTrange_cast _ | JCTbitwise_cast _ | JCTreal_cast _ | JCTlet _
-     | JCTaddress _ | JCTif _ | JCTrange _ | JCTunary _ | JCTbase_block _ ->
- 	err ()
- 
-@@ -1198,7 +1198,7 @@ let linearize t =
-       | JCTunary _ | JCTshift _ | JCTinstanceof _ | JCTmatch _ 
-       | JCTold _ | JCTat _ | JCTcast _ | JCTbitwise_cast _ 
-       | JCTrange_cast _ | JCTreal_cast _ | JCTaddress _ | JCTbase_block _
--      | JCTrange _ | JCTif _ -> 
-+      | JCTrange _ | JCTif _ | JCTlet _ ->
- 	  err ()
-     with Failure "linearize" -> 
-       (TermMap.add t (Int 1) TermMap.empty, Int 0)
--- 
diff --git a/debian/patches/series b/debian/patches/series
index d08d330..d3c9954 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0003-Fix-non-exhaustive-pattern-matching-in-jc_annot_infe.patch
 0004-Default-to-why2-for-jessie-atp.patch
 0005-Fix-Jc_annot_inference-use-old_reg_pos.patch
 0006-Fix-spelling-error-in-binary.patch

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