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

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 066bc2adccd04d55b52b4185af43800b98967a38
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Oct 6 14:36:02 2010 +0200

    #586392 doesn't seem relevant any more with released 3.12.0

diff --git a/debian/changelog b/debian/changelog
index 5048a39..596dcc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,8 @@
 cduce (0.5.3-3) UNRELEASED; urgency=low
 
-  * Add 0002-Fix-build-with-ocaml-3.12.0.patch (Closes: #586392)
   * Switch source package format to 3.0 (quilt)
 
- -- Stéphane Glondu <glondu at debian.org>  Sat, 19 Jun 2010 18:32:29 -0700
+ -- Stéphane Glondu <glondu at debian.org>  Wed, 06 Oct 2010 14:35:11 +0200
 
 cduce (0.5.3-2) unstable; urgency=low
 
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
deleted file mode 100644
index 6aa24a2..0000000
--- a/debian/patches/0002-Fix-build-with-ocaml-3.12.0.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-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 1d08279..2fe48e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-Add-dynlink.cma-to-the-linking-command-of-the-byteco.patch
-0002-Fix-build-with-ocaml-3.12.0.patch

-- 
cduce packaging