[Pkg-ocaml-maint-commits] [SCM] dh-ocaml packaging branch, master, updated. debian/0.9.3-10-ge3ea478

[Stephane Glondu]

The following commit has been merged in the master branch:
commit e3ea4784171b7a26ee07c8137a2bdaba8a37894e
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Feb 10 21:07:31 2010 +0100

    Make dh-ocaml conflict with previous versions of ocaml (Closes: #569195)

diff --git a/debian/changelog b/debian/changelog
index cd62d83..8efb8f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,10 @@ dh-ocaml (0.9.4) UNRELEASED; urgency=low
   [ Stéphane Glondu ]
   * Move debhelper to Build-Depends (needed for "clean" target)
   * Add debhelper to Recommends
+  * Make dh-ocaml conflict with previous versions of ocaml
+    (Closes: #569195)
 
- -- Mehdi Dogguy <mehdi at debian.org>  Wed, 16 Dec 2009 13:00:21 +0100
+ -- Stéphane Glondu <glondu at debian.org>  Wed, 10 Feb 2010 21:05:23 +0100
 
 dh-ocaml (0.9.3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 77983e9..e498d66 100644
--- a/debian/control
+++ b/debian/control
@@ -31,6 +31,11 @@ Replaces:
  ocaml (<< 3.11.0~beta1-1),
  ocaml-nox (<< 3.11.0~beta1-1),
  ocaml-base (<< 3.11.0~beta1-1)
+Conflicts:
+ ocaml-base-nox (<< 3.11.0~beta1-1),
+ ocaml (<< 3.11.0~beta1-1),
+ ocaml-nox (<< 3.11.0~beta1-1),
+ ocaml-base (<< 3.11.0~beta1-1)
 Description: helper tools for maintaining OCaml-related Debian packages
  dh-ocaml is a set of tools and documents to help maintaining Debian
  packages related to the Objective Caml (OCaml) programming language.

-- 
dh-ocaml packaging