[pmix] 11/16: Merge branch 'dev-separate-pmi' into debian/master

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository pmix.

commit 5332020f5c075f07b50d34384e204db07e0d1e73
Merge: 85bd8af 9972e3c
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Nov 25 16:25:21 2017 +0000

    Merge branch 'dev-separate-pmi' into debian/master

 debian/changelog                  |  5 ++-
 debian/control                    | 69 +++++++++++++++++++++++++++++----------
 debian/libpmi-pmix-dev.install.in |  4 +++
 debian/libpmi-pmix-dev.links.in   |  2 ++
 debian/libpmi1-pmix.install.in    |  1 +
 debian/libpmi1-pmix.links.in      |  3 ++
 debian/libpmi2-pmix.install.in    |  1 +
 debian/libpmi2-pmix.links.in      |  3 ++
 debian/libpmix-dev.install.in     |  4 +--
 debian/libpmix-dev.links.in       |  3 +-
 debian/libpmix2.install           |  4 ---
 debian/libpmix2.install.in        |  3 ++
 debian/libpmix2.links.in          |  4 +--
 debian/rules                      |  6 +++-
 debian/source/lintian-overrides   |  2 ++
 15 files changed, 84 insertions(+), 30 deletions(-)

diff --cc debian/changelog
index ee93ce3,6550b3b..3820f2e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,10 +1,11 @@@
  pmix (2.1.0~rc1-2) UNRELEASED; urgency=medium
  
+   * Move pmix to /usr/lib/$multiarch/pmix/{lib,include} and split libpmi{1,2}
+     libraries to co-exist with SLURM, MPICH implementations.
+     Closes: # 882033
 +  * FTBFS on Hurd: add patch for MAXPATHLEN
  
-  -- Alastair McKinstry <mckinstry at debian.org>  Sat, 25 Nov 2017 11:03:53 +0000
+  -- Alastair McKinstry <mckinstry at debian.org>  Sat, 25 Nov 2017 14:58:57 +0000
  
  pmix (2.1.0~rc1-1) unstable; urgency=medium
  

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