[Pkg-ocaml-maint-commits] [SCM] dh-ocaml packaging branch, 312/master, updated. debian/0.9.4-4-ga559272

[Stephane Glondu]

The following commit has been merged in the 312/master branch:
commit bd31c615a8da454a650a44a00ef79b27742af0b8
Merge: 33b7248c37660b135a3b1fe4dd5e5e44824c019e e819d2f406e9c0aa086bb442cd38d9d39765c7a3
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Jul 1 18:26:16 2010 +0200

    Merge branch 'master' into 312/master

diff --combined debian/control
index 9c36c28,05b610e..a11499f
--- a/debian/control
+++ b/debian/control
@@@ -5,7 -5,6 +5,6 @@@ Maintainer: Debian OCaml Maintainers <d
  Uploaders:
   Mehdi Dogguy <mehdi at debian.org>,
   Samuel Mimram <smimram at debian.org>,
-  Stefano Zacchiroli <zack at debian.org>,
   Stéphane Glondu <glondu at debian.org>,
   Sylvain Le Gall <gildor at debian.org>
  Build-Depends:
@@@ -16,7 -15,7 +15,7 @@@ Build-Depends-Indep
   xsltproc,
   libxml2-utils,
   lynx
- Standards-Version: 3.8.3
+ Standards-Version: 3.9.0
  Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/dh-ocaml.git
  Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/dh-ocaml.git
  
@@@ -25,13 -24,13 +24,13 @@@ Architecture: al
  Depends: ${misc:Depends}
  Recommends:
   debhelper,
 - ocaml-nox
 + ocaml-nox (>> 3.12)
  Replaces:
   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)
- Conflicts:
+ Breaks:
   ocaml-base-nox (<< 3.11.0~beta1-1),
   ocaml (<< 3.11.0~beta1-1),
   ocaml-nox (<< 3.11.0~beta1-1),

-- 
dh-ocaml packaging