[Pkg-ocaml-maint-commits] r4576 - in /trunk/packages/cothreads: ./ tarballs/ trunk/ trunk/debian/ trunk/debian/patches/

gildor at users.alioth.debian.org gildor at users.alioth.debian.org
Wed Sep 26 00:05:41 UTC 2007 

Author: gildor
Date: Wed Sep 26 00:05:41 2007
New Revision: 4576

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4576
Log:
* First import of cothreads

Added:
    trunk/packages/cothreads/
    trunk/packages/cothreads/tarballs/
    trunk/packages/cothreads/tarballs/cothreads_0.10.orig.tar.bz2   (with props)
    trunk/packages/cothreads/trunk/
    trunk/packages/cothreads/trunk/debian/
    trunk/packages/cothreads/trunk/debian/META.cothreads.in
    trunk/packages/cothreads/trunk/debian/changelog
    trunk/packages/cothreads/trunk/debian/compat
    trunk/packages/cothreads/trunk/debian/control.in
    trunk/packages/cothreads/trunk/debian/copyright
    trunk/packages/cothreads/trunk/debian/libcothreads-ocaml-dev.dirs.in
    trunk/packages/cothreads/trunk/debian/libcothreads-ocaml-dev.docs
    trunk/packages/cothreads/trunk/debian/libcothreads-ocaml-dev.examples
    trunk/packages/cothreads/trunk/debian/libcothreads-ocaml-dev.install.in
    trunk/packages/cothreads/trunk/debian/libcothreads-ocaml.dirs.in
    trunk/packages/cothreads/trunk/debian/patches/
    trunk/packages/cothreads/trunk/debian/patches/00list
    trunk/packages/cothreads/trunk/debian/patches/10_patch_from_svn.dpatch   (with props)
    trunk/packages/cothreads/trunk/debian/patches/20_makefile_destdir.dpatch   (with props)
    trunk/packages/cothreads/trunk/debian/rules   (with props)
    trunk/packages/cothreads/trunk/debian/svn-deblayout
    trunk/packages/cothreads/trunk/debian/watch

Added: trunk/packages/cothreads/tarballs/cothreads_0.10.orig.tar.bz2
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cothreads/tarballs/cothreads_0.10.orig.tar.bz2?rev=4576&op=file
==============================================================================
Binary file - no diff available.

Propchange: trunk/packages/cothreads/tarballs/cothreads_0.10.orig.tar.bz2
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/packages/cothreads/trunk/debian/META.cothreads.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cothreads/trunk/debian/META.cothreads.in?rev=4576&op=file
==============================================================================
--- trunk/packages/cothreads/trunk/debian/META.cothreads.in (added)
+++ trunk/packages/cothreads/trunk/debian/META.cothreads.in Wed Sep 26 00:05:41 2007
@@ -1,0 +1,7 @@
+name="cothreads"
+version="@VERSION@"
+description="A concurrent programming library for OCaml"
+requires="unix"
+archive(byte)="cothreads.cma"
+archive(native)="cothreads.cmxa"
+directory="+process"

