[Pkg-ocaml-maint-commits] [SCM] ocamlduce packaging branch, master, updated. debian/3.11.1.0-1-10-ga7d28e8

[Stephane Glondu]

The following commit has been merged in the master branch:
commit c436aa6358dc580f07d2dc8190f2de76cded3b3d
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Oct 14 17:16:39 2009 +0200

    Add patches-ocaml/objinfo.patch

diff --git a/debian/patches-ocaml/objinfo.patch b/debian/patches-ocaml/objinfo.patch
new file mode 100644
index 0000000..e9a0a35
--- /dev/null
+++ b/debian/patches-ocaml/objinfo.patch
@@ -0,0 +1,15 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Wed, 14 Oct 2009 20:12:49 +0200
+Subject: [PATCH] Accept also ocaml_cmi_magic_number in objinfo
+
+--- ocaml-3.11.1.orig/tools/objinfo.ml	2006-07-05 14:09:18.000000000 +0200
++++ ocaml-3.11.1/tools/objinfo.ml	2009-10-14 17:12:07.000000000 +0200
+@@ -81,7 +81,7 @@
+     close_in ic;
+     print_library_info toc
+   end else
+-  if buffer = cmi_magic_number then begin
++  if buffer = cmi_magic_number || buffer = ocaml_cmi_magic_number then begin
+     let (name, sign, comps) = input_value ic in
+     let crcs = input_value ic in
+     close_in ic;
diff --git a/debian/rules b/debian/rules
index a61d733..9be5d52 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,10 @@ DH := dh --with quilt
 config-stamp: ocamlinit-stamp
 	$(DH) build --before auto_configure
 	$(MAKE) prepare
+	cd $(OCAML_SRCDIR) && \
+	for u in $(wildcard debian/patches-ocaml/*); do \
+	  patch -p1 < ../$$u; \
+	done
 	for ext in sub guess; do \
 	  if [ -f /usr/share/misc/config.$$ext ]; then \
 	    cp -f /usr/share/misc/config.$$ext $(OCAML_SRCDIR)/config/gnu/config.$$ext; \

-- 
ocamlduce packaging