[Pkg-ocaml-maint-commits] [SCM] Cooperative light-weight thread library for OCaml branch, master, updated. debian/2.1.1-1-10-ge5bbff5

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 11035b7da9e6420c099b469fc848966ec950c4c7
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Dec 30 17:35:11 2010 +0100

    s/Conflicts/Breaks/g, bump SV to 3.9.1

diff --git a/debian/control b/debian/control
index bcbd349..dfdd7d9 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
  camlp4,
  ocaml-compiler-libs,
  ocaml-nox (>= 3.11.1-3~)
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Section: ocaml
 Homepage: http://ocsigen.org/lwt
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/lwt.git
@@ -53,7 +53,7 @@ Depends:
  ${misc:Depends}
 Provides: ${ocaml:Provides}
 Replaces: liblwt-ocaml-dev (<< 2.0.0)
-Conflicts: liblwt-ocaml-dev (<< 2.0.0)
+Breaks: liblwt-ocaml-dev (<< 2.0.0)
 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
@@ -71,7 +71,7 @@ Depends:
  ${misc:Depends}
 Provides: ${ocaml:Provides}
 Replaces: liblwt-ocaml-dev (<= 2.0.0)
-Conflicts: liblwt-ocaml-dev (<= 2.0.0)
+Breaks: liblwt-ocaml-dev (<= 2.0.0)
 Recommends:
  liblwt-ocaml-doc,
  ocaml-findlib
@@ -93,7 +93,7 @@ Depends:
  ${misc:Depends}
 Provides: ${ocaml:Provides}
 Replaces: liblwt-ocaml-dev (<= 2.0.0)
-Conflicts: liblwt-ocaml-dev (<= 2.0.0)
+Breaks: liblwt-ocaml-dev (<= 2.0.0)
 Recommends:
  liblwt-ocaml-doc,
  ocaml-findlib
@@ -115,7 +115,7 @@ Depends:
  ${misc:Depends}
 Provides: ${ocaml:Provides}
 Replaces: liblwt-ocaml-dev (<= 2.0.0)
-Conflicts: liblwt-ocaml-dev (<= 2.0.0)
+Breaks: liblwt-ocaml-dev (<= 2.0.0)
 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
@@ -135,7 +135,7 @@ Enhances:
  liblwt-glib-ocaml-dev
 Depends: ${misc:Depends}
 Replaces: liblwt-ocaml-dev (<= 2.0.0)
-Conflicts: liblwt-ocaml-dev (<= 2.0.0)
+Breaks: liblwt-ocaml-dev (<= 2.0.0)
 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

-- 
Cooperative light-weight thread library for OCaml