Added: trunk/packages/cothreads/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cothreads/trunk/debian/changelog?rev=4576&op=file
==============================================================================
--- trunk/packages/cothreads/trunk/debian/changelog (added)
+++ trunk/packages/cothreads/trunk/debian/changelog Wed Sep 26 00:05:41 2007
@@ -1,0 +1,6 @@
+cothreads (0.10-1) UNRELEASED; urgency=low
+
+  * Initial upload (Closes: #444082)
+
+ -- Erik de Castro Lopo <erikd at mega-nerd.com>  Tue, 21 Sep 2007 19:01:25 +1000
+

Added: trunk/packages/cothreads/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cothreads/trunk/debian/compat?rev=4576&op=file
==============================================================================
--- trunk/packages/cothreads/trunk/debian/compat (added)
+++ trunk/packages/cothreads/trunk/debian/compat Wed Sep 26 00:05:41 2007
@@ -1,0 +1,1 @@
+5

Added: trunk/packages/cothreads/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cothreads/trunk/debian/control.in?rev=4576&op=file
==============================================================================
--- trunk/packages/cothreads/trunk/debian/control.in (added)
+++ trunk/packages/cothreads/trunk/debian/control.in Wed Sep 26 00:05:41 2007
@@ -1,0 +1,47 @@
+Source: cothreads
+Section: libdevel
+Priority: optional
+Maintainer: Erik de Castro Lopo <erikd at mega-nerd.com>
+Uploaders: Sylvain Le Gall <gildor at debian.org>
+Build-Depends: @cdbs@, dpkg-dev (>= 1.13.19)
+Standards-Version: 3.7.2
+Homepage: http://cothreads.sourceforge.net/
+XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/cothreads
+XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cothreads/trunk/
+
+Package: libcothreads-ocaml
+Section: libs
+Architecture: any
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
+Description: concurrent programming library for OCaml 
+ This library enhances the Threads library of the standard OCaml distribution
+ in two dimensions:
+ .
+   - It implements the same API of the standard Threads library on different
+     execution engines (process, networker), so that a single copy of
+     source code can be compiled and deployed to different environments
+     without modification.
+   - It is also a super set of the standard Threads library, with extra
+     components (STM etc.), functions (spawn etc.) and features (object-level
+     compatibility etc.).
+ .
+ This package provides just the shared library for coThreads.
+
+Package: libcothreads-ocaml-dev
+Section: libdevel
+Architecture: any
+Depends: ocaml-nox-${F:OCamlABI}, libcothreads-ocaml (= ${binary:Version})
+Description: concurrent programming library for OCaml 
+ This library enhances the Threads library of the standard OCaml distribution
+ in two dimensions:
+ .
+   - It implements the same API of the standard Threads library on different
+     execution engines (process, networker), so that a single copy of
+     source code can be compiled and deployed to different environments
+     without modification.
+   - It is also a super set of the standard Threads library, with extra
+     components (STM etc.), functions (spawn etc.) and features (object-level
+     compatibility etc.).
+ .
+ This package provides static libraries, interfaces, and documentation
+ for coThreads.

Added: trunk/packages/cothreads/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cothreads/trunk/debian/copyright?rev=4576&op=file
==============================================================================
--- trunk/packages/cothreads/trunk/debian/copyright (added)
+++ trunk/packages/cothreads/trunk/debian/copyright Wed Sep 26 00:05:41 2007
@@ -1,0 +1,20 @@
+This package was debianized by Erik de Castro Lopo <erikd at mega-nerd.com> on
+Wed, Sep 19 2007 12:24 +1000.
+
+It was downloaded from:
+  http://prdownloads.sourceforge.net/cothreads/
+
+The author's homepage is at http://cothreads.sourceforge.net/
+
+Upstream Author: Zheng Li <li at pps.jussieu.fr>
+
+Copyright: 2007 by Zheng Li <li at pps.jussieu.fr>
+
+GNU GENERAL PUBLIC LICENSE Version 2
+
+On Debian systems the complete text of Version 2 of the Library General
+Public License can be found in /usr/share/common-licenses/LGPL-2, and
+its successor, Version 2.1 of the Lesser General Public License, can
+be found in /usr/share/common-licenses/LGPL-2.1.  The General Public
+License mentioned in connection with Numerix can also be found in
+/usr/share/common-licenses/GPL-2.

Added: trunk/packages/cothreads/trunk/debian/libcothreads-ocaml-dev.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cothreads/trunk/debian/libcothreads-ocaml-dev.dirs.in?rev=4576&op=file
==============================================================================
--- trunk/packages/cothreads/trunk/debian/libcothreads-ocaml-dev.dirs.in (added)
+++ trunk/packages/cothreads/trunk/debian/libcothreads-ocaml-dev.dirs.in Wed Sep 26 00:05:41 2007
@@ -1,0 +1,4 @@
+ at OCamlStdlibDir@/cothreads
+ at OCamlStdlibDir@/process
+ at OCamlStdlibDir@/threads
+ at OCamlStdlibDir@/vmthreads

Added: trunk/packages/cothreads/trunk/debian/libcothreads-ocaml-dev.docs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cothreads/trunk/debian/libcothreads-ocaml-dev.docs?rev=4576&op=file
==============================================================================
--- trunk/packages/cothreads/trunk/debian/libcothreads-ocaml-dev.docs (added)
+++ trunk/packages/cothreads/trunk/debian/libcothreads-ocaml-dev.docs Wed Sep 26 00:05:41 2007
@@ -1,0 +1,1 @@
+README

Added: trunk/packages/cothreads/trunk/debian/libcothreads-ocaml-dev.examples
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cothreads/trunk/debian/libcothreads-ocaml-dev.examples?rev=4576&op=file
==============================================================================
--- trunk/packages/cothreads/trunk/debian/libcothreads-ocaml-dev.examples (added)
+++ trunk/packages/cothreads/trunk/debian/libcothreads-ocaml-dev.examples Wed Sep 26 00:05:41 2007
@@ -1,0 +1,15 @@
+example/Makefile
+example/coth.ml
+example/evt.ml
+example/lock.ml
+example/mcast.ml
+example/merge.ml
+example/mvar.ml
+example/phil.ml
+example/prod_consum.ml
+example/ray.ml
+example/ray_col.ml
+example/ray_nocol.ml
+example/santa.ml
+example/sing.ml
+example/test.ml

Added: trunk/packages/cothreads/trunk/debian/libcothreads-ocaml-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cothreads/trunk/debian/libcothreads-ocaml-dev.install.in?rev=4576&op=file
==============================================================================
--- trunk/packages/cothreads/trunk/debian/libcothreads-ocaml-dev.install.in (added)
+++ trunk/packages/cothreads/trunk/debian/libcothreads-ocaml-dev.install.in Wed Sep 26 00:05:41 2007
@@ -1,0 +1,1 @@
+debian/META.cothreads @OCamlStdlibDir@/METAS/

Added: trunk/packages/cothreads/trunk/debian/libcothreads-ocaml.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cothreads/trunk/debian/libcothreads-ocaml.dirs.in?rev=4576&op=file
==============================================================================
--- trunk/packages/cothreads/trunk/debian/libcothreads-ocaml.dirs.in (added)
+++ trunk/packages/cothreads/trunk/debian/libcothreads-ocaml.dirs.in Wed Sep 26 00:05:41 2007
@@ -1,0 +1,1 @@
+ at OCamlDllDir@

Added: trunk/packages/cothreads/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cothreads/trunk/debian/patches/00list?rev=4576&op=file
==============================================================================
    (empty)

Added: trunk/packages/cothreads/trunk/debian/patches/10_patch_from_svn.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cothreads/trunk/debian/patches/10_patch_from_svn.dpatch?rev=4576&op=file
==============================================================================
--- trunk/packages/cothreads/trunk/debian/patches/10_patch_from_svn.dpatch (added)
+++ trunk/packages/cothreads/trunk/debian/patches/10_patch_from_svn.dpatch Wed Sep 26 00:05:41 2007
@@ -1,0 +1,96 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## patch_from_svn.dpatch by Erik de Castro Lopo <erikd at mega-nerd.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Pull a bunch of minor fixes from cothreads SVN.
+
+ at DPATCH@
+diff -ru cothreads/example/Makefile cothreads-svn/example/Makefile
+--- cothreads/example/Makefile	2007-09-12 06:32:40.000000000 +1000
++++ cothreads-svn/example/Makefile	2007-09-21 12:36:08.000000000 +1000
+@@ -1,35 +1,33 @@
+ include ../Makefile.template
+ 
++# If coThreads is built but not installed, pass LOCAL variable to make e.g "make all LOCAL=../src"
++INCLUDES=$(if $(LOCAL),-I $(LOCAL))
++PATHROOT=$(if $(LOCAL),$(LOCAL)/,+)
++
+ IFRAY = $(if $(findstring ray,$@), $(if $(findstring opt,$@),ray.cmx,ray.cmo))
+-VMPARAM = -I +vmthreads $(IFRAY) cothreads.cma 
+-NATHPARAM = -I +threads $(IFRAY) unix.cma cothreads.cma
++VMPARAM = -I $(PATHROOT)vmthreads $(IFRAY) cothreads.cma 
++NATHPARAM = -I $(PATHROOT)threads $(IFRAY) unix.cma cothreads.cma
+ NATHOPTPARAM = $(NATHPARAM:%.cma=%.cmxa)
+-PROCPARAM = -I +process $(IFRAY) unix.cma cothreads.cma
++PROCPARAM = -I $(PATHROOT)process $(IFRAY) unix.cma cothreads.cma
+ PROCOPTPARAM = $(PROCPARAM:%.cma=%.cmxa)
+ 
+ %.vmth: %.cmo
+ 	$(OCAMLC) -o $@ $(VMPARAM) $< 
+-
+ %.nath: %.cmo
+ 	$(OCAMLC) -o $@ $(NATHPARAM) $<
+-
+ %.nath.opt: %.cmx
+ 	$(OCAMLOPT) -o $@ $(NATHOPTPARAM) $<
+-
+ %.proc: %.cmo
+ 	$(OCAMLC) -o $@ $(PROCPARAM)  $<
+-
+ %.proc.opt: %.cmx
+ 	$(OCAMLOPT) -o $@ $(PROCOPTPARAM)  $<
+ 
+ ALLTEST = coth evt lock ray_col ray_nocol test mvar merge mcast phil santa
+-
+ all: $(ALLTEST:%=%.vmth) $(ALLTEST:%=%.nath) $(ALLTEST:%=%.nath.opt) $(ALLTEST:%=%.proc) $(ALLTEST:%=%.proc.opt) 
+ 
+ clean: ocamlclean
+ 	$(RM) *.vmth *.nath *.proc *.netw *.opt *.pgm
+ 
+-
+ # TODO:
+ # NETWPARAM = -I +networker $(IFRAY) unix.cma cothreads.cma
+ # NETWOPTPARAM = $(NETWOPTPARAM:%.cma=%.cmxa)
+diff -ru cothreads/example/README cothreads-svn/example/README
+--- cothreads/example/README	2007-09-18 22:38:58.000000000 +1000
++++ cothreads-svn/example/README	2007-09-21 12:36:07.000000000 +1000
+@@ -3,7 +3,12 @@
+ 
+ == BUILD ==
+ 
+-Just ''make all'' after you've got coThreads installed on your system.
++Just ''make all'' after you've got coThreads installed on your system. 
++
++In case you want to play with the examples before really installing coThreads
++on your system, you should first build coThreads in the ''src'' directory as
++usual, then go the example directory and pass the building directory as $LOCAL
++variable to make, e.g. ''make all LOCAL=../src''.
+ 
+ Type ''make clean'' to remove all imtermediate and final building results.
+ 
+@@ -62,8 +67,11 @@
+ 
+ * The Makefile itself is an example. It shows that how you can build your
+   applications against a set of execution engines with just a few lines of
+-  pattern rules.
+-
++  pattern rules. Note that we make use of the Cothread module for
++  ''object-level compatability'' instead of the standard Thread module, though
++  in most case you can switch it back, but then the Makefile will be a bit more
++  complicated, as you have to compile a different version of object files for
++  each of the engines.
+ 
+ [1] http://research.microsoft.com/users/simonpj/papers/stm/index.htm#composble
+ [2] https://research.microsoft.com/users/simonpj/papers/stm/index.htm#beautiful
+diff -ru cothreads/example/santa.ml cothreads-svn/example/santa.ml
+--- cothreads/example/santa.ml	2007-09-12 06:32:40.000000000 +1000
++++ cothreads-svn/example/santa.ml	2007-09-21 12:36:08.000000000 +1000
+@@ -45,7 +45,7 @@
+ let rec helper gp id task =
+   let in_gate, out_gate = join_group gp in
+   use_gate in_gate; task id; flush stdout; use_gate out_gate;
+-  Thread.delay (Random.float 0.5);
++  Thread.delay (Random.float 1.0);
+   helper gp id task
+ 
+ let run task (in_gt, out_gt) =  

Propchange: trunk/packages/cothreads/trunk/debian/patches/10_patch_from_svn.dpatch
------------------------------------------------------------------------------
    svn:executable = 

Added: trunk/packages/cothreads/trunk/debian/patches/20_makefile_destdir.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cothreads/trunk/debian/patches/20_makefile_destdir.dpatch?rev=4576&op=file
==============================================================================
--- trunk/packages/cothreads/trunk/debian/patches/20_makefile_destdir.dpatch (added)
+++ trunk/packages/cothreads/trunk/debian/patches/20_makefile_destdir.dpatch Wed Sep 26 00:05:41 2007
@@ -1,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## makefile_destdir.dpatch by Erik de Castro Lopo <erikd at mega-nerd.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch Makefile.template to fix 'make install' target.
+
+ at DPATCH@
+diff -ru cothreads-0.10-orig/ cothreads-0.10/
+--- cothreads-0.10-orig/Makefile.template	2007-09-25 16:07:03.000000000 +1000
++++ cothreads-0.10/Makefile.template	2007-09-25 16:06:52.000000000 +1000
+@@ -1,5 +1,5 @@
+ # Installation setting: Usually the only parameter needs customization
+-INSTALLLIBDIR = $(OCAMLSTDLIBPATH)
++INSTALLLIBDIR = $(DESTDIR)/$(OCAMLSTDLIBPATH)
+ 
+ 
+ # Layout of current project

Propchange: trunk/packages/cothreads/trunk/debian/patches/20_makefile_destdir.dpatch
------------------------------------------------------------------------------
    svn:executable = 

Added: trunk/packages/cothreads/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cothreads/trunk/debian/rules?rev=4576&op=file
==============================================================================
--- trunk/packages/cothreads/trunk/debian/rules (added)
+++ trunk/packages/cothreads/trunk/debian/rules Wed Sep 26 00:05:41 2007
@@ -1,0 +1,49 @@
+#!/usr/bin/make -f
+# debian/rules for cothreads package
+# Copyright (C) 2007 Erik de Castro Lopo <erikd at mega-nerd.com>
+# Copyright (C) 2007 Sylvain Le Gall <gildor at debian.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+
+# Generate debian/control using
+# fakeroot debian/rules debian/control DEB_AUTO_UPDATE_DEBIAN_CONTROL:=yes
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/class/ocaml.mk
+
+PACKAGE := libcothreads-ocaml
+DESTDIR := $(CURDIR)/debian/$(PACKAGE)
+
+PACKAGE_DEV := libcothreads-ocaml-dev
+DESTDIR_DEV := $(CURDIR)/debian/$(PACKAGE_DEV)
+
+DEB_MAKE_CLEAN_TARGET    := clean
+DEB_MAKE_BUILD_TARGET    := all \
+                            NATIVE=yes 
+DEB_MAKE_INSTALL_TARGET  := install \
+                            INSTALLDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/cothreads"
+
+CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.10.0-8),$(CDBS_BUILD_DEPENDS))
+
+OCAML_OCAMLDOC_PACKAGES := libcothreads-ocaml-dev
+
+clean::
+	-$(RM) debian/META.cothreads
+
+install/libcothreads-ocaml-dev::
+	sed -i "s/@VERSION@/$(DEB_UPSTREAM_VERSION)/g" debian/META.cothreads

Propchange: trunk/packages/cothreads/trunk/debian/rules
------------------------------------------------------------------------------
    svn:executable = 

Added: trunk/packages/cothreads/trunk/debian/svn-deblayout
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cothreads/trunk/debian/svn-deblayout?rev=4576&op=file
==============================================================================
--- trunk/packages/cothreads/trunk/debian/svn-deblayout (added)
+++ trunk/packages/cothreads/trunk/debian/svn-deblayout Wed Sep 26 00:05:41 2007
@@ -1,0 +1,1 @@
+tagsUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/cothreads

Added: trunk/packages/cothreads/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cothreads/trunk/debian/watch?rev=4576&op=file
==============================================================================
--- trunk/packages/cothreads/trunk/debian/watch (added)
+++ trunk/packages/cothreads/trunk/debian/watch Wed Sep 26 00:05:41 2007
@@ -1,0 +1,2 @@
+version=3
+http://sf.net/cothreads/cothreads_([0-9].*)\.tar\.bz2

More information about the Pkg-ocaml-maint-commits mailing list