[Pkg-ocaml-maint-commits] [SCM] why packaging branch, master, updated. debian/2.23+dfsg-1-3-gf403888

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit f403888f5feaf523830d8625aa41909ea868a24e
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Feb 17 15:42:23 2010 +0100

    Correctly detect Coq-float wrt. its new path

diff --git a/debian/changelog b/debian/changelog
index ab0f129..3dbb151 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 why (2.23+dfsg-2) unstable; urgency=low
 
   * Rebuild with OCaml 3.11.2
+  * Correctly detect Coq-float wrt. its new path
+    - Add 0006-Coq-float-can-be-in-coqlib-user-contrib-Float.patch
 
  -- Mehdi Dogguy <mehdi at debian.org>  Sun, 24 Jan 2010 23:56:15 +0100
 
diff --git a/debian/patches/0006-Coq-float-can-be-in-coqlib-user-contrib-Float.patch b/debian/patches/0006-Coq-float-can-be-in-coqlib-user-contrib-Float.patch
new file mode 100644
index 0000000..1e9eb6a
--- /dev/null
+++ b/debian/patches/0006-Coq-float-can-be-in-coqlib-user-contrib-Float.patch
@@ -0,0 +1,22 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Wed, 17 Feb 2010 15:37:49 +0100
+Subject: [PATCH] Coq-float can be in coqlib/user-contrib/Float
+
+---
+ configure.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 7d0b77b..e7f0cd8 100644
+--- a/configure.in
++++ b/configure.in
+@@ -334,7 +334,7 @@ else
+ 	AC_MSG_CHECKING(Coq floating-point library)
+  	case $COQVERSION in
+ 	   8.2*|trunk)
+- 	      if test -f "$COQLIB/user-contrib/AllFloat.vo"; then
++ 	      if test -f "$COQLIB/user-contrib/AllFloat.vo" || test -f "$COQLIB/user-contrib/Float/AllFloat.vo"; then
+ 	        AC_MSG_RESULT(yes)
+ 	  	WHYFLOATS="lib/coq/WhyFloats.vo lib/coq/JessieFloats.vo"
+ 		COQFLOATSMSG=yes
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index b78293a..2f183b2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-Fix-spelling-errors.patch
 0004-Use-tools-make_float_model.ocamlbest-instead-of-opt-.patch
 0005-Generate-Jessie.cma-for-bytecode-only-architectures.patch
+0006-Coq-float-can-be-in-coqlib-user-contrib-Float.patch

-- 
why packaging