[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, master, updated. debian/3.12.0-7-15-g0bdc690

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 0bdc69023525a3fb062f89848dfae8388c56f2d8
Author: Jonathan Nieder <jrnieder at gmail.com>
Date:   Sun Sep 25 21:37:16 2011 +0200

    Add Breaks against old versions of dh-ocaml (Closes: #642935)
    
    Signed-off-by: Stephane Glondu <steph at glondu.net>

diff --git a/debian/changelog b/debian/changelog
index 8c1a2cf..821eef3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ ocaml (3.12.1-1) UNRELEASED; urgency=low
   [ Mehdi Dogguy ]
   * Make objinfo show force_link and ccobjs/ccopts when needed
 
+  [ Jonathan Nieder ]
+  * debian/control: add Breaks against versions of dh-ocaml that relied on
+    the ocaml{dumpapprox,plugininfo,byteinfo} tools (Closes: #642935)
+
  -- Stéphane Glondu <glondu at debian.org>  Wed, 15 Jun 2011 18:19:01 +0200
 
 ocaml (3.12.0-7) unstable; urgency=low
diff --git a/debian/control b/debian/control
index cd108ca..f947d0d 100644
--- a/debian/control
+++ b/debian/control
@@ -48,6 +48,7 @@ Recommends:
  file
 Replaces: ocaml-interp (<< 3.11.1-3)
 Breaks:
+ dh-ocaml (<< 1.0.0),
  ocaml-interp (<< 3.11.1-3),
  camlp4 (<< 3.10.0),
  camlidl (<< 1.04)

-- 
OCaml packaging