[Pkg-ocaml-maint-commits] [SCM] ssreflect packaging branch, master, updated. debian/1.2+dfsg-4-1-g6233a6d

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 6233a6df106e6efbad42e18c645ea85995d7386d
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Jul 14 15:19:01 2010 +0200

    Various updates

diff --git a/debian/changelog b/debian/changelog
index 67238c6..1556b88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ssreflect (1.2+dfsg-5) unstable; urgency=low
+
+  * Rebuild with Coq 8.2pl2
+  * debian/control:
+    - replace Conflicts by Breaks
+    - bump Standards-Version to 3.9.0
+
+ -- Stéphane Glondu <glondu at debian.org>  Wed, 14 Jul 2010 15:19:10 +0200
+
 ssreflect (1.2+dfsg-4) unstable; urgency=low
 
   * Rebuild with OCaml 3.11.2
diff --git a/debian/control b/debian/control
index f7c2e5a..8b09c60 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
  camlp5 (>= 5.12-2~),
  ocaml-best-compilers,
  ocaml-nox (>= 3.11.1-3~)
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Section: math
 Homepage: http://www.msr-inria.inria.fr/Projects/math-components
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ssreflect.git
@@ -40,7 +40,7 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends}
 Replaces: libssreflect-ocaml (<< 1.2+dfsg-3~)
-Conflicts: libssreflect-ocaml (<< 1.2+dfsg-3~)
+Breaks: libssreflect-ocaml (<< 1.2+dfsg-3~)
 Provides: ${ocaml:Provides}
 Description: small scale reflection extension for Coq (devt files)
  This package is part of Ssreflect, the small scale reflection

-- 
ssreflect packaging