[Pkg-ocaml-maint-commits] [SCM] findlib packaging branch, master, updated. debian/1.2.4-2-16-g047b189

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 4022d4ba46c11ebafa2a8d99395d5163160a30b4
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Sep 23 20:36:37 2009 +0200

    Remove install_missing_cmi.dpatch (merged upstream)

diff --git a/debian/patches/00list b/debian/patches/00list
index 1f9c63a..ea44008 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,4 +1,3 @@
 stddirs.dpatch
 include.dpatch
 site_lib_metas.dpatch
-install_missing_cmi.dpatch
diff --git a/debian/patches/install_missing_cmi.dpatch b/debian/patches/install_missing_cmi.dpatch
deleted file mode 100755
index 2c58cd3..0000000
--- a/debian/patches/install_missing_cmi.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## install_missing_cmi.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: install missing .cmi, in particular fl_metatoken.cmi
-
- at DPATCH@
-diff --git a/src/findlib/Makefile b/src/findlib/Makefile
-index 8a16fdb..3526ca7 100644
---- a/src/findlib/Makefile
-+++ b/src/findlib/Makefile
-@@ -81,7 +81,7 @@ install: all
- 	mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)"
- 	mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
- 	test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)"
--	files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi findlib_top.cma findlib.cmxa findlib.a META` && \
-+	files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a META` && \
- 	cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
- 	f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \
- 	cp $$f "$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"

-- 
findlib packaging