The following commit has been merged in the master branch:
commit 54e3f5370dcd85880a16aeefde4af6c73fffebdc
Author: Stefano Zacchiroli <z...@upsilon.cc>
Date: Wed Nov 11 18:41:33 2009 +0100
split 2 new binary packages: libcore-extended-ocaml{,-dev}
those package contain Core_extended
rationale for the split: size occupation on disk, different dependencies
(Core_extended depends also on Pcre)
diff --git a/debian/TODO.Debian b/debian/TODO.Debian
index 400a04f..85b64ea 100644
--- a/debian/TODO.Debian
+++ b/debian/TODO.Debian
@@ -1,5 +1,2 @@
- ship ocamldoc documentation
-- split packages for Core_extended?
- compare dependencies with pre-dh-ocaml packages
-- ship all *.mli in Core
-- ship all *.mli in Core_extended
diff --git a/debian/changelog b/debian/changelog
index 7f74873..ae9c96f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,14 @@
janest-core (0.6.0-1) UNRELEASED; urgency=low
* New upstream release
- * debian/patches/: refresh patches:
+ * refresh patches from debian/patches/:
- 0002-extra-targets-to-enable-compilation-of-byte-code-onl
- - patches/0003-add-missing-META-dep-on-unix
- - patches/0004-Fix-build-on-kfreebsd
+ - 0003-add-missing-META-dep-on-unix
+ - 0004-Fix-build-on-kfreebsd
* debian/control:
- add (new) build-dep on libfields-camlp4-dev
+ - split 2 new binary packages: libcore-extended-ocaml{,-dev} that
+ contain Core_extended (rationale: large, more deps)
- add build-dep on libpcre-ocaml-dev, required to build Core_extended
- revamp Description (mention Core vs Core_extended difference)
* debian/rules: switch {debhelper,ocaml}.mk to avoid *.log leftovers
diff --git a/debian/control b/debian/control
index 303ecad..e9e200c 100644
--- a/debian/control
+++ b/debian/control
@@ -33,8 +33,9 @@ Depends:
${shlibs:Depends},
${misc:Depends}
Provides: ${ocaml:Provides}
-Description: Jane Street Capital's alternative standard library for OCaml
- Core is an alternative to the OCaml standard library.
+Description: Jane Street's standard library for OCaml
+ Core is an alternative to the OCaml standard library developed by
+ Jane Street Capital.
.
Core does a number of things:
.
@@ -66,8 +67,9 @@ Depends:
${shlibs:Depends},
${misc:Depends}
Provides: ${ocaml:Provides}
-Description: Jane Street Capital's core library for OCaml (runtime)
- Core is an alternative to the OCaml standard library.
+Description: Jane Street's standard library for OCaml (runtime)
+ Core is an alternative to the OCaml standard library developed by
+ Jane Street Capital.
.
Core does a number of things:
.
@@ -89,3 +91,70 @@ Description: Jane Street Capital's core library for OCaml
(runtime)
.
This package contains the runtime stuff you need to run programs using
Core (but not Core_extended).
+
+Package: libcore-extended-ocaml-dev
+Architecture: any
+Depends:
+ ocaml-findlib,
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
+Description: Jane Street's standard library for OCaml - extensions
+ Core is an alternative to the OCaml standard library developed by
+ Jane Street Capital.
+ .
+ Core does a number of things:
+ .
+ * provides tail recursive versions of non tail recursive functions in
+ the standard library;
+ * changes the signature of many of the standard modules to enforce
+ consistent naming conventions;
+ * includes generic serialization for most types;
+ * adds some new modules as well as new functionality to existing
+ modules.
+ .
+ Beware that Core extends some functionality of the legacy standard
+ library, and outright changes or replaces other; backward compatibility
+ with the legacy standard library has not to be expected.
+ .
+ The code of Core is routinely reviewed within Jane Street Capital
+ according to their quality assurance requirements. The extra library
+ called Core_extended adds new functionalities on top of Core, but is
+ only reviewed on an ad-hoc basis.
+ .
+ This package contains the development stuff you need to use
+ Core_extended in your programs.
+
+Package: libcore-extended-ocaml
+Architecture: any
+Depends:
+ ocaml-findlib,
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
+Description: Jane Street's standard library for OCaml - extensions (runtime)
+ Core is an alternative to the OCaml standard library developed by
+ Jane Street Capital.
+ .
+ Core does a number of things:
+ .
+ * provides tail recursive versions of non tail recursive functions in
+ the standard library;
+ * changes the signature of many of the standard modules to enforce
+ consistent naming conventions;
+ * includes generic serialization for most types;
+ * adds some new modules as well as new functionality to existing
+ modules.
+ .
+ Beware that Core extends some functionality of the legacy standard
+ library, and outright changes or replaces other; backward compatibility
+ .
+ The code of Core is routinely reviewed within Jane Street Capital
+ according to their quality assurance requirements. The extra library
+ called Core_extended adds new functionalities on top of Core, but is
+ only reviewed on an ad-hoc basis.
+ .
+ This package contains the runtime stuff you need to run programs using
+ Core_extended.
diff --git a/debian/libcore-extended-ocaml-dev.install.in
b/debian/libcore-extended-ocaml-dev.install.in
new file mode 100644
index 0000000..98422ce
--- /dev/null
+++ b/debian/libcore-extended-ocaml-dev.install.in
@@ -0,0 +1,6 @@
+debian/tmp/core_extended/*.a @OCamlStdlibDir@/core_extended/
+debian/tmp/core_extended/*.cma @OCamlStdlibDir@/core_extended/
+debian/tmp/core_extended/*.cmi @OCamlStdlibDir@/core_extended/
+OPT: debian/tmp/core_extended/*.cmxa @OCamlStdlibDir@/core_extended/
+
+extended/*.mli @OCamlStdlibDir@/core_extended/
diff --git a/debian/libcore-extended-ocaml.install.in
b/debian/libcore-extended-ocaml.install.in
new file mode 100644
index 0000000..da2cb13
--- /dev/null
+++ b/debian/libcore-extended-ocaml.install.in
@@ -0,0 +1 @@
+debian/tmp/core_extended/*.so @OCamlDllDir@
diff --git a/debian/libcore-ocaml-dev.install.in
b/debian/libcore-ocaml-dev.install.in
index f0cb709..b61fc83 100644
--- a/debian/libcore-ocaml-dev.install.in
+++ b/debian/libcore-ocaml-dev.install.in
@@ -1,2 +1,7 @@
-lib/*.mli @OCamlStdlibDir@/core/
-lib/*able.ml @OCamlStdlibDir@/core/
+debian/tmp/core/*.a @OCamlStdlibDir@/core/
+debian/tmp/core/*.cma @OCamlStdlibDir@/core/
+debian/tmp/core/*.cmi @OCamlStdlibDir@/core/
+OPT: debian/tmp/core/*.cmxa @OCamlStdlibDir@/core/
+
+lib/*.mli @OCamlStdlibDir@/core/
+lib/*able.ml @OCamlStdlibDir@/core/
diff --git a/debian/libcore-ocaml.install.in b/debian/libcore-ocaml.install.in
new file mode 100644
index 0000000..8fa4daa
--- /dev/null
+++ b/debian/libcore-ocaml.install.in
@@ -0,0 +1 @@
+debian/tmp/core/*.so @OCamlDllDir@
diff --git a/debian/rules b/debian/rules
index 271bdf8..67c261c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,11 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/class/makefile.mk
-LIB_NAME = core
-DLL_PKG_NAME = lib$(LIB_NAME)-ocaml
-DEV_PKG_NAME = lib$(LIB_NAME)-ocaml-dev
-DEST_DIR = $(CURDIR)/debian/$(DEV_PKG_NAME)$(OCAML_STDLIB_DIR)
-DEST_DLL_DIR = $(CURDIR)/debian/$(DLL_PKG_NAME)$(OCAML_DLL_DIR)
+DEST_DIR = $(CURDIR)/debian/tmp
ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
DEB_MAKE_BUILD_TARGET = all
@@ -18,8 +14,6 @@ DEB_MAKE_BUILD_TARGET = byte
DEB_MAKE_INSTALL_TARGET = libinstall-byte-code OCAMLFIND_INSTFLAGS="-destdir
$(DEST_DIR) -ldconf ignore"
endif
-build/$(DEV_PKG_NAME)::
- mkdir -p $(DEST_DIR) $(DEST_DLL_DIR)
-install/$(DEV_PKG_NAME)::
- mv $(DEST_DIR)/core/*.so $(DEST_DLL_DIR)
+build/libcore-ocaml-dev::
+ mkdir -p $(DEST_DIR)
--
janest-core packaging
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
