[Pkg-ocaml-maint-commits] [SCM] ocamlduce packaging branch, master, updated. debian/3.11.1.0-2-1-g9c77c59

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 9c77c59aa7f5853b24bdac784722f2968078401d
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Oct 29 14:30:43 2009 +0100

    Add Replaces/Conflicts to previous versions of ocamlduce

diff --git a/debian/changelog b/debian/changelog
index a131b07..210bb66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocamlduce (3.11.1.0-3) UNRELEASED; urgency=low
+
+  * Add Replaces/Conflicts to previous versions of ocamlduce in
+    ocamlduce-base (Closes: #553177)
+
+ -- Stéphane Glondu <glondu at debian.org>  Thu, 29 Oct 2009 14:29:51 +0100
+
 ocamlduce (3.11.1.0-2) unstable; urgency=low
 
   * Switch packaging to dh-ocaml 0.9:
diff --git a/debian/control b/debian/control
index e0109cc..82b6b3e 100644
--- a/debian/control
+++ b/debian/control
@@ -47,6 +47,8 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends}
 Provides: ${ocaml:Provides}
+Replaces: ocamlduce (<< 3.11.1.0-2~)
+Conflicts: ocamlduce (<< 3.11.1.0-2~)
 Description: OCaml extended with XML types (runtime)
  OCamlDuce is a merger between OCaml and CDuce. It comes as a modified
  version of OCaml which integrates CDuce features: XML expressions,

-- 
ocamlduce packaging