[Pkg-ocaml-maint-commits] [SCM] coq packaging branch, master, updated. debian/8.2.pl1+dfsg-6-12-g7a99898

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 54435822d5fa28d29a4c2f6026ef43790b83e9ae
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Jul 1 17:40:05 2010 +0200

    Bump SV to 3.9.0

diff --git a/debian/control b/debian/control
index 3542f0e..1991f42 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders:
  Stefano Zacchiroli <zack at debian.org>,
  Samuel Mimram <smimram at debian.org>,
  Stéphane Glondu <glondu at debian.org>
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Build-Depends:
  debhelper (>= 7.2.11~),
  dh-ocaml (>= 0.9~),
@@ -39,7 +39,7 @@ Suggests:
  libcoq-ocaml-dev,
  why (>= 2.19),
  coq-doc
-Conflicts: coq-libs
+Breaks: coq-libs
 Replaces: coq-libs
 Description: proof assistant for higher-order logic (toplevel and compiler)
  Coq is a proof assistant for higher-order logic, which allows the
@@ -72,7 +72,7 @@ Package: coq-theories
 Architecture: all
 Depends: coq-${F:CoqABI}, ${misc:Depends}
 Recommends: coq (>= 8.0)
-Conflicts: coq-doc (<= 8.0pl1.0-2), coq-libs
+Breaks: coq-doc (<= 8.0pl1.0-2), coq-libs
 Replaces: coq-libs
 Description: proof assistant for higher-order logic (theories)
  Coq is a proof assistant for higher-order logic, which allows the
@@ -91,7 +91,7 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends}
 Provides: ${ocaml:Provides}
-Conflicts: coq (<< 8.2-1+dfsg-1), coq-libs
+Breaks: coq (<< 8.2-1+dfsg-1), coq-libs
 Replaces: coq (<< 8.2-1+dfsg-1), coq-libs
 Description: development libraries and tools for Coq
  Coq is a proof assistant for higher-order logic, which allows the

-- 
coq packaging