[Pkg-ocaml-maint-commits] [SCM] ocaml-gettext packaging branch, master, updated. debian/0.3.2-2-1-gd6cdd12

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit d6cdd122fa7d3a8e69574546c32610ec582e080c
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Tue Jul 14 17:38:28 2009 +0000

    Patch TopMakefile to avoid generating gettextConfig.mli when installing (Closes: #537011)

diff --git a/debian/changelog b/debian/changelog
index 276c78c..5787151 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocaml-gettext (0.3.2-3) UNRELEASED; urgency=low
+
+  * Patch TopMakefile to avoid generating gettextConfig.mli when
+    installing (Closes: #537011)
+
+ -- Sylvain Le Gall <gildor at debian.org>  Tue, 14 Jul 2009 17:37:31 +0000
+
 ocaml-gettext (0.3.2-2) unstable; urgency=low
 
   * Switch packaging to git
diff --git a/debian/patches/00list b/debian/patches/00list
index 5552eaa..f6fdd64 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1 +1,2 @@
 camlp4_311
+dont-generate-mli-file
diff --git a/debian/patches/dont-generate-mli-file.dpatch b/debian/patches/dont-generate-mli-file.dpatch
new file mode 100755
index 0000000..0820c21
--- /dev/null
+++ b/debian/patches/dont-generate-mli-file.dpatch
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## dont-generate-mli-file.dpatch by Sylvain Le Gall <gildor at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: avoid generating additional file at build time.
+
+ at DPATCH@
+diff -urNad ocaml-gettext~/TopMakefile ocaml-gettext/TopMakefile
+--- ocaml-gettext~/TopMakefile	2009-07-14 17:34:14.000000000 +0000
++++ ocaml-gettext/TopMakefile	2009-07-14 17:36:01.000000000 +0000
+@@ -96,7 +96,8 @@
+ 
+ # Build the lib
+ ONLY_BYTE=$(filter-out %.o,$(filter-out %.a,$(filter-out %.cmx, $(filter-out %.cmxa,$(1))))) $(filter lib%.a,$(1))
+-GET_MLI=$(filter %.mli,$(patsubst %.cmi,%.mli,$(1)))
++ML_OR_MLI=$(if $(wildcard $(1).mli),$(1).mli,$(1).ml)
++GET_MLI=$(foreach interf,$(patsubst %.mli,%,$(filter %.mli,$(patsubst %.cmi,%.mli,$(1)))),$(call ML_OR_MLI,$(interf)))
+ 
+ %.cmxa %.a %.so:
+ 	$(if $(STUBSOBJS),                            \

-- 
ocaml-gettext packaging