[Pkg-ocaml-maint-commits] [SCM] Cooperative light-weight thread library for OCaml branch, experimental/master, updated. debian/1.1.0+darcs20090806-1-1-g994955e
Stephane Glondu
steph at glondu.net
Tue Aug 25 00:07:29 UTC 2009
The following commit has been merged in the experimental/master branch:
commit 994955e34a56931dfacc43e1ef680f2d29c66808
Author: Stephane Glondu <steph at glondu.net>
Date: Tue Aug 25 01:55:12 2009 +0200
Split binary packages
diff --git a/debian/changelog b/debian/changelog
index 5534273..b29dc97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+lwt (1.1.0+darcs20090806-2) experimental; urgency=low
+
+ * Create a runtime package for liblwt-ocaml-dev
+ * Put documentation in its own architecture-independent package
+ * Split out liblwt-ocaml-dev into several binary packages to reflect
+ optional dependencies: liblwt-ssl-*, liblwt-glib-*
+
+ -- Stephane Glondu <steph at glondu.net> Tue, 25 Aug 2009 01:51:47 +0200
+
lwt (1.1.0+darcs20090806-1) experimental; urgency=low
* New upstream snapshot
diff --git a/debian/control b/debian/control
index 66d7858..cb392d7 100644
--- a/debian/control
+++ b/debian/control
@@ -25,20 +25,132 @@ Package: liblwt-ocaml-dev
Architecture: any
Depends:
ocaml-nox-${F:OCamlABI},
+ liblwt-ocaml (= ${binary:Version}),
camlp4,
- libssl-ocaml-dev (>= 0.4.3),
- liblablgtk2-ocaml-dev,
libreact-ocaml-dev,
libtext-ocaml-dev,
${shlibs:Depends},
${misc:Depends}
-Recommends: ocaml-findlib
+Recommends:
+ liblwt-ocaml-doc,
+ ocaml-findlib
+Suggests:
+ liblwt-ssl-ocaml-dev,
+ liblwt-glib-ocaml-dev
Breaks: ocsigen (<= 1.2.0-2)
-Description: Cooperative light-weight thread library for OCaml
+Description: cooperative light-weight thread library for OCaml
+ Lwt is a library of cooperative threads implemented in monadic style.
+ With respect to preemptive threads, cooperative threads are not using
+ a scheduler to distribute processor time between threads. Instead of
+ this, each thread must tell the others that he wants to let them
+ work.
+ .
+ This package contains all the development stuff you need to use the
+ core Lwt OCaml library in your programs.
+
+Package: liblwt-ocaml
+Architecture: any
+Depends:
+ ocaml-nox-${F:OCamlABI},
+ libreact-ocaml,
+ libtext-ocaml,
+ ${shlibs:Depends},
+ ${misc:Depends}
+Replaces: liblwt-ocaml-dev (<< 1.1.0+darcs20090806-2)
+Conflicts: liblwt-ocaml-dev (<< 1.1.0+darcs20090806-2)
+Description: cooperative light-weight thread library for OCaml (runtime)
+ Lwt is a library of cooperative threads implemented in monadic style.
+ With respect to preemptive threads, cooperative threads are not using
+ a scheduler to distribute processor time between threads. Instead of
+ this, each thread must tell the others that he wants to let them
+ work.
+ .
+ This package contains runtime libraries for programs using core Lwt.
+
+Package: liblwt-ssl-ocaml-dev
+Architecture: any
+Depends:
+ ocaml-nox-${F:OCamlABI},
+ liblwt-ocaml-dev (= ${binary:Version}),
+ libssl-ocaml-dev,
+ ${shlibs:Depends},
+ ${misc:Depends}
+Replaces: liblwt-ocaml-dev (<= 1.1.0+darcs20090806-1)
+Conflicts: liblwt-ocaml-dev (<= 1.1.0+darcs20090806-1)
+Recommends:
+ liblwt-ocaml-doc,
+ ocaml-findlib
+Description: cooperative OpenSSL bindings for OCaml
+ Lwt is a library of cooperative threads implemented in monadic style.
+ With respect to preemptive threads, cooperative threads are not using
+ a scheduler to distribute processor time between threads. Instead of
+ this, each thread must tell the others that he wants to let them
+ work.
+ .
+ This package contains all the development stuff you need to use Lwt
+ with cooperative OpenSSL in your programs.
+
+Package: liblwt-glib-ocaml-dev
+Architecture: any
+Depends:
+ ocaml-nox-${F:OCamlABI},
+ liblwt-ocaml-dev (= ${binary:Version}),
+ liblwt-glib-ocaml (= ${binary:Version}),
+ liblablgtk2-ocaml-dev,
+ ${shlibs:Depends},
+ ${misc:Depends}
+Replaces: liblwt-ocaml-dev (<= 1.1.0+darcs20090806-1)
+Conflicts: liblwt-ocaml-dev (<= 1.1.0+darcs20090806-1)
+Recommends:
+ liblwt-ocaml-doc,
+ ocaml-findlib
+Description: cooperative GLib bindings for OCaml
+ Lwt is a library of cooperative threads implemented in monadic style.
+ With respect to preemptive threads, cooperative threads are not using
+ a scheduler to distribute processor time between threads. Instead of
+ this, each thread must tell the others that he wants to let them
+ work.
+ .
+ This package contains all the development stuff you need to use Lwt
+ with cooperative GLib in your programs.
+
+Package: liblwt-glib-ocaml
+Architecture: any
+Depends:
+ ocaml-nox-${F:OCamlABI},
+ liblwt-ocaml (= ${binary:Version}),
+ liblablgtk2-ocaml,
+ ${shlibs:Depends},
+ ${misc:Depends}
+Replaces: liblwt-ocaml-dev (<= 1.1.0+darcs20090806-1)
+Conflicts: liblwt-ocaml-dev (<= 1.1.0+darcs20090806-1)
+Description: cooperative GLib bindings for OCaml (runtime)
+ Lwt is a library of cooperative threads implemented in monadic style.
+ With respect to preemptive threads, cooperative threads are not using
+ a scheduler to distribute processor time between threads. Instead of
+ this, each thread must tell the others that he wants to let them
+ work.
+ .
+ This package contains runtime libraries for programs using Lwt with
+ cooperative GLib in your programs.
+
+Package: liblwt-ocaml-doc
+Section: doc
+Architecture: all
+Enhances:
+ liblwt-ocaml-dev,
+ liblwt-ssl-ocaml-dev,
+ liblwt-glib-ocaml-dev
+Depends:
+ ${misc:Depends}
+Replaces: liblwt-ocaml-dev (<= 1.1.0+darcs20090806-1)
+Conflicts: liblwt-ocaml-dev (<= 1.1.0+darcs20090806-1)
+Description: cooperative light-weight thread library (documentation)
Lwt is a library of cooperative threads implemented in monadic style.
- With respect to preemptive threads, cooperative threads are not using a
- scheduler to distribute processor time between threads. Instead of this,
- each thread must tell the others that he wants to let them work.
+ With respect to preemptive threads, cooperative threads are not using
+ a scheduler to distribute processor time between threads. Instead of
+ this, each thread must tell the others that he wants to let them
+ work.
.
- This package contains all the development stuff you need to use the lwt
- OCaml library in your programs.
+ This package contains the complete API reference for Lwt, including
+ OpenSSL, GLib bindings and examples.
diff --git a/debian/liblwt-glib-ocaml-dev.install.in b/debian/liblwt-glib-ocaml-dev.install.in
new file mode 100644
index 0000000..5cccece
--- /dev/null
+++ b/debian/liblwt-glib-ocaml-dev.install.in
@@ -0,0 +1,2 @@
+ at OCamlStdlibDir@/lwt/liblwt_glib_stubs.*
+ at OCamlStdlibDir@/lwt/lwt_glib.*
diff --git a/debian/liblwt-glib-ocaml.install.in b/debian/liblwt-glib-ocaml.install.in
new file mode 100644
index 0000000..22ebdbf
--- /dev/null
+++ b/debian/liblwt-glib-ocaml.install.in
@@ -0,0 +1 @@
+ at OCamlDllDir@/dlllwt_glib_stubs.so
diff --git a/debian/liblwt-ocaml-dev.doc-base b/debian/liblwt-ocaml-dev.doc-base
deleted file mode 100644
index 2439cf6..0000000
--- a/debian/liblwt-ocaml-dev.doc-base
+++ /dev/null
@@ -1,8 +0,0 @@
-Document: liblwt-ocaml-dev-ocamldoc-api-reference
-Title: liblwt-ocaml-dev OCamldoc API Reference
-Abstract: API reference manual for liblwt-ocaml-dev (generated via OCamldoc)
-Section: Programming/OCaml
-
-Format: HTML
-Index: /usr/share/doc/liblwt-ocaml-dev/html/api/index.html
-Files: /usr/share/doc/liblwt-ocaml-dev/html/api/*
diff --git a/debian/liblwt-ocaml-dev.install.in b/debian/liblwt-ocaml-dev.install.in
index cf8dffb..f2d05a9 100644
--- a/debian/liblwt-ocaml-dev.install.in
+++ b/debian/liblwt-ocaml-dev.install.in
@@ -1,4 +1,30 @@
- at OCamlStdlibDir@/lwt
- at OCamlDllDir@/*.so
-_build/lwt.docdir/*.html usr/share/doc/liblwt-ocaml-dev/html/api
-_build/lwt.docdir/*.css usr/share/doc/liblwt-ocaml-dev/html/api
+ at OCamlStdlibDir@/lwt/liblwt_unix_stubs.*
+ at OCamlStdlibDir@/lwt/lwt.*
+ at OCamlStdlibDir@/lwt/lwt_chan.*
+ at OCamlStdlibDir@/lwt/lwt_extra.*
+ at OCamlStdlibDir@/lwt/lwt_gc.*
+ at OCamlStdlibDir@/lwt/lwt_io.*
+ at OCamlStdlibDir@/lwt/lwt_lib.*
+ at OCamlStdlibDir@/lwt/lwt_main.*
+ at OCamlStdlibDir@/lwt/lwt_monitor.*
+ at OCamlStdlibDir@/lwt/lwt_mutex.*
+ at OCamlStdlibDir@/lwt/lwt_mvar.*
+ at OCamlStdlibDir@/lwt/lwt_ocaml_completion.*
+ at OCamlStdlibDir@/lwt/lwt_pool.*
+ at OCamlStdlibDir@/lwt/lwt_preemptive.*
+ at OCamlStdlibDir@/lwt/lwt_process.*
+ at OCamlStdlibDir@/lwt/lwt_read_line.*
+ at OCamlStdlibDir@/lwt/lwt_sequence.*
+ at OCamlStdlibDir@/lwt/lwt_stream.*
+ at OCamlStdlibDir@/lwt/lwt_term.*
+ at OCamlStdlibDir@/lwt/lwt_text.*
+ at OCamlStdlibDir@/lwt/lwt_throttle.*
+ at OCamlStdlibDir@/lwt/lwt_timeout.*
+ at OCamlStdlibDir@/lwt/lwt_top.*
+ at OCamlStdlibDir@/lwt/lwt_unix.*
+ at OCamlStdlibDir@/lwt/lwt_util.*
+ at OCamlStdlibDir@/lwt/lwt_withoutunix.*
+ at OCamlStdlibDir@/lwt/pa_lwt.*
+ at OCamlStdlibDir@/lwt/simple_top.*
+ at OCamlStdlibDir@/lwt/toplevel.*
+ at OCamlStdlibDir@/lwt/META
diff --git a/debian/liblwt-ocaml-doc.doc-base b/debian/liblwt-ocaml-doc.doc-base
new file mode 100644
index 0000000..84a6991
--- /dev/null
+++ b/debian/liblwt-ocaml-doc.doc-base
@@ -0,0 +1,8 @@
+Document: liblwt-ocaml-doc-ocamldoc-api-reference
+Title: Lwt OCamldoc API Reference
+Abstract: API reference manual for liblwt-*-dev (generated via OCamldoc)
+Section: Programming/OCaml
+
+Format: HTML
+Index: /usr/share/doc/liblwt-ocaml-doc/html/api/index.html
+Files: /usr/share/doc/liblwt-ocaml-doc/html/api/*
diff --git a/debian/liblwt-ocaml-doc.install b/debian/liblwt-ocaml-doc.install
new file mode 100644
index 0000000..625df1c
--- /dev/null
+++ b/debian/liblwt-ocaml-doc.install
@@ -0,0 +1,2 @@
+_build/lwt.docdir/*.html usr/share/doc/liblwt-ocaml-doc/html/api
+_build/lwt.docdir/*.css usr/share/doc/liblwt-ocaml-doc/html/api
diff --git a/debian/liblwt-ocaml-dev.dirs.in b/debian/liblwt-ocaml.dirs.in
similarity index 100%
rename from debian/liblwt-ocaml-dev.dirs.in
rename to debian/liblwt-ocaml.dirs.in
diff --git a/debian/liblwt-ocaml.install.in b/debian/liblwt-ocaml.install.in
new file mode 100644
index 0000000..8fd118b
--- /dev/null
+++ b/debian/liblwt-ocaml.install.in
@@ -0,0 +1 @@
+ at OCamlDllDir@/dlllwt_unix_stubs.so
diff --git a/debian/liblwt-ssl-ocaml-dev.install.in b/debian/liblwt-ssl-ocaml-dev.install.in
new file mode 100644
index 0000000..093c77c
--- /dev/null
+++ b/debian/liblwt-ssl-ocaml-dev.install.in
@@ -0,0 +1 @@
+ at OCamlStdlibDir@/lwt/lwt_ssl.*
diff --git a/debian/rules b/debian/rules
index a24995f..33c8f44 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,11 +10,10 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/makefile.mk
include /usr/share/cdbs/1/rules/ocaml.mk
-PKGNAME := liblwt-ocaml-dev
DESTDIR := $(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)
-DEB_INSTALL_DIRS_ALL = -Pdebian/tmp
+DEB_INSTALL_DIRS_ALL = -pliblwt-ocaml -Pdebian/tmp
DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(DESTDIR)
-build/$(PKGNAME)::
+build/liblwt-ocaml-doc::
$(MAKE) doc
--
Cooperative light-weight thread library for OCaml
More information about the Pkg-ocaml-maint-commits
mailing list