[Pkg-ocaml-maint-commits] [SCM] cduce packaging branch, master, updated. debian/0.5.3-2-4-g4819981

[Stephane Glondu]

The following commit has been merged in the master branch:
commit a5468c5037cddbda197c4108d9886f64dec4ced5
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Jun 19 18:29:44 2010 -0700

    Add 0002-Fix-build-with-ocaml-3.12.0.patch (Closes: #586392)

diff --git a/debian/patches/0001-Add-dynlink.cma-to-the-linking-command-of-the-byteco.patch b/debian/patches/0001-Add-dynlink.cma-to-the-linking-command-of-the-byteco.patch
index 572d14c..325fd55 100644
--- a/debian/patches/0001-Add-dynlink.cma-to-the-linking-command-of-the-byteco.patch
+++ b/debian/patches/0001-Add-dynlink.cma-to-the-linking-command-of-the-byteco.patch
@@ -1,4 +1,3 @@
-From cf2a4e373fbe0b85059da10bcdde42f3ab9d7c7b Mon Sep 17 00:00:00 2001
 From: Stephane Glondu <steph at glondu.net>
 Date: Tue, 24 Mar 2009 20:13:56 +0100
 Subject: [PATCH] Add dynlink.cma to the linking command of the bytecode version
@@ -24,5 +23,3 @@ index eec1f51..10ba683 100644
  endif
  
 -- 
-1.6.2
-
diff --git a/debian/patches/0002-Fix-build-with-ocaml-3.12.0.patch b/debian/patches/0002-Fix-build-with-ocaml-3.12.0.patch
new file mode 100644
index 0000000..6aa24a2
--- /dev/null
+++ b/debian/patches/0002-Fix-build-with-ocaml-3.12.0.patch
@@ -0,0 +1,74 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Sat, 19 Jun 2010 18:28:34 -0700
+Subject: [PATCH] Fix build with ocaml 3.12.0
+
+camlp4 seemed to accept #load primitives in source files, but it is no
+longer the case.
+
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=586392
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ Makefile             |    3 +--
+ ocamliface/mlstub.ml |    2 +-
+ parser/parser.ml     |    2 +-
+ query/query_parse.ml |    2 +-
+ 4 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 10ba683..6f19646 100644
+--- a/Makefile
++++ b/Makefile
+@@ -29,7 +29,7 @@ else
+ endif
+ 
+ 
+-SYNTAX = -I misc/ q_symbol.cmo \
++SYNTAX = pa_extend.cmo q_MLast.cmo -I misc/ q_symbol.cmo \
+   -symbol cduce_version=\"$(VERSION)\" \
+   -symbol build_date=\"$(shell date +%Y-%m-%d)\" \
+   -symbol session_dir=\"$(SESSION_DIR)\" \
+@@ -350,4 +350,3 @@ ocamliface/caml_cduce.cmo:
+ ocamliface/caml_cduce.cmx:
+ 	@cd ocamliface; \
+ 	$(MAKE) caml_cduce.cmx
+-
+diff --git a/ocamliface/mlstub.ml b/ocamliface/mlstub.ml
+index 23f6cfc..9b922a8 100644
+--- a/ocamliface/mlstub.ml
++++ b/ocamliface/mlstub.ml
+@@ -4,7 +4,7 @@
+ (*  Copyright CNRS,INRIA, 2003,2004,2005,2006,2007 (see LICENSE for details)  *)
+ (**************************************************************************)
+ 
+-#load "q_MLast.cmo";;
++(* #load "q_MLast.cmo";; *)
+ (* TODO:
+    - optimizations: generate labels and atoms only once.
+    - translate record to open record on positive occurence
+diff --git a/parser/parser.ml b/parser/parser.ml
+index ddfb147..8fd4876 100644
+--- a/parser/parser.ml
++++ b/parser/parser.ml
+@@ -4,7 +4,7 @@
+ (*  Copyright CNRS,INRIA, 2003,2004,2005,2006,2007 (see LICENSE for details)  *)
+ (**************************************************************************)
+ 
+-#load "pa_extend.cmo";;
++(*#load "pa_extend.cmo";;*)
+ 
+ open Cduce_loc
+ (* let raise = Pervasives.raise *)
+diff --git a/query/query_parse.ml b/query/query_parse.ml
+index 772f135..178b57e 100644
+--- a/query/query_parse.ml
++++ b/query/query_parse.ml
+@@ -5,7 +5,7 @@ open Printf
+ 
+ open Parser.Hook
+ open Query
+-#load "pa_extend.cmo";;
++(* #load "pa_extend.cmo";; *)
+ 
+ 
+ let tloc (i,j) = (i.Lexing.pos_cnum,j.Lexing.pos_cnum)
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 2fe48e8..1d08279 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Add-dynlink.cma-to-the-linking-command-of-the-byteco.patch
+0002-Fix-build-with-ocaml-3.12.0.patch

-- 
cduce packaging