[Pkg-ocaml-maint-commits] [SCM] extlib packaging branch, master, updated. debian/1.5.1-3-7-gb79a7d8

[Stephane Glondu]

The following commit has been merged in the master branch:
commit bab00b110290d782d424c770295ee89485f244e4
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Aug 31 14:58:14 2009 +0200

    Build native plugin, add libextlib-ocaml binary package

diff --git a/debian/control b/debian/control
index 4b80791..72d8e3c 100644
--- a/debian/control
+++ b/debian/control
@@ -20,8 +20,10 @@ Homepage: http://code.google.com/p/ocaml-extlib/
 Package: libextlib-ocaml-dev
 Architecture: any
 Depends:
+ libextlib-ocaml (= ${binary:Version}),
  ocaml-nox-${F:OCamlABI},
  ocaml-findlib,
+ ${shlibs:Depends},
  ${misc:Depends}
 Description: extended standard library for OCaml
  ExtLib is a project aiming at providing a complete - yet small -
@@ -38,3 +40,17 @@ Description: extended standard library for OCaml
  references on lists, Unicode characters and UTF-8 encoded
  strings, additional and improved functions for hashtables,
  strings, lists and option types.
+
+Package: libextlib-ocaml
+Architecture: any
+Depends:
+ ocaml-base-nox-${F:OCamlABI},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Replaces: libextlib-ocaml-dev (<< 1.5.1-4)
+Conflicts: libextlib-ocaml-dev (<< 1.5.1-4)
+Description: extended standard library for OCaml (plugins)
+ ExtLib is a project aiming at providing a complete - yet small -
+ standard library for the OCaml programming language.
+ .
+ This package contains plugins needed by plugins using ExtLib.
diff --git a/debian/libextlib-ocaml-dev.install.in b/debian/libextlib-ocaml-dev.install.in
new file mode 100644
index 0000000..edf0579
--- /dev/null
+++ b/debian/libextlib-ocaml-dev.install.in
@@ -0,0 +1,5 @@
+ at OCamlStdlibDir@/extlib/*.cmi
+ at OCamlStdlibDir@/extlib/*.ml*
+OPT: @OCamlStdlibDir@/extlib/*.a
+OPT: @OCamlStdlibDir@/extlib/*.cmx
+OPT: @OCamlStdlibDir@/extlib/*.cmxa
diff --git a/debian/libextlib-ocaml.install.in b/debian/libextlib-ocaml.install.in
new file mode 100644
index 0000000..d3cb5d5
--- /dev/null
+++ b/debian/libextlib-ocaml.install.in
@@ -0,0 +1,3 @@
+ at OCamlStdlibDir@/extlib/META
+ at OCamlStdlibDir@/extlib/*.cma
+OPT: @OCamlStdlibDir@/extlib/*.cmxs
diff --git a/debian/rules b/debian/rules
index acb6d55..e93a1e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,11 @@
 #!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/ocaml.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
 
 PKGNAME = libextlib-ocaml-dev
 OCAML_OCAMLDOC_PACKAGES = $(OCAML_LIBDEV_PACKAGES)
-PKGDIR = $(CURDIR)/debian/$(PKGNAME)
+PKGDIR = $(CURDIR)/debian/tmp
 DESTDIR = $(PKGDIR)$(OCAML_STDLIB_DIR)/extlib
 DOCDIR = $(PKGDIR)/usr/share/doc/$(PKGNAME)/
 
@@ -13,6 +13,7 @@ common-build-arch::
 	mkdir -p $(DESTDIR)/ $(DOCDIR)/
 	if [ -x /usr/bin/ocamlopt ]; then \
 		ocaml install.ml -d $(DESTDIR)/ -b -n -nodoc; \
+		ocamlopt -shared -linkall -o $(DESTDIR)/extLib.cmxs -I $(DESTDIR) $(DESTDIR)/extLib.cmxa; \
 	else \
 		ocaml install.ml -d $(DESTDIR)/ -b -nodoc; \
 	fi

-- 
extlib packaging