[Pkg-ocaml-maint-commits] [SCM] why packaging branch, master, updated. debian/2.26+dfsg-4-8-gf677c3a

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit a4ea4f3e71906dc18f9d47974ad8016a8faced4e
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sat Apr 23 20:16:36 2011 +0200

    Fix FTBFS due to non-exhaustive pattern matching

diff --git a/debian/changelog b/debian/changelog
index f540ec8..1950fca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,10 @@ why (2.29+dfsg-1) unstable; urgency=low
       mention to why-config that Coq 8.3 is "ok").
   * Mark Alt-Ergo 0.93 as compatible
     - add 0002-Mark-alt-ergo-0.93-as-compatible.patch
+  * Fix FTBFS due to non-exhaustive pattern matching
+    - add 0003-Fix-non-exhaustive-pattern-matching-in-jc_annot_infe.patch
 
- -- Mehdi Dogguy <mehdi at debian.org>  Sat, 23 Apr 2011 20:07:28 +0200
+ -- Mehdi Dogguy <mehdi at debian.org>  Sat, 23 Apr 2011 20:16:00 +0200
 
 why (2.26+dfsg-4) unstable; urgency=low
 
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
new file mode 100644
index 0000000..9150718
--- /dev/null
+++ b/debian/patches/0003-Fix-non-exhaustive-pattern-matching-in-jc_annot_infe.patch
@@ -0,0 +1,40 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Sat, 23 Apr 2011 20:15:35 +0200
+Subject: [PATCH] Fix non-exhaustive pattern-matching in jc_annot_inference.ml
+
+---
+ jc/jc_annot_inference.ml |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/jc/jc_annot_inference.ml b/jc/jc_annot_inference.ml
+index e7a1eae..d62a53c 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 b44593a..c2c574c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 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

-- 
why packaging