[mpich] 14/23: Remove versioned mpich2-doc from mpich-doc 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 b4e6cbf9784040d47a5b315f2b5d01abefcae49e
Author: Torquil Macdonald Sørensen <torquil at gmail.com>
Date:   Thu Nov 5 15:01:59 2015 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 84a5669..5eb9f0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ mpich (3.2~rc2-1) UNRELEASED; urgency=medium
   * Drop libmpl*/libopa* since they are now only symlinks to files in libmpich*
   * 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
 
  -- 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 1688c43..1a81a7c 100644
--- a/debian/control
+++ b/debian/control
@@ -131,7 +131,6 @@ Conflicts:
  lam-mpidoc,
  lam4-dev,
  mpi-doc,
- mpich2-doc (<< 3.0.4-1),
  openmpi-doc,
  openmpi-mpidoc
 Breaks:

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