[mpich] 17/23: Replace versioned libmpich2-dev Conflicts by Breaks and Replaces in package libmpich-dev

[Torquil Macdonald Sørensen]

This is an automated email from the git hooks/post-receive script.

torquil-guest pushed a commit to branch master
in repository mpich.

commit 6b1421ce28be93aff93f758358c2eee4eed96a24
Author: Torquil Macdonald Sørensen <torquil at gmail.com>
Date:   Thu Nov 5 16:42:21 2015 +0100

    Replace versioned libmpich2-dev Conflicts by Breaks and Replaces in package libmpich-dev
---
 debian/changelog | 1 +
 debian/control   | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5eb9f0c..e70f28b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ mpich (3.2~rc2-1) UNRELEASED; urgency=medium
   * Remove ARMCI section from debian/copyright since ARMCI is no longer in MPICH
   * Bump standards version to 3.9.6.0
   * Remove versioned mpich2-doc from mpich-doc Conflicts
+  * Replace versioned libmpich2-dev Conflicts by Breaks and Replaces in package libmpich-dev
 
  -- Torquil Macdonald Sørensen <torquil at gmail.com>  Thu, 05 Nov 2015 12:30:58 +0100
 
diff --git a/debian/control b/debian/control
index 1a81a7c..9c460dd 100644
--- a/debian/control
+++ b/debian/control
@@ -43,16 +43,16 @@ Depends:
 # libopa-dev,
  ${misc:Depends},
  ${shlibs:Depends}
-Conflicts:
- libmpich2-dev (<< 3.0.4-1)
 Breaks:
  libmpich1.0-dev,
  libmpl-dev,
- libopa-dev
+ libopa-dev,
+ libmpich2-dev
 Replaces:
  libmpich1.0-dev,
  libmpl-dev,
- libopa-dev
+ libopa-dev,
+ libmpich2-dev
 Recommends:
  mpich (= ${binary:Version})
 Description: Development files for MPICH

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mpich.git