[Pkg-ocaml-maint-commits] [SCM] coq packaging branch, master, updated. debian/8.2.rc2+dfsg-3-18-g0a220ea

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 0a220ea4714bff72f0fb2b27ae8de7bc45561900
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Feb 26 19:09:54 2009 +0100

    Add missing Conflicts and Replaces (Closes: #517107)

diff --git a/debian/changelog b/debian/changelog
index 6156602..6e0286e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ coq (8.2-1+dfsg-1) UNRELEASED; urgency=low
   * Added coqvars.mk helper for coq-related packages, and remove
     /usr/lib/coq/abi (its contents is now it the COQ_ABI variable)
   * Remove dependency on dpatch
+  * Add some missing Conflicts and Replaces in coq and libcoq-ocaml-dev
+    (Closes: #517107)
 
- -- Stephane Glondu <steph at glondu.net>  Fri, 20 Feb 2009 15:21:15 +0100
+ -- Stephane Glondu <steph at glondu.net>  Thu, 26 Feb 2009 19:09:28 +0100
 
 coq (8.2~rc2+dfsg-3) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 805d587..882e4c6 100644
--- a/debian/control
+++ b/debian/control
@@ -40,6 +40,8 @@ Suggests:
  ledit | cle,
  libcoq-ocaml-dev,
  coq-doc
+Conflicts: 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
  development of computer programs consistent with their formal
@@ -92,6 +94,8 @@ Depends:
  coq (= ${binary:Version}),
  ocaml-nox-${F:OCamlABI},
  ${misc:Depends}
+Conflicts: 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
  development of computer programs consistent with their formal

-- 
coq packaging