[Pkg-ocaml-maint-commits] [SCM] cothreads packaging branch, master, updated. debian/0.10-1-5-g2b9b42b

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit 2b9b42be1c308759bbf53a6fbae79d604cc67d9c
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Fri Mar 6 23:36:08 2009 +0100

    Migration to ocaml 3.11 and updated copyright file format
    
    * Remove verbatim text in debian/control
    * Update homepage field
    * Use rules/ocaml.mk, add versionned dependency on dh-ocaml
    * Update debian/copyright file to use
      http://wiki.debian.org/Proposals/CopyrightFormat

diff --git a/debian/changelog b/debian/changelog
index 0d433e6..856013f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,13 @@ cothreads (0.10-2) UNRELEASED; urgency=low
   * Add build-depends on dh-ocaml
   * Upgrade Standards-Version to 3.8.0 (README.source)
   * Switch packaging to git
+  * Remove verbatim text in debian/control
+  * Update homepage field
+  * Use rules/ocaml.mk, add versionned dependency on dh-ocaml
+  * Update debian/copyright file to use
+    http://wiki.debian.org/Proposals/CopyrightFormat
 
- -- Sylvain Le Gall <gildor at debian.org>  Wed, 04 Mar 2009 11:28:06 +0100
+ -- Sylvain Le Gall <gildor at debian.org>  Fri, 06 Mar 2009 22:56:54 +0100
 
 cothreads (0.10-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 09a9065..2b152a1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Section: libdevel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Sylvain Le Gall <gildor at debian.org>, Mehdi Dogguy <dogguy at pps.jussieu.fr>, Erik de Castro Lopo <erikd at mega-nerd.com>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-9), dh-ocaml
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-9), dh-ocaml (>= 0.4.1)
 Standards-Version: 3.8.0
-Homepage: http://cothreads.sourceforge.net/
+Homepage: http://sourceforge.net/projects/cothreads/
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/cothreads.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/cothreads.git
 
@@ -17,13 +17,13 @@ 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.).
+ - 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.
diff --git a/debian/copyright b/debian/copyright
index 9173c47..1ff7659 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,20 +1,24 @@
-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.
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Upstream-Author:  Zheng Li <li at pps.jussieu.fr>
+Packaged-By: Erik de Castro Lopo <erikd at mega-nerd.com>
+             Sylvain Le Gall <gildor at debian.org> 
+Packaged-Date: Wed, Sep 19 2007 12:24 +1000
+Original-Source-Location: http://prdownloads.sourceforge.net/cothreads/
 
-It was downloaded from:
-  http://prdownloads.sourceforge.net/cothreads/
+Files: *
+Copyright: © 2007 by Zheng Li
+License: LGPL-2+
 
-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
+File: src/process/threads.mli
+Copyright: © 1995 INRIA
+License: LGPL-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.
+be found in /usr/share/common-licenses/LGPL-2.1.
+
+File: debian/*
+Copyright: (C) 2007 Erik de Castro Lopo
+           (C) 2007 Sylvain Le Gall
+License: GPL-2+
diff --git a/debian/rules b/debian/rules
index 9cd98d6..a0d4735 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@
 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
+include /usr/share/cdbs/1/rules/ocaml.mk
 
 PACKAGE := libcothreads-ocaml
 DESTDIR := $(CURDIR)/debian/$(PACKAGE)
@@ -43,9 +43,6 @@ endif
 
 OCAML_OCAMLDOC_PACKAGES_DOCBASE := libcothreads-ocaml-dev
 
-clean::
-	-$(RM) debian/META.cothreads
-
 install/libcothreads-ocaml-dev::
-	sed -i "s/@VERSION@/$(DEB_UPSTREAM_VERSION)/g" debian/META.cothreads
+	sed -i "s/@VERSION@/$(DEB_UPSTREAM_VERSION)/g" '$(CURDIR)/debian/META.cothreads'
 

-- 
cothreads packaging