[Pkg-ocaml-maint-commits] [SCM] ocaml-text packaging branch, master, updated. debian/0.2-3-8-g555409f

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 016518c17e7b329b549e60c64dd5237f746240d2
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Feb 24 21:44:23 2010 +0100

    Simplify debian/rules

diff --git a/debian/libtext-ocaml-dev.install.in b/debian/libtext-ocaml-dev.install.in
index eb2c463..ee6e899 100644
--- a/debian/libtext-ocaml-dev.install.in
+++ b/debian/libtext-ocaml-dev.install.in
@@ -1,3 +1,4 @@
+ at OCamlStdlibDir@/text/pa_*.cma
 @OCamlStdlibDir@/text/*.mli
 @OCamlStdlibDir@/text/*.cmi
 @OCamlStdlibDir@/text/*.a
diff --git a/debian/libtext-ocaml.install.in b/debian/libtext-ocaml.install.in
index 519d09e..a21c631 100644
--- a/debian/libtext-ocaml.install.in
+++ b/debian/libtext-ocaml.install.in
@@ -1,4 +1,6 @@
- at OCamlDllDir@
+ at OCamlDllDir@/*.so
 @OCamlStdlibDir@/text/META
- at OCamlStdlibDir@/text/*.cma
-OPT: _build/*.cmxs @OCamlStdlibDir@/text
+ at OCamlStdlibDir@/text/text.cma
+ at OCamlStdlibDir@/text/text_pcre.cma
+OPT: @OCamlStdlibDir@/text/text.cmxs
+OPT: @OCamlStdlibDir@/text/text_pcre.cmxs
diff --git a/debian/rules b/debian/rules
index 56b3f77..5f72314 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,14 +15,4 @@ override_dh_installchangelogs:
 override_dh_auto_install:
 	install -d $(OCAMLFIND_DESTDIR)
 	install -d $(CURDIR)/debian/tmp/$(OCAML_DLL_DIR)
-	make install
-
-.PHONY: override_dh_auto_build
-override_dh_auto_build:
-	make \
-	  OC="ocamlbuild -classic-display -byte-plugin" \
-	  $(if $(OCAML_OPT_ARCH),all,byte)
-	make doc
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-	cd _build && ocamlopt -shared -I src -o text.cmxs text.cmxa
-endif
+	$(MAKE) install

-- 
ocaml-text packaging