[Pkg-ocaml-maint-commits] [SCM] ocamlgraph packaging branch, master, updated. debian/1.3+debian-2-1-g3b39a02

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 3b39a0269ee7f7a7f19aa734b5e1a9a463c8f047
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Mon Mar 22 22:40:15 2010 +0100

    Make the new binary packages conflicts/replaces former versions of libocamlgraph-ocaml-dev.

diff --git a/debian/changelog b/debian/changelog
index 7776d99..d58d18b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ ocamlgraph (1.3+debian-2) unstable; urgency=low
     - libocamlgraph-view-ocaml-dev
   * Put the generated documentation in a new binary (arch:all) package.
     - libocamlgraph-ocaml-doc
+  * Make the new binary packages conflicts/replaces former versions of
+    libocamlgraph-ocaml-dev.
 
  -- Mehdi Dogguy <mehdi at debian.org>  Sun, 07 Mar 2010 21:40:23 +0100
 
diff --git a/debian/control b/debian/control
index a827168..39aee15 100644
--- a/debian/control
+++ b/debian/control
@@ -68,6 +68,10 @@ Depends:
  ${misc:Depends}
 Provides:
  ${ocaml:Provides}
+Conflicts:
+ libocamlgraph-ocaml-dev (<< 1.3+debian-2~)
+Replaces:
+ libocamlgraph-ocaml-dev (<< 1.3+debian-2~)
 Suggests: graphviz | springgraph
 Description: graph library for OCaml
  Ocamlgraph is a graph library for OCaml. Its contribution is
@@ -107,6 +111,10 @@ Depends:
  ${ocaml:Depends},
  ${shlibs:Depends},
  ${misc:Depends}
+Conflicts:
+ libocamlgraph-ocaml-dev (<< 1.3+debian-2~)
+Replaces:
+ libocamlgraph-ocaml-dev (<< 1.3+debian-2~)
 Description: Documentation for the OCamlgraph library
   This package provides the API reference documentation generated by
   ocamldoc.

-- 
ocamlgraph packaging