[Pkg-ocaml-maint-commits] [SCM] cryptokit packaging branch, master, updated. debian/1.3-10-8-gbe4f040

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 9785258e92834eaae5f0acb75026a60311aa24ad
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Apr 12 00:38:57 2009 +0200

    Move .cma and META to libcryptokit-ocaml, build .cmxs

diff --git a/debian/control b/debian/control
index a5074e2..184cb4e 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Package: libcryptokit-ocaml
 Section: libs
 Architecture: any
 Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
+Replaces: libcryptokit-ocaml-dev (<< 1.3-11)
 Description: cryptographic algorithm library for OCaml - runtime
  The Cryptokit library for Objective Caml provides a variety of
  cryptographic primitives that can be used to implement cryptographic
diff --git a/debian/libcryptokit-ocaml-dev.install.in b/debian/libcryptokit-ocaml-dev.install.in
index 5fca2e9..cdd1a63 100644
--- a/debian/libcryptokit-ocaml-dev.install.in
+++ b/debian/libcryptokit-ocaml-dev.install.in
@@ -1 +1,5 @@
-debian/META.cryptokit @OCamlStdlibDir@/METAS
+ at OCamlStdlibDir@/cryptokit/lib*.a
+ at OCamlStdlibDir@/cryptokit/*.cmi
+ at OCamlStdlibDir@/cryptokit/*.mli
+OPT: @OCamlStdlibDir@/cryptokit/*.cmx
+OPT: @OCamlStdlibDir@/cryptokit/*.cmxa
diff --git a/debian/libcryptokit-ocaml.dirs.in b/debian/libcryptokit-ocaml.dirs.in
index f895e2a..6b949b5 100644
--- a/debian/libcryptokit-ocaml.dirs.in
+++ b/debian/libcryptokit-ocaml.dirs.in
@@ -1 +1,3 @@
- at OCamlStdlibDir@/stublibs
+ at OCamlDllDir@
+ at OCamlStdlibDir@/cryptokit
+ at OCamlStdlibDir@/METAS
diff --git a/debian/libcryptokit-ocaml.install.in b/debian/libcryptokit-ocaml.install.in
new file mode 100644
index 0000000..fc1830a
--- /dev/null
+++ b/debian/libcryptokit-ocaml.install.in
@@ -0,0 +1,3 @@
+ at OCamlStdlibDir@/cryptokit/cryptokit.cma
+OPT: cryptokit.cmxs @OCamlStdlibDir@/cryptokit
+debian/META.cryptokit @OCamlStdlibDir@/METAS
diff --git a/debian/rules b/debian/rules
index bb818fc..f186be8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,7 +29,7 @@ PACKAGE := libcryptokit-ocaml
 DESTDIR := $(CURDIR)/debian/$(PACKAGE)
 
 PACKAGE_DEV := libcryptokit-ocaml-dev
-DESTDIR_DEV := $(CURDIR)/debian/$(PACKAGE_DEV)
+DESTDIR_DEV := $(CURDIR)/debian/tmp
 
 DEB_MAKE_CLEAN_TARGET    := clean
 DEB_MAKE_BUILD_TARGET    := all
@@ -46,6 +46,14 @@ OCAML_OCAMLDOC_PACKAGES := libcryptokit-ocaml-dev
 # Enable zlib support
 CFLAGS += -DHAVE_ZLIB
 
+build/libcryptokit-ocaml::
+ifdef OCAML_OPT_ARCH
+	ocamlopt -I . -shared -linkall -o cryptokit.cmxs cryptokit.cmxa
+endif
+
+common-install-prehook-arch::
+	mkdir -p "$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/cryptokit"
+
 clean::
 	-$(RM) debian/META.cryptokit
 	-$(RM) debian/libcryptokit-ocaml-dev.dirs

-- 
cryptokit packaging