[Pkg-ocaml-maint-commits] [SCM] cmigrep packaging branch, master, updated. debian/1.5-4-5-g0503cca

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 052b3885d4c841f06c0cd0970d9464b0073398f1
Author: Ralf Treinen <treinen at free.fr>
Date:   Fri Nov 13 20:11:48 2009 +0100

    convert from dpatch to quilt

diff --git a/debian/patches/make-without-godi b/debian/patches/make-without-godi
new file mode 100755
index 0000000..3c456e7
--- /dev/null
+++ b/debian/patches/make-without-godi
@@ -0,0 +1,28 @@
+Author: Ralf Treinen <treinen at debian.org>
+Description: Compile without godi. Provide directly the include directories for
+  the compiler-libs.
+
+--- trunk~/Makefile	2007-04-01 16:43:39.000000000 +0200
++++ trunk/Makefile	2007-07-07 10:18:23.000000000 +0200
+@@ -16,17 +16,15 @@
+ includecore.cmo includemod.cmo parmatch.cmo typetexp.cmo stypes.cmo	\
+ typecore.cmo typedecl.cmo typeclass.cmo typemod.cmo cmigrep.ml
+ 
+-
+-GODI_CONF=$(shell godi_confdir)
+-GODI_BASE=$(shell cat $(GODI_CONF)/godi.conf | grep ^LOCALBASE | sed -e 's/LOCALBASE *= *//')
+-GODI_LIB=$(GODI_BASE)/lib/ocaml/compiler-lib
++COMPILERLIBFLAGS=-I +compiler-libs/parsing -I +compiler-libs/typing     \
++-I +compiler-libs/utils
+ 
+ all:
+-	ocamlfind ocamlopt -o cmigrep -I $(GODI_LIB) \
++	ocamlfind ocamlopt -o cmigrep $(COMPILERLIBFLAGS) \
+ 	-package pcre,findlib,unix -linkpkg $(SOURCES)
+ 
+ byte:
+-	ocamlfind ocamlc -o cmigrep -I $(GODI_LIB) \
++	ocamlfind ocamlc -o cmigrep $(COMPILERLIBFLAGS) \
+ 	-package pcre,findlib,unix -linkpkg $(BYTESOURCES)
+ 
+ install:
diff --git a/debian/patches/no-private-flag b/debian/patches/no-private-flag
new file mode 100755
index 0000000..b112fba
--- /dev/null
+++ b/debian/patches/no-private-flag
@@ -0,0 +1,24 @@
+Author: Ralf Treinen <treinen at debian.org>
+Description: The fields Type_variant and Type_record have lost the "private"
+  field in the passage from ocaml 3.10 to 3.11.
+
+--- trunk~/cmigrep.ml	2008-04-02 02:37:07.000000000 +0200
++++ trunk/cmigrep.ml	2009-03-02 21:01:16.000000000 +0100
+@@ -304,7 +304,7 @@
+     (function
+        | Tsig_type (id, type_decl, _rec_status) ->
+            begin match type_decl.type_kind with
+-           | Type_variant (constructors, _private) ->
++           | Type_variant (constructors) ->
+                List.iter
+                  (fun (name, type_exprs) ->
+                     if Pcre.pmatch ~rex:exp name then begin
+@@ -382,7 +382,7 @@
+     (function
+        | Tsig_type (id, type_decl, _rec_status) ->
+            begin match type_decl.type_kind with
+-           | Type_record (labels, _, _) ->
++           | Type_record (labels, _) ->
+                List.iter
+                  (fun (name, mutable_flag, type_expr) ->
+                     if Pcre.pmatch ~rex:exp name then begin
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ccc6908
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+make-without-godi
+no-private-flag

-- 
cmigrep packaging