The following commit has been merged in the master branch:
commit 176d8fc3e9315d45e8e441eb3a2383662f0814f7
Author: Stephane Glondu st...@glondu.net
Date: Mon Apr 18 17:32:20 2011 +0200
Switch patches to dom-*-patches scheme
diff --git a/debian/patches/update-configure.patch
b/debian/patches/0001-Fix-camlp4of.opt-detection-in-configure.patch
similarity index 68%
rename from debian/patches/update-configure.patch
rename to debian/patches/0001-Fix-camlp4of.opt-detection-in-configure.patch
index 99ea36e..d4afd4a 100644
--- a/debian/patches/update-configure.patch
+++ b/debian/patches/0001-Fix-camlp4of.opt-detection-in-configure.patch
@@ -1,7 +1,17 @@
-Index: ocaml-bitstring/configure
-===
ocaml-bitstring.orig/configure 2009-07-04 20:52:47.0 +
-+++ ocaml-bitstring/configure 2009-07-04 20:57:41.0 +
+From: Sylvain Le Gall gil...@debian.org
+Date: Sat, 4 Jul 2009 21:05:17 +
+Subject: Fix camlp4of.opt detection in configure
+
+Signed-off-by: Sylvain Le Gall gil...@debian.org
+---
+ configure| 50 ++
+ configure.ac |6 +-
+ 2 files changed, 51 insertions(+), 5 deletions(-)
+
+diff --git a/configure b/configure
+index 7f5fa37..9587336 100755
+--- a/configure
b/configure
@@ -643,6 +643,7 @@ DIFF
TIME
OCAML_PKG_cil
@@ -10,7 +20,7 @@ Index: ocaml-bitstring/configure
CAMLP4OF
OCAMLFIND
OCAMLBUILD
-@@ -5295,8 +5296,8 @@
+@@ -5295,8 +5296,8 @@ $as_echo $as_me: error: You must have ocaml and findlib
installed 2;}
{ (exit 1); exit 1; }; }
fi
@@ -21,7 +31,7 @@ Index: ocaml-bitstring/configure
{ $as_echo $as_me:$LINENO: checking for $ac_word 5
$as_echo_n checking for $ac_word... 6; }
if test ${ac_cv_prog_CAMLP4OF+set} = set; then
-@@ -5312,7 +5313,7 @@
+@@ -5312,7 +5313,7 @@ do
test -z $as_dir as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f $as_dir/$ac_word$ac_exec_ext $as_test_x
$as_dir/$ac_word$ac_exec_ext; }; then
@@ -30,7 +40,7 @@ Index: ocaml-bitstring/configure
$as_echo $as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext 5
break 2
fi
-@@ -5333,8 +5334,49 @@
+@@ -5333,8 +5334,49 @@ $as_echo no 6; }
fi
@@ -81,3 +91,21 @@ Index: ocaml-bitstring/configure
$as_echo $as_me: error: You must have camlp4 installed 2;}
{ (exit 1); exit 1; }; }
fi
+diff --git a/configure.ac b/configure.ac
+index 174ed8c..c72bdb5 100644
+--- a/configure.ac
b/configure.ac
+@@ -59,7 +59,11 @@ if test x$OCAMLFIND = x; then
+ fi
+
+ dnl Check for camlp4
+-AC_CHECK_PROG(CAMLP4OF,camlp4of.opt,camlp4of.opt,no)
++AC_CHECK_PROG(CAMLP4OF,camlp4of,camlp4of,no)
++AC_CHECK_PROG(CAMLP4OFOPT,camlp4of.opt,camlp4of.opt,no)
++if ! test x$CAMLP4OFOPT = xno; then
++ CAMLP4OF=$CAMLP4OFOPT
++fi
+ if test x$CAMLP4OF = xno; then
+ AC_MSG_ERROR([You must have camlp4 installed])
+ fi
+--
diff --git a/debian/patches/01-byte-compilation.dpatch
b/debian/patches/0002-Allow-byte-only-compilation.patch
similarity index 61%
rename from debian/patches/01-byte-compilation.dpatch
rename to debian/patches/0002-Allow-byte-only-compilation.patch
index 5aa1735..916d541 100644
--- a/debian/patches/01-byte-compilation.dpatch
+++ b/debian/patches/0002-Allow-byte-only-compilation.patch
@@ -1,15 +1,17 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01-byte-compilation.dpatch by Sylvain Le Gall gil...@debian.org
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Allow byte only compilation.
+From: Sylvain Le Gall gil...@debian.org
+Date: Sat, 9 Aug 2008 21:35:35 +
+Subject: Allow byte only compilation
-@DPATCH@
-Index: ocaml-bitstring/Makefile.in
-===
ocaml-bitstring.orig/Makefile.in 2009-06-26 22:18:38.0 +0200
-+++ ocaml-bitstring/Makefile.in2009-06-26 22:39:14.0 +0200
-@@ -33,6 +33,8 @@
+Signed-off-by: Sylvain Le Gall gil...@debian.org
+---
+ Makefile.in | 10 --
+ 1 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index d64750d..aebdaa7 100644
+--- a/Makefile.in
b/Makefile.in
+@@ -33,6 +33,8 @@ BYTESWAP_H = @BYTESWAP_H@
OCAMLLIB = @OCAMLLIB@
top_srcdir= @top_srcdir@
@@ -18,7 +20,7 @@ Index: ocaml-bitstring/Makefile.in
pkg_cil = @OCAML_PKG_cil@
pkg_extlib= @OCAML_PKG_extlib@
-@@ -77,11 +79,15 @@
+@@ -77,11 +79,15 @@ BENCHMARKS = $(patsubst %.ml,%,$(wildcard benchmarks/*.ml))
all: $(BYTESWAP_H) \
bitstring.cma bitstring_persistent.cma \
@@ -35,7 +37,7 @@ Index: ocaml-bitstring/Makefile.in
bitstring.cma: bitstring_types.cmo bitstring_config.cmo \
bitstring_c.o bitstring.cmo bitmatch.cmo
$(OCAMLMKLIB) -o bitstring $^
-@@ -268,7 +274,7 @@
+@@ -268,7 +274,7 @@ endif
# Install.
install:
@@ -44,3 +46,4 @@ Index: ocaml-bitstring/Makefile.in
