[mpich] 18/23: Remove versioned mpich2 from mpich Conflicts

[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 41342f4744827116c2cc10914f6c815ced525495
Author: Torquil Macdonald Sørensen <torquil at gmail.com>
Date:   Thu Nov 5 16:43:43 2015 +0100

    Remove versioned mpich2 from mpich Conflicts
---
 debian/changelog | 1 +
 debian/control   | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e70f28b..3a1eac7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ mpich (3.2~rc2-1) UNRELEASED; urgency=medium
   * 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
+  * Remove versioned mpich2 from mpich Conflicts
 
  -- 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 9c460dd..0407d7c 100644
--- a/debian/control
+++ b/debian/control
@@ -100,8 +100,6 @@ Depends:
  libmpich12 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends}
-Conflicts:
- mpich2 (<< 3.0.4-1)
 Breaks:
  mpich-bin,
  mpich2

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