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

treinen pushed a commit to branch master
in repository why.

commit f45d3e734b1861d1a06311018dd5edde145675ef
Author: Ralf Treinen <trei...@free.fr>
Date:   Fri Jan 17 20:23:05 2014 +0100

    drop patch 0005-Fix-Jc_annot_inference-use-old_reg_pos
---
 debian/changelog                                   |  1 +
 ...05-Fix-Jc_annot_inference-use-old_reg_pos.patch | 22 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9b538c4..ec70afd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ why (2.33-1) unstable; urgency=low
     - 0002-Mark-alt-ergo-0.93-as-compatible.patch
     - 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
 
  --
 
diff --git a/debian/patches/0005-Fix-Jc_annot_inference-use-old_reg_pos.patch 
b/debian/patches/0005-Fix-Jc_annot_inference-use-old_reg_pos.patch
deleted file mode 100644
index f8adabf..0000000
--- a/debian/patches/0005-Fix-Jc_annot_inference-use-old_reg_pos.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Mehdi Dogguy <me...@dogguy.org>
-Date: Thu, 8 Dec 2011 17:08:36 +0100
-Subject: Fix Jc_annot_inference (use old_reg_pos)
-
----
- jc/jc_annot_inference.ml |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/jc/jc_annot_inference.ml b/jc/jc_annot_inference.ml
-index d9dbbd7..0d3143e 100644
---- a/jc/jc_annot_inference.ml
-+++ b/jc/jc_annot_inference.ml
-@@ -491,7 +491,7 @@ let reg_annot ?id ?kind ?name ~pos ~anchor a =
-   in
-   Format.fprintf Format.str_formatter "%a" Jc_output.assertion a;
-   let formula = Format.flush_str_formatter () in
--  let lab = Output.reg_pos "G" ?id ?kind ?name ~formula loc in
-+  let lab = Output.old_reg_pos "G" ?id ?kind ?name ~formula (Loc.extract loc) 
in
-   new assertion_with ~mark:lab a
- 
- 
--- 
diff --git a/debian/patches/series b/debian/patches/series
index d863b61..47d3b6b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-0005-Fix-Jc_annot_inference-use-old_reg_pos.patch
 0006-Fix-spelling-error-in-binary.patch
 0007-Replace-caduceus-invocation-by-Frama-C.patch

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

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to