[Pkg-ocaml-maint-commits] [SCM] camlzip packaging branch, master, updated. debian/1.04-2-8-gebcecb0

[Stephane Glondu]

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

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

diff --git a/debian/control b/debian/control
index 0ccbb00..442152b 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Package: libzip-ocaml
 Architecture: any
 Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
 Conflicts: camlzip (<< 1.01-3)
+Replaces: libzip-ocaml-dev (<< 1.04-3)
 Description: OCaml compression libraries
  This Objective Caml library provides easy access to compressed files in ZIP
  and GZIP format, as well as to Java JAR files.  It provides functions
diff --git a/debian/libzip-ocaml-dev.install.in b/debian/libzip-ocaml-dev.install.in
index ac88841..3d81b25 100644
--- a/debian/libzip-ocaml-dev.install.in
+++ b/debian/libzip-ocaml-dev.install.in
@@ -1,4 +1,5 @@
- at OCamlStdlibDir@/zip/META
- at OCamlStdlibDir@/zip/*.a
- at OCamlStdlibDir@/zip/*.cm*
+ at OCamlStdlibDir@/zip/lib*.a
+ at OCamlStdlibDir@/zip/*.cmi
 @OCamlStdlibDir@/zip/*.ml*
+OPT: @OCamlStdlibDir@/zip/*.cmx
+OPT: @OCamlStdlibDir@/zip/*.cmxa
diff --git a/debian/libzip-ocaml.install.in b/debian/libzip-ocaml.install.in
index 7d0dce8..48464aa 100644
--- a/debian/libzip-ocaml.install.in
+++ b/debian/libzip-ocaml.install.in
@@ -1 +1,4 @@
+ at OCamlStdlibDir@/zip/META
+ at OCamlStdlibDir@/zip/zip.cma
 @OCamlDllDir@/dllcamlzip.so
+OPT: zip.cmxs @OCamlStdlibDir@/zip
diff --git a/debian/rules b/debian/rules
index 42f2358..7fedae2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,7 @@ build-stamp: patch-stamp
 	$(MAKE)
 ifneq ($(OCAML_OPT_ARCH),)
 	$(MAKE) allopt
+	ocamlopt -I . -shared -linkall -o zip.cmxs zip.cmxa
 endif
 
 	touch build-stamp

-- 
camlzip packaging