[Pkg-ocaml-maint-commits] [SCM] ocaml-bitstring packaging branch, master, updated. debian/2.0.2-2-7-g65d636a

Stephane Glondu steph at glondu.net
Mon Apr 18 16:05:21 UTC 2011


The following commit has been merged in the master branch:
commit 03bce48f0596d4c28ba449c3e9c1c5aea227c66a
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Apr 18 17:41:19 2011 +0200

    Fix preprocessor options in META (Closes: #623230)

diff --git a/debian/patches/0004-Fix-preprocessor-options-for-the-syntax-META-file.patch b/debian/patches/0004-Fix-preprocessor-options-for-the-syntax-META-file.patch
new file mode 100644
index 0000000..349e9d2
--- /dev/null
+++ b/debian/patches/0004-Fix-preprocessor-options-for-the-syntax-META-file.patch
@@ -0,0 +1,27 @@
+From: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
+Date: Mon, 18 Apr 2011 16:17:36 +0200
+Subject: Fix preprocessor options for the syntax META file
+
+Origin: upstream, http://code.google.com/p/bitstring/source/detail?r=185
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=623230
+Signed-off-by: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ META.in |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/META.in b/META.in
+index 699ba44..049bbb4 100644
+--- a/META.in
++++ b/META.in
+@@ -16,8 +16,7 @@ package "persistent" (
+ package "syntax" (
+   version = "@PACKAGE_VERSION@"
+   description = "Syntax extension: bitstring operators"
+-  requires = "bitstring.persistent"
++  requires = "bitstring.persistent, camlp4"
+   archive(syntax,preprocessor) = "pa_bitstring.cmo"
+   archive(syntax,toploop) = "pa_bitstring.cmo"
+-  preprocessor = "camlp4of"
+ )
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 36d495b..eae36fe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Fix-camlp4of.opt-detection-in-configure.patch
 0002-Allow-byte-only-compilation.patch
 0003-Fix-META-file-for-bitstring.syntax.patch
+0004-Fix-preprocessor-options-for-the-syntax-META-file.patch

-- 
ocaml-bitstring packaging



More information about the Pkg-ocaml-maint-commits mailing list