[Pkg-ocaml-maint-commits] [SCM] pycaml packaging branch, master, updated. debian/0.82-12-1-g0376bec

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 0376bec51232f166523793c1797c3a5171b4283d
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Jun 21 17:54:29 2010 +0200

    Add versioned Conflicts to pycaml (Closes: #586656)

diff --git a/debian/changelog b/debian/changelog
index 04c0c25..bbf13d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pycaml (0.82-13) unstable; urgency=low
+
+  * Add versioned Conflicts to pycaml (Closes: #586656)
+
+ -- Stéphane Glondu <glondu at debian.org>  Mon, 21 Jun 2010 17:54:12 +0200
+
 pycaml (0.82-12) unstable; urgency=low
 
   * New binary packages libpycaml-ocaml{,-dev} (Closes: #586276)
diff --git a/debian/control b/debian/control
index 2631edb..3c9b7b6 100644
--- a/debian/control
+++ b/debian/control
@@ -27,8 +27,8 @@ Depends:
  ${misc:Depends}
 Provides: pycaml, ${ocaml:Provides}
 Suggests: ocaml-findlib
-Replaces: pycaml
-Conflicts: pycaml
+Replaces: pycaml (<< 0.82-12~)
+Conflicts: pycaml (<< 0.82-12~)
 Description: OCaml bindings to embed Python interpreter (development files)
  Pycaml is intended to allow users to build native OCaml libraries and
  use them from Python, and conversely, in order to allow OCaml users
@@ -43,8 +43,8 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends}
 Provides: ${ocaml:Provides}
-Replaces: pycaml
-Conflicts: pycaml
+Replaces: pycaml (<< 0.82-12~)
+Conflicts: pycaml (<< 0.82-12~)
 Description: OCaml bindings to embed Python interpreter (runtime)
  Pycaml is intended to allow users to build native OCaml libraries and
  use them from Python, and conversely, in order to allow OCaml users

-- 
pycaml packaging