[Pkg-ocaml-maint-commits] [SCM] why packaging branch, master, updated. debian/2.26+dfsg-2-3-g2a4e3ea

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 2dac62ea9b5d9f365c80498ee00ed0149ae99f29
Author: Mehdi Dogguy <mehdi at dogguy.org>
Date:   Thu Jan 20 20:58:55 2011 +0100

    Squeeze's Coq is also compatible

diff --git a/debian/changelog b/debian/changelog
index bc43d30..c7acff4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
 why (2.26+dfsg-3) UNRELEASED; urgency=low
 
+  [ Stéphane Glondu ]
   * Fix versioned build-deps to ensure smoother backports
 
- -- Stéphane Glondu <glondu at debian.org>  Wed, 21 Jul 2010 10:46:33 +0200
+  [ Mehdi Dogguy ]
+  * Add 0007-Squeeze-s-Coq-is-also-compatible.patch: why-config checks
+    compatibility of provers by checking their version number. Coq
+    versioned 8.2pl2 is also compatible (like 8.2pl1). Marking it as
+    such so that it gets activated.
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Thu, 20 Jan 2011 20:56:42 +0100
 
 why (2.26+dfsg-2) unstable; urgency=low
 
diff --git a/debian/patches/0007-Squeeze-s-Coq-is-also-compatible.patch b/debian/patches/0007-Squeeze-s-Coq-is-also-compatible.patch
new file mode 100644
index 0000000..01bdbe3
--- /dev/null
+++ b/debian/patches/0007-Squeeze-s-Coq-is-also-compatible.patch
@@ -0,0 +1,22 @@
+From: Mehdi Dogguy <mehdi at dogguy.org>
+Date: Thu, 20 Jan 2011 20:56:15 +0100
+Subject: [PATCH] Squeeze's Coq is also compatible
+
+---
+ tools/dpConfig.ml |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/tools/dpConfig.ml b/tools/dpConfig.ml
+index b55e8bd..3785a8b 100644
+--- a/tools/dpConfig.ml
++++ b/tools/dpConfig.ml
+@@ -181,7 +181,7 @@ let coq =
+     version = "";
+     version_switch = "-v";
+     version_regexp = "The Coq Proof Assistant, version \\([^ ]+\\)";
+-    versions_ok = ["8.0"; "8.1";"8.2";"8.2pl1"];
++    versions_ok = ["8.0"; "8.1";"8.2";"8.2pl1";"8.2pl2"];
+     versions_old = ["7.4"];
+     command = "coqc";
+     command_switches = "";
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 68f088f..64b2a84 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0004-Generate-Jessie.cma-for-bytecode-only-architectures.patch
 0005-Coq-float-can-be-in-coqlib-user-contrib-Float.patch
 0006-Cope-with-OCaml-3.12-s-Map.patch
+0007-Squeeze-s-Coq-is-also-compatible.patch

-- 
why packaging