[Pkg-ocaml-maint-commits] [SCM] ocsigen packaging branch, master, updated. debian/1.3.0-3-1-gb61a175

[Stephane Glondu]

The following commit has been merged in the master branch:
commit b61a175ad34b73b037e9c04eed0cd95a51e6c30b
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Mar 22 22:32:46 2010 +0100

    Fix FTBFS on hppa

diff --git a/debian/changelog b/debian/changelog
index 142bcb4..a3b7e20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocsigen (1.3.0-4) UNRELEASED; urgency=low
+
+  * Fix FTBFS on hppa:
+    - add 0002-Do-not-compile-dbm-test-with-custom.patch
+
+ -- Stéphane Glondu <glondu at debian.org>  Mon, 22 Mar 2010 22:37:57 +0100
+
 ocsigen (1.3.0-3) unstable; urgency=low
 
   * Split out libocsigen-xhtml-ocaml-dev (Closes: #574887)
diff --git a/debian/patches/0002-Do-not-compile-dbm-test-with-custom.patch b/debian/patches/0002-Do-not-compile-dbm-test-with-custom.patch
new file mode 100644
index 0000000..493a624
--- /dev/null
+++ b/debian/patches/0002-Do-not-compile-dbm-test-with-custom.patch
@@ -0,0 +1,24 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Mon, 22 Mar 2010 22:28:20 +0100
+Subject: [PATCH] Do not compile dbm test with -custom
+
+On the hppa port of Debian, ld doesn't like outputting to
+/dev/null. Seems related to Debian bug #350239.
+---
+ configure |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index 9db7247..16c7156 100755
+--- a/configure
++++ b/configure
+@@ -630,7 +630,7 @@ fi
+ 
+ if [ "$enable_dbm" -gt 0 ]; then
+     printf "%s" "Checking for dbm... "
+-    if ocamlc -custom -o /dev/null dbm.cma >/dev/null 2>/dev/null; then
++    if ocamlc -o /dev/null dbm.cma >/dev/null 2>/dev/null; then
+         echo "found"
+     elif [ "$enable_dbm" -gt 1 ]; then
+         echo "not found, but --enable-dbm specified"
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 521b33a..8ccd397 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Split-out-ocsigen_xhtml-findlib-package.patch
+0002-Do-not-compile-dbm-test-with-custom.patch

-- 
ocsigen packaging