[Pkg-ocaml-maint-commits] r4577 - in /trunk/packages/cothreads: ./ tarballs/ trunk/debian/ trunk/debian/patches/
gildor at users.alioth.debian.org
gildor at users.alioth.debian.org
Wed Sep 26 01:12:50 UTC 2007
Author: gildor
Date: Wed Sep 26 01:12:49 2007
New Revision: 4577
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4577
Log:
* let the upstream scheme generate the documentation with ocamldoc
* use a tar.gz
Added:
trunk/packages/cothreads/tarballs/cothreads_0.10.orig.tar.gz (with props)
trunk/packages/cothreads/trunk/debian/control
trunk/packages/cothreads/trunk/debian/patches/30_correct-doc-generation.dpatch (with props)
trunk/packages/cothreads/trunk/debian/patches/40_non_native_arch.dpatch (with props)
Removed:
trunk/packages/cothreads/tarballs/cothreads_0.10.orig.tar.bz2
trunk/packages/cothreads/trunk/debian/libcothreads-ocaml.dirs.in
Modified:
trunk/packages/cothreads/ (props changed)
trunk/packages/cothreads/trunk/debian/ (props changed)
trunk/packages/cothreads/trunk/debian/control.in
trunk/packages/cothreads/trunk/debian/libcothreads-ocaml-dev.examples
trunk/packages/cothreads/trunk/debian/libcothreads-ocaml-dev.install.in
trunk/packages/cothreads/trunk/debian/patches/00list
trunk/packages/cothreads/trunk/debian/patches/20_makefile_destdir.dpatch
trunk/packages/cothreads/trunk/debian/rules
Propchange: trunk/packages/cothreads/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Sep 26 01:12:49 2007
@@ -1,0 +1,1 @@
+build-area
Added: trunk/packages/cothreads/tarballs/cothreads_0.10.orig.tar.gz
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cothreads/tarballs/cothreads_0.10.orig.tar.gz?rev=4577&op=file
==============================================================================
Binary file - no diff available.
Propchange: trunk/packages/cothreads/tarballs/cothreads_0.10.orig.tar.gz
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: trunk/packages/cothreads/trunk/debian/
------------------------------------------------------------------------------
mergeWithUpstream = 1
Added: trunk/packages/cothreads/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cothreads/trunk/debian/control?rev=4577&op=file
==============================================================================
--- trunk/packages/cothreads/trunk/debian/control (added)
+++ trunk/packages/cothreads/trunk/debian/control Wed Sep 26 01:12:49 2007
@@ -1,0 +1,29 @@
+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 (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-8)
+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-dev
+Section: libdevel
+Architecture: any
+Depends: ocaml-nox-${F:OCamlABI}
+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.
Modified: trunk/packages/cothreads/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cothreads/trunk/debian/control.in?rev=4577&op=diff
==============================================================================
--- trunk/packages/cothreads/trunk/debian/control.in (original)
+++ trunk/packages/cothreads/trunk/debian/control.in Wed Sep 26 01:12:49 2007
@@ -3,34 +3,16 @@
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)
+Build-Depends: @cdbs@
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})
+Depends: ocaml-nox-${F:OCamlABI}
Description: concurrent programming library for OCaml
This library enhances the Threads library of the standard OCaml distribution
in two dimensions:
Modified: 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=4577&op=diff
==============================================================================
--- trunk/packages/cothreads/trunk/debian/libcothreads-ocaml-dev.examples (original)
+++ trunk/packages/cothreads/trunk/debian/libcothreads-ocaml-dev.examples Wed Sep 26 01:12:49 2007
@@ -1,15 +1,1 @@
-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
+example/*
Modified: 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=4577&op=diff
==============================================================================
--- trunk/packages/cothreads/trunk/debian/libcothreads-ocaml-dev.install.in (original)
+++ trunk/packages/cothreads/trunk/debian/libcothreads-ocaml-dev.install.in Wed Sep 26 01:12:49 2007
@@ -1,1 +1,2 @@
debian/META.cothreads @OCamlStdlibDir@/METAS/
+doc/html/* /usr/share/doc/libcothreads-ocaml-dev/html/api/
Modified: trunk/packages/cothreads/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cothreads/trunk/debian/patches/00list?rev=4577&op=diff
==============================================================================
--- trunk/packages/cothreads/trunk/debian/patches/00list (original)
+++ trunk/packages/cothreads/trunk/debian/patches/00list Wed Sep 26 01:12:49 2007
@@ -1,0 +1,4 @@
+10_patch_from_svn
+20_makefile_destdir
+30_correct-doc-generation
+40_non_native_arch
Modified: 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=4577&op=diff
==============================================================================
--- trunk/packages/cothreads/trunk/debian/patches/20_makefile_destdir.dpatch (original)
+++ trunk/packages/cothreads/trunk/debian/patches/20_makefile_destdir.dpatch Wed Sep 26 01:12:49 2007
@@ -11,7 +11,7 @@
@@ -1,5 +1,5 @@
# Installation setting: Usually the only parameter needs customization
-INSTALLLIBDIR = $(OCAMLSTDLIBPATH)
-+INSTALLLIBDIR = $(DESTDIR)/$(OCAMLSTDLIBPATH)
++INSTALLLIBDIR = $(DESTDIR)$(OCAMLSTDLIBPATH)
# Layout of current project
Added: trunk/packages/cothreads/trunk/debian/patches/30_correct-doc-generation.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cothreads/trunk/debian/patches/30_correct-doc-generation.dpatch?rev=4577&op=file
==============================================================================
--- trunk/packages/cothreads/trunk/debian/patches/30_correct-doc-generation.dpatch (added)
+++ trunk/packages/cothreads/trunk/debian/patches/30_correct-doc-generation.dpatch Wed Sep 26 01:12:49 2007
@@ -1,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## correct-doc-generation.dpatch by Sylvain Le Gall <gildor at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cothreads-0.10~/doc/Makefile cothreads-0.10/doc/Makefile
+--- cothreads-0.10~/doc/Makefile 2007-09-11 22:32:40.000000000 +0200
++++ cothreads-0.10/doc/Makefile 2007-09-26 02:56:36.140575676 +0200
+@@ -6,8 +6,8 @@
+ doc:
+ $(MKDIR) html
+ $(MKDIR) man
+- $(OCAMLDOC) -html -d html -colorize-code $(TOPDIR)/$(SOURCEDIR)/*.mli $(TOPDIR)/$(SOURCEDIR)/process/thread.mli
+- $(OCAMLDOC) -man -d man -man-mini $(TOPDIR)/$(SOURCEDIR)/*.mli $(TOPDIR)/$(SOURCEDIR)/process/thread.mli
++ $(OCAMLDOC) -html -d html -colorize-code -I $(TOPDIR)/$(SOURCEDIR) $(TOPDIR)/$(SOURCEDIR)/*.mli $(TOPDIR)/$(SOURCEDIR)/process/thread.mli
++ $(OCAMLDOC) -man -d man -man-mini -I $(TOPDIR)/$(SOURCEDIR) $(TOPDIR)/$(SOURCEDIR)/*.mli $(TOPDIR)/$(SOURCEDIR)/process/thread.mli
+
+ clean:
+- $(RM) html man *~ .depend
+\ No newline at end of file
++ $(RM) html man *~ .depend
Propchange: trunk/packages/cothreads/trunk/debian/patches/30_correct-doc-generation.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: trunk/packages/cothreads/trunk/debian/patches/40_non_native_arch.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cothreads/trunk/debian/patches/40_non_native_arch.dpatch?rev=4577&op=file
==============================================================================
--- trunk/packages/cothreads/trunk/debian/patches/40_non_native_arch.dpatch (added)
+++ trunk/packages/cothreads/trunk/debian/patches/40_non_native_arch.dpatch Wed Sep 26 01:12:49 2007
@@ -1,0 +1,128 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40_non_native_arch.dpatch by Sylvain Le Gall <gildor at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cothreads-0.10~/doc/Makefile cothreads-0.10/doc/Makefile
+--- cothreads-0.10~/doc/Makefile 2007-09-26 03:01:12.204551084 +0200
++++ cothreads-0.10/doc/Makefile 2007-09-26 03:02:55.560049201 +0200
+@@ -10,4 +10,4 @@
+ $(OCAMLDOC) -man -d man -man-mini $(TOPDIR)/$(SOURCEDIR)/*.mli $(TOPDIR)/$(SOURCEDIR)/process/thread.mli
+
+ clean:
+- $(RM) html man *~ .depend
+\ No newline at end of file
++ $(RM) html man *~ .depend
+diff -urNad cothreads-0.10~/example/Makefile cothreads-0.10/example/Makefile
+--- cothreads-0.10~/example/Makefile 2007-09-26 03:01:12.216550562 +0200
++++ cothreads-0.10/example/Makefile 2007-09-26 03:02:50.712260358 +0200
+@@ -13,14 +13,18 @@
+ %.nath: %.cmo
+ $(OCAMLC) -o $@ $(NATHPARAM) $<
+
++ifeq ($(NATIVE),yes)
+ %.nath.opt: %.cmx
+ $(OCAMLOPT) -o $@ $(NATHOPTPARAM) $<
++endif
+
+ %.proc: %.cmo
+ $(OCAMLC) -o $@ $(PROCPARAM) $<
+
++ifeq ($(NATIVE),yes)
+ %.proc.opt: %.cmx
+ $(OCAMLOPT) -o $@ $(PROCOPTPARAM) $<
++endif
+
+ ALLTEST = coth evt lock ray_col ray_nocol test mvar merge mcast phil santa
+
+diff -urNad cothreads-0.10~/src/Makefile cothreads-0.10/src/Makefile
+--- cothreads-0.10~/src/Makefile 2007-09-11 22:32:40.000000000 +0200
++++ cothreads-0.10/src/Makefile 2007-09-26 03:04:47.947153926 +0200
+@@ -4,7 +4,9 @@
+
+ AUXMOD = libext libextunix
+ AUXMODBYT = $(AUXMOD:%=%.cmo)
++ifeq ($(NATIVE),yes)
+ AUXMODNAT = $(AUXMOD:%=%.cmx)
++endif
+
+ COMMONMOD = mutex condition event
+ COMMONMODINTFSRC = $(COMMONMOD:%=%.mli)
+diff -urNad cothreads-0.10~/src/process/Makefile cothreads-0.10/src/process/Makefile
+--- cothreads-0.10~/src/process/Makefile 2007-09-11 22:32:40.000000000 +0200
++++ cothreads-0.10/src/process/Makefile 2007-09-26 03:05:18.817809285 +0200
+@@ -6,23 +6,33 @@
+
+ AUXMOD = libext libextunix
+ AUXMODBYT = $(AUXMOD:%=%.cmo)
++ifeq ($(NATIVE),yes)
+ AUXMODNAT = $(AUXMOD:%=%.cmx)
++endif
+ LOCALMOD = coordinator
+ COMMONMOD = mutex condition event cothread stm
++ifeq ($(NATIVE),yes)
+ COMMONMODNAT = $(COMMONMOD:%=%.cmx)
++endif
+ COMMONMODINTFSRC = $(COMMONMOD:%=%.mli)
+ COMMONMODINTFCOM = $(COMMONMOD:%=%.cmi)
+ COMMONMODINTF = $(COMMONMODINTFSRC) $(COMMONMODINTFCOM)
+ EXTRAMOD = thread
++ifeq ($(NATIVE),yes)
+ EXTRAMODNAT =$(EXTRAMOD:%=%.cmx)
++endif
+ EXTRAMODINTFCOM = $(EXTRAMOD:%=%.cmi)
+ ALLMOD = $(LOCALMOD) $(COMMONMOD) $(EXTRAMOD)
+ ALLMODBYT = $(ALLMOD:%=%.cmo)
++ifeq ($(NATIVE),yes)
+ ALLMODNAT = $(ALLMOD:%=%.cmx)
++endif
+
+ LIB = threads cothreads
+ LIBBYT = $(LIB:%=%.cma)
++ifeq ($(NATIVE),yes)
+ LIBNAT = $(LIB:%=%.cmxa)
++endif
+ LIBNATA = $(LIB:%=%.a)
+
+ INSTALLDIR = $(INSTALLLIBDIR)/$(BACKEND)
+diff -urNad cothreads-0.10~/src/threads/Makefile cothreads-0.10/src/threads/Makefile
+--- cothreads-0.10~/src/threads/Makefile 2007-09-11 22:32:40.000000000 +0200
++++ cothreads-0.10/src/threads/Makefile 2007-09-26 03:03:55.497438493 +0200
+@@ -6,7 +6,9 @@
+
+ AUXMOD = libext
+ AUXMODBYT = $(AUXMOD:%=%.cmo)
++ifeq ($(NATIVE),yes)
+ AUXMODNAT = $(AUXMOD:%=%.cmx)
++endif
+
+ COMMONMOD = thread mutex condition event
+ COMMONMODNAT = $(COMMONMOD:%=%.cmx)
+@@ -14,14 +16,18 @@
+
+ EXTRAMOD = cothread stm
+ EXTRAMODBYT = $(EXTRAMOD:%=%.cmo)
++ifeq ($(NATIVE),yes)
+ EXTRAMODNAT = $(EXTRAMOD:%=%.cmx)
++endif
+ EXTRAMODINTFSRC = $(EXTRAMOD:%=%.mli)
+ EXTRAMODINTFCOM = $(EXTRAMOD:%=%.cmi)
+ EXTRAMODINTF = $(EXTRAMODINTFSRC) $(EXTRAMODINTFCOM)
+
+ LIB = cothreads
+ LIBBYT = $(LIB:%=%.cma)
++ifeq ($(NATIVE),yes)
+ LIBNAT = $(LIB:%=%.cmxa)
++endif
+ LIBNATA = $(LIB:%=%.a)
+
+ INSTALLDIR = $(INSTALLLIBDIR)/$(BACKEND)
+@@ -52,4 +58,4 @@
+ clean: ocamlclean
+
+ uninstall:
+- for i in $(INSTALLFILES); do $(RM) $(INSTALLDIR)/$$i; done
+\ No newline at end of file
++ for i in $(INSTALLFILES); do $(RM) $(INSTALLDIR)/$$i; done
Propchange: trunk/packages/cothreads/trunk/debian/patches/40_non_native_arch.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: trunk/packages/cothreads/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cothreads/trunk/debian/rules?rev=4577&op=diff
==============================================================================
--- trunk/packages/cothreads/trunk/debian/rules (original)
+++ trunk/packages/cothreads/trunk/debian/rules Wed Sep 26 01:12:49 2007
@@ -33,17 +33,22 @@
DESTDIR_DEV := $(CURDIR)/debian/$(PACKAGE_DEV)
DEB_MAKE_CLEAN_TARGET := clean
-DEB_MAKE_BUILD_TARGET := all \
+DEB_MAKE_BUILD_TARGET := all doc \
NATIVE=yes
DEB_MAKE_INSTALL_TARGET := install \
- INSTALLDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/cothreads"
+ DESTDIR='$(DESTDIR_DEV)'
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
+
+build/libcothreads-ocaml-dev::
+ i=libcothreads-ocaml-dev; \
+ sed -e "s/@PACKAGE@/$$i/g" \
+ /usr/share/cdbs/1/class/ocaml-docbase-template.txt \
+ > debian/$$i.doc-base.ocamldoc-apiref
+
More information about the Pkg-ocaml-maint-commits
mailing list