[pmix] 07/16: Move all to /usr/lib/@TRIPLET@/pmix/{include,lib}

[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 0e6e12fa340f7e13f01e8f6d8946af44b53d088f
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Nov 25 09:09:46 2017 +0000

    Move all to /usr/lib/@TRIPLET@/pmix/{include,lib}
---
 debian/libpmi-pmix-dev.install.in | 8 ++++----
 debian/libpmi-pmix-dev.links.in   | 4 ++--
 debian/libpmi1-pmix.install       | 1 -
 debian/libpmi1-pmix.install.in    | 1 +
 debian/libpmi1-pmix.links.in      | 4 +++-
 debian/libpmi2-pmix.install       | 1 -
 debian/libpmi2-pmix.install.in    | 1 +
 debian/libpmi2-pmix.links.in      | 4 +++-
 debian/libpmix-dev.install.in     | 4 ++--
 debian/libpmix-dev.links.in       | 2 +-
 debian/libpmix2.install           | 3 ---
 debian/libpmix2.install.in        | 3 +++
 debian/libpmix2.links.in          | 3 ++-
 debian/rules                      | 4 +++-
 14 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/debian/libpmi-pmix-dev.install.in b/debian/libpmi-pmix-dev.install.in
index 58a83e5..805423f 100644
--- a/debian/libpmi-pmix-dev.install.in
+++ b/debian/libpmi-pmix-dev.install.in
@@ -1,4 +1,4 @@
-/usr/include/pmi.h	/usr/include/@TRIPLET@/openmpi/include
-/usr/include/pmi2.h	/usr/include/@TRIPLET@/openmpi/include
-./debian/static-build/src/.libs/libpmi.a /usr/lib/@TRIPLET@/openmpi/lib
-./debian/static-build/src/.libs/libpmi2.a /usr/lib/@TRIPLET@/openmpi/lib
+/usr/include/pmi.h	/usr/include/@TRIPLET@/pmix/include
+/usr/include/pmi2.h	/usr/include/@TRIPLET@/pmix/include
+./debian/static-build/src/.libs/libpmi.a /usr/lib/@TRIPLET@/pmix/lib
+./debian/static-build/src/.libs/libpmi2.a /usr/lib/@TRIPLET@/pmix/lib
diff --git a/debian/libpmi-pmix-dev.links.in b/debian/libpmi-pmix-dev.links.in
index be56edf..72ba67d 100644
--- a/debian/libpmi-pmix-dev.links.in
+++ b/debian/libpmi-pmix-dev.links.in
@@ -1,2 +1,2 @@
-/usr/lib/@TRIPLET@/libpmi2.so.1.0.0  /usr/lib/@TRIPLET@/openmpi/lib/libpmi2.so
-/usr/lib/@TRIPLET@/libpmi.so.1.0.0  /usr/lib/@TRIPLET@/openmpi/lib/libpmi.so
+/usr/lib/@TRIPLET@/pmix/lib/libpmi2.so.1.0.0  /usr/lib/@TRIPLET@/pmix/lib/libpmi2.so
+/usr/lib/@TRIPLET@/pmix/lib/libpmi.so.1.0.0  /usr/lib/@TRIPLET@/pmix/lib/libpmi.so
diff --git a/debian/libpmi1-pmix.install b/debian/libpmi1-pmix.install
deleted file mode 100644
index 9eac4dd..0000000
--- a/debian/libpmi1-pmix.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libpmi.so.1.0.0
diff --git a/debian/libpmi1-pmix.install.in b/debian/libpmi1-pmix.install.in
new file mode 100644
index 0000000..f393482
--- /dev/null
+++ b/debian/libpmi1-pmix.install.in
@@ -0,0 +1 @@
+usr/lib/@TRIPLET@/libpmi.so.1.0.0	/usr/lib/@TRIPLET@/pmix/lib
diff --git a/debian/libpmi1-pmix.links.in b/debian/libpmi1-pmix.links.in
index a101d03..a2a3b13 100644
--- a/debian/libpmi1-pmix.links.in
+++ b/debian/libpmi1-pmix.links.in
@@ -1 +1,3 @@
-/usr/lib/@TRIPLET@/libpmi.so.1.0.0  /usr/lib/@TRIPLET@/libpmi.so.1
+/usr/lib/@TRIPLET@/pmix/lib/libpmi.so.1.0.0  /usr/lib/@TRIPLET@/pmix/lib/libpmi.so.1
+/usr/lib/@TRIPLET@/pmix/lib/libpmi.so.1.0.0  /usr/lib/@TRIPLET@/libpmi.so.1.0.0
+/usr/lib/@TRIPLET@/pmix/lib/libpmi.so.1.0.0  /usr/lib/@TRIPLET@/libpmi.so.1
diff --git a/debian/libpmi2-pmix.install b/debian/libpmi2-pmix.install
deleted file mode 100644
index afbe6c9..0000000
--- a/debian/libpmi2-pmix.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libpmi2.so.1.0.0
diff --git a/debian/libpmi2-pmix.install.in b/debian/libpmi2-pmix.install.in
new file mode 100644
index 0000000..8390a0b
--- /dev/null
+++ b/debian/libpmi2-pmix.install.in
@@ -0,0 +1 @@
+usr/lib/@TRIPLET@/libpmi2.so.1.0.0	/usr/lib/@TRIPLET@/pmix/lib
diff --git a/debian/libpmi2-pmix.links.in b/debian/libpmi2-pmix.links.in
index 70de388..d57d4d4 100644
--- a/debian/libpmi2-pmix.links.in
+++ b/debian/libpmi2-pmix.links.in
@@ -1 +1,3 @@
-/usr/lib/@TRIPLET@/libpmi2.so.1.0.0  /usr/lib/@TRIPLET@/libpmi2.so.1
+/usr/lib/@TRIPLET@/pmix/lib/libpmi2.so.1.0.0  /usr/lib/@TRIPLET@/pmix/lib/libpmi2.so.1
+/usr/lib/@TRIPLET@/pmix/lib/libpmi2.so.1.0.0  /usr/lib/@TRIPLET@/libpmi2.so.1
+/usr/lib/@TRIPLET@/pmix/lib/libpmi2.so.1.0.0  /usr/lib/@TRIPLET@/libpmi2.so.1.0.0
diff --git a/debian/libpmix-dev.install.in b/debian/libpmix-dev.install.in
index 1fc8026..1cc2d46 100644
--- a/debian/libpmix-dev.install.in
+++ b/debian/libpmix-dev.install.in
@@ -1,3 +1,3 @@
-/usr/include/pmix*
+/usr/include/pmix*	/usr/lib/@TRIPLET@/pmix/include
 /usr/share/man/*
-./debian/static-build/src/.libs/libpmix.a /usr/lib/@TRIPLET@/openmpi/lib
+./debian/static-build/src/.libs/libpmix.a /usr/lib/@TRIPLET@/pmix/lib
diff --git a/debian/libpmix-dev.links.in b/debian/libpmix-dev.links.in
index e900a6b..d183a48 100644
--- a/debian/libpmix-dev.links.in
+++ b/debian/libpmix-dev.links.in
@@ -1 +1 @@
-/usr/lib/@TRIPLET@/libpmix.so.2.1.3  /usr/lib/@TRIPLET@/openmpi/lib/libpmix.so
+/usr/lib/@TRIPLET@/pmix/lib/libpmix.so.2.1.3  /usr/lib/@TRIPLET@/pmix/lib/libpmix.so
diff --git a/debian/libpmix2.install b/debian/libpmix2.install
deleted file mode 100644
index 5a5f027..0000000
--- a/debian/libpmix2.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/libpmix.so.2*
-usr/lib/*/pmix
-usr/share/pmix
diff --git a/debian/libpmix2.install.in b/debian/libpmix2.install.in
new file mode 100644
index 0000000..aa84652
--- /dev/null
+++ b/debian/libpmix2.install.in
@@ -0,0 +1,3 @@
+usr/lib/*/libpmix.so.2*	/usr/lib/@TRIPLET@/pmix/lib
+usr/lib/*/pmix		/usr/lib/@TRIPLET@/pmix/lib/pmix
+usr/share/pmix
diff --git a/debian/libpmix2.links.in b/debian/libpmix2.links.in
index c8d7f4d..a4935bf 100644
--- a/debian/libpmix2.links.in
+++ b/debian/libpmix2.links.in
@@ -1 +1,2 @@
-/usr/lib/@TRIPLET@/libpmix.so.2.1.3  /usr/lib/@TRIPLET@/libpmix.so.2
+/usr/lib/@TRIPLET@/pmix/lib/libpmix.so.2.1.3  /usr/lib/@TRIPLET@/libpmix.so.2
+/usr/lib/@TRIPLET@/pmix/lib/libpmix.so.2.1.3  /usr/lib/@TRIPLET@/libpmix.so.2.1.3
diff --git a/debian/rules b/debian/rules
index e766f1f..4e989c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,9 @@ include /usr/share/dpkg/buildflags.mk
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 AUTOGENERATED:= libpmix2.links libpmix-dev.links libpmix-dev.install \
 		libpmi1-pmix.links libpmi2-pmix.links libpmi-pmix-dev.links \
-		libpmi-pmix-dev.install 
+		libpmi1-pmix.install libpmi2-pmix.install \
+		libpmi-pmix-dev.install libpmix-dev.install \
+		libpmix2.install
 
 PSM_ARCH:= amd64 i386
 ifneq (,$(findstring $(DEB_HOST_ARCH),$(PSM_ARCH)))

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