[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/2.9.13-1-5-gc50c2fa

[Ralf Treinen]

The following commit has been merged in the master branch:
commit c50c2fad6a76b762d980fe76b3171a4f4f3bc978
Author: Ralf Treinen <treinen at free.fr>
Date:   Tue Feb 14 09:21:25 2012 +0100

    dose- packages conflict with old dose3- packages

diff --git a/debian/changelog b/debian/changelog
index 5f812d3..a62acea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,12 +2,16 @@ dose3 (2.9.13-2) UNRELEASED; urgency=low
 
   * debian/control: add {$perl:Depends} to dependencies of apt-cudf
     (closes: Bug#659834)
+  * debian/control: use conflicts to remove old versions of binary packages
+    from before the renaming:
+    - dose-distcheck conflicts with dose3-distcheck
+    - dose-builddebcheck conflicts with dose3-builddebcheck
   * Rename ceve to dose-ceve (binary and manpage)
   * package libdose3-ocaml: only install files dll*stubs.so
   * Add debian/dose-distcheck.NEWS, tell about changed output format
     and exit codes.
 
- -- Ralf Treinen <treinen at debian.org>  Tue, 14 Feb 2012 08:44:44 +0100
+ -- Ralf Treinen <treinen at debian.org>  Tue, 14 Feb 2012 09:18:44 +0100
 
 dose3 (2.9.13-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index dcce80a..58b4823 100644
--- a/debian/control
+++ b/debian/control
@@ -60,6 +60,7 @@ Package: dose-distcheck
 Section: devel
 Architecture: any
 Depends: ${ocaml:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Conflicts: dose3-distcheck (<< 2.9.13)
 Description: Checks whether dependencies of packages can be satisfied
  This software checks for every package of a distribution whether it
  is possible to satisfy its dependencies and conflicts within this
@@ -72,6 +73,7 @@ Package: dose-builddebcheck
 Section: devel
 Architecture: any
 Depends: ${ocaml:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Conflicts: dose3-builddebcheck (<< 2.9.13)
 Description: Checks whether build-dependencies can be satisfied
  This software checks, given a collection of source package stanzas
  and a collection of binary package stanzas of debian packages, whether

-- 
dose3 packaging