summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Stephane Glondu <steph@glondu.net>2009-02-26 19:09:54 +0100
committerGravatar Stephane Glondu <steph@glondu.net>2009-02-26 19:09:54 +0100
commit0a220ea4714bff72f0fb2b27ae8de7bc45561900 (patch)
tree560138016abf3789607ea1a95d7e578f16cb2019
parent76018532b0a90f0d9951589d277d95af85e4cd2a (diff)
Add missing Conflicts and Replaces (Closes: #517107)
-rw-r--r--debian/changelog4
-rw-r--r--debian/control4
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 61566020..6e0286ee 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@glondu.net> Fri, 20 Feb 2009 15:21:15 +0100
+ -- Stephane Glondu <steph@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 805d5879..882e4c63 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