[Pkg-ocaml-maint-commits] r4641 - in /trunk/packages/cothreads/trunk/debian: META.cothreads.in changelog control copyright libcothreads-ocaml-dev.examples patches/00list patches/50_makefile_example.dpatch rules

gildor at users.alioth.debian.org gildor at users.alioth.debian.org
Wed Oct 17 23:50:28 UTC 2007 

Author: gildor
Date: Wed Oct 17 23:50:28 2007
New Revision: 4641

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4641
Log:
* Use OCAML_OCAMLDOC_PACKAGES_DOCBASE CDBS variable
* Patch makefile to be able to compile it when installed
* Enhance META

Added:
    trunk/packages/cothreads/trunk/debian/patches/50_makefile_example.dpatch   (with props)
Modified:
    trunk/packages/cothreads/trunk/debian/META.cothreads.in
    trunk/packages/cothreads/trunk/debian/changelog
    trunk/packages/cothreads/trunk/debian/control
    trunk/packages/cothreads/trunk/debian/copyright
    trunk/packages/cothreads/trunk/debian/libcothreads-ocaml-dev.examples
    trunk/packages/cothreads/trunk/debian/patches/00list
    trunk/packages/cothreads/trunk/debian/rules

Modified: 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=4641&op=diff
==============================================================================
--- trunk/packages/cothreads/trunk/debian/META.cothreads.in (original)
+++ trunk/packages/cothreads/trunk/debian/META.cothreads.in Wed Oct 17 23:50:28 2007
@@ -1,7 +1,25 @@
 name="cothreads"
 version="@VERSION@"
 description="A concurrent programming library for OCaml"
-requires="unix"
-archive(byte)="cothreads.cma"
-archive(native)="cothreads.cmxa"
-directory="+process"
+directory="+"
+
+package "threads" (
+  # We suppose that this must be used in conjunction
+  # with -threads/-mt
+  archive(byte,mt)="cothreads.cma"
+  archive(native,mt,mt_posix)="cothreads.cmxa"
+)
+
+package "process_threads" (
+  requires="unix"
+  directory="+process"
+  archive(byte)="threads.cma"
+  archive(native)="threads.cmxa"
+)
+
+package "process" (
+  requires="unix"
+  directory="+process"
+  archive(byte)="cothreads.cma"
+  archive(native)="cothreads.cmxa"
+)

Modified: trunk/packages/cothreads/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cothreads/trunk/debian/changelog?rev=4641&op=diff
==============================================================================
--- trunk/packages/cothreads/trunk/debian/changelog (original)
+++ trunk/packages/cothreads/trunk/debian/changelog Wed Oct 17 23:50:28 2007
@@ -1,6 +1,9 @@
 cothreads (0.10-1) UNRELEASED; urgency=low
 
+  [ Erik de Castro Lopo ]
   * Initial upload (Closes: #444082)
 
- -- Erik de Castro Lopo <erikd at mega-nerd.com>  Tue, 21 Sep 2007 19:01:25 +1000
+  [ Sylvain Le Gall ]
+  * Use ocaml 3.10.0-9 for generating .ocamldoc-apiref automatically
 
+ -- Sylvain Le Gall <gildor at debian.org>  Thu, 18 Oct 2007 01:09:20 +0200

Modified: trunk/packages/cothreads/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cothreads/trunk/debian/control?rev=4641&op=diff
==============================================================================
--- trunk/packages/cothreads/trunk/debian/control (original)
+++ trunk/packages/cothreads/trunk/debian/control Wed Oct 17 23:50:28 2007
@@ -3,7 +3,7 @@
 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)
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-9)
 Standards-Version: 3.7.2
 Homepage: http://cothreads.sourceforge.net/
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/cothreads

Modified: trunk/packages/cothreads/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cothreads/trunk/debian/copyright?rev=4641&op=diff
==============================================================================
--- trunk/packages/cothreads/trunk/debian/copyright (original)
+++ trunk/packages/cothreads/trunk/debian/copyright Wed Oct 17 23:50:28 2007
@@ -1,5 +1,5 @@
-This package was debianized by Erik de Castro Lopo <erikd at mega-nerd.com> on
-Wed, Sep 19 2007 12:24 +1000.
+This package was debianized by Erik de Castro Lopo <erikd at mega-nerd.com> and
+Sylvain Le Gall <gildor at debian.org> on Wed, Sep 19 2007 12:24 +1000.
 
 It was downloaded from:
   http://prdownloads.sourceforge.net/cothreads/

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=4641&op=diff
==============================================================================
--- trunk/packages/cothreads/trunk/debian/libcothreads-ocaml-dev.examples (original)
+++ trunk/packages/cothreads/trunk/debian/libcothreads-ocaml-dev.examples Wed Oct 17 23:50:28 2007
@@ -1,1 +1,2 @@
 example/*
+Makefile.template

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=4641&op=diff
==============================================================================
--- trunk/packages/cothreads/trunk/debian/patches/00list (original)
+++ trunk/packages/cothreads/trunk/debian/patches/00list Wed Oct 17 23:50:28 2007
@@ -2,3 +2,4 @@
 20_makefile_destdir
 30_correct-doc-generation
 40_non_native_arch
+50_makefile_example

Added: trunk/packages/cothreads/trunk/debian/patches/50_makefile_example.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cothreads/trunk/debian/patches/50_makefile_example.dpatch?rev=4641&op=file
==============================================================================
--- trunk/packages/cothreads/trunk/debian/patches/50_makefile_example.dpatch (added)
+++ trunk/packages/cothreads/trunk/debian/patches/50_makefile_example.dpatch Wed Oct 17 23:50:28 2007
@@ -1,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_makefile_example.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~/example/Makefile cothreads-0.10/example/Makefile
+--- cothreads-0.10~/example/Makefile	2007-09-27 01:16:18.199352976 +0200
++++ cothreads-0.10/example/Makefile	2007-09-27 01:16:41.654331341 +0200
+@@ -1,4 +1,4 @@
+-include ../Makefile.template
++include ./Makefile.template
+ 
+ IFRAY = $(if $(findstring ray,$@), $(if $(findstring opt,$@),ray.cmx,ray.cmo))
+ VMPARAM = -I +vmthreads $(IFRAY) cothreads.cma 

Propchange: trunk/packages/cothreads/trunk/debian/patches/50_makefile_example.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=4641&op=diff
==============================================================================
--- trunk/packages/cothreads/trunk/debian/rules (original)
+++ trunk/packages/cothreads/trunk/debian/rules Wed Oct 17 23:50:28 2007
@@ -34,13 +34,19 @@
 
 DEB_MAKE_CLEAN_TARGET    := clean
 DEB_MAKE_BUILD_TARGET    := all doc 
+DEB_MAKE_INSTALL_TARGET  := install \
+                            DESTDIR='$(DESTDIR_DEV)'
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 DEB_MAKE_BUILD_TARGET    += NATIVE=yes
+DEB_MAKE_INSTALL_TARGET  += NATIVE=yes
+else
+DEB_MAKE_BUILD_TARGET    += NATIVE=no
+DEB_MAKE_INSTALL_TARGET  += NATIVE=no
 endif
-DEB_MAKE_INSTALL_TARGET  := install \
-                            DESTDIR='$(DESTDIR_DEV)'
 
-CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.10.0-8),$(CDBS_BUILD_DEPENDS))
+CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.10.0-9),$(CDBS_BUILD_DEPENDS))
+
+OCAML_OCAMLDOC_PACKAGES_DOCBASE := libcothreads-ocaml-dev
 
 clean::
 	-$(RM) debian/META.cothreads
@@ -48,9 +54,3 @@
 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