[Pkg-ocaml-maint-commits] [SCM] mikmatch packaging branch, master, updated. debian/1.0.6-1-1-g570aa80

[Hendrik Tews]

The following commit has been merged in the master branch:
commit 570aa80c07d992b323fd179cc035c6f083b7a34b
Author: Hendrik Tews <hendrik at askra.de>
Date:   Thu Jun 20 09:58:24 2013 +0200

    prepare experimental package for OCaml 4.00

diff --git a/debian/changelog b/debian/changelog
index b58306d..ab479c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mikmatch (1.0.6-2) experimental; urgency=low
+
+  * prepare for OCaml 4.00
+    - remove 3.12 patch
+    - add new patch for ocamldoc 4 compatibility
+
+ -- Hendrik Tews <hendrik at askra.de>  Thu, 20 Jun 2013 09:56:10 +0200
+
 mikmatch (1.0.6-1) unstable; urgency=low
 
   [ Sylvain Le Gall ]
diff --git a/debian/patches/ocaml-3-12.patch b/debian/patches/ocaml-3-12.patch
deleted file mode 100644
index 3d0b6fb..0000000
--- a/debian/patches/ocaml-3-12.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: backward compatibility for OCaml 3.12
- Mikmatch 1.06 has been released for OCaml 4.00. This patch undoes
- some of the 1.06 changes to regain 3.12 compatibility. When compiling
- for 4.00, this patch should not be used.
-Author: Hendrik Tews <hendrik at askra.de>
---- a/common/match.ml
-+++ b/common/match.ml
-@@ -585,7 +585,7 @@
-     | <:patt< $_$ ; $_$ >> (* record or array items *)
-     | <:patt< $_$ = $_$ >> (* record field *)
-     | <:patt< >>
--    | Ast.PaMod _    (* (module M) *)
-+(*    | Ast.PaMod _    (* (module M) *) *)
-     | Ast.PaOlb _    (* ?s or ?s:(p) *)
-     | Ast.PaOlbi _   (* ?s:(p = e) or ?(p = e) *)
-     | Ast.PaLab _ -> (* label *)
diff --git a/debian/patches/ocamldoc-4.patch b/debian/patches/ocamldoc-4.patch
new file mode 100644
index 0000000..875ddbb
--- /dev/null
+++ b/debian/patches/ocamldoc-4.patch
@@ -0,0 +1,12 @@
+Description: make manual ocamldoc 4.00 compatible
+Author: Hendrik Tews <hendrik at askra.de>
+--- a/doc/mikmatch-manual.tex.mlx
++++ b/doc/mikmatch-manual.tex.mlx
+@@ -12,6 +12,7 @@
+ \usepackage{fullpage} 
+ \usepackage{url} 
+ \usepackage{ocamldoc}
++\usepackage{textcomp}
+ 
+ \title{Mikmatch Version~## Sys.command "../VERSION" ##\\
+ Reference Manual}
diff --git a/debian/patches/series b/debian/patches/series
index ebc27c9..41109a5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 makefile.patch
-ocaml-3-12.patch
+ocamldoc-4.patch

-- 
mikmatch packaging