[petsc] 02/03: Multiarch: place PETSc.pc alternative in /usr/lib/<arch>/pkgconfig

[Drew Parsons]

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

dparsons pushed a commit to tag debian/3.7.4+dfsg1-2
in repository petsc.

commit 54e9decfb568cd24465ab8bb6612c5cf2ff804eb
Author: Drew Parsons <dparsons at debian.org>
Date:   Fri Oct 14 18:34:42 2016 +0800

    Multiarch: place PETSc.pc alternative in /usr/lib/<arch>/pkgconfig
---
 debian/README.Debian                       | 2 +-
 debian/changelog                           | 1 +
 debian/libpetsc-complex-3.7.4-dbg.postinst | 2 +-
 debian/libpetsc-complex-3.7.4-dev.postinst | 2 +-
 debian/libpetsc3.7.4-dbg.postinst          | 2 +-
 debian/libpetsc3.7.4-dev.postinst          | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 0193524..1aac363 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -38,7 +38,7 @@ With libpetsc3.7.4-dev installed, you can build programs against it two ways:
 	will only depend on libpetsc3.7.4.
      2. PETSc build convention: adapt a makefile from one of their tests or
 	tutorial directories and build with make PETSC_DIR=/usr/lib/petsc
-     3. Use pkg-config (via /usr/lib/pkgconfig/PETSC.pc).
+     3. Use pkg-config (via /usr/lib/<arch>/pkgconfig/PETSC.pc).
 
 Of these, the latter two are probably easier, as they automatically set up
 all of the include paths and library linkages for PETSc and its various
diff --git a/debian/changelog b/debian/changelog
index 52cf6b1..cbe724a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ petsc (3.7.4+dfsg1-2) UNRELEASED; urgency=medium
     When different libpetsc3.7.Z are installed, the preferred version
     is controlled by alternatives for libpetsc3.7 (likewise for
     libpetsc_complex.so.3.7).
+  * Multiarch: place PETSc.pc alternative in /usr/lib/<arch>/pkgconfig
 
  -- Drew Parsons <dparsons at debian.org>  Fri, 14 Oct 2016 16:43:26 +0800
 
diff --git a/debian/libpetsc-complex-3.7.4-dbg.postinst b/debian/libpetsc-complex-3.7.4-dbg.postinst
index 074da95..7d6e0b1 100644
--- a/debian/libpetsc-complex-3.7.4-dbg.postinst
+++ b/debian/libpetsc-complex-3.7.4-dbg.postinst
@@ -24,7 +24,7 @@ fi
 update-alternatives --install /usr/lib/petsc petsc /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_DEBUG_ARCH} ${PETSC_VERSION_NUMBER}33 \
   --slave /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc.so libpetsc.so /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_DEBUG_ARCH}/lib/libpetsc_complex.so.${PETSC_VERSION} \
   --slave /usr/include/petsc petscinclude /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_DEBUG_ARCH}/include \
-  --slave /usr/lib/pkgconfig/PETSc.pc PETSc.pc /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_DEBUG_ARCH}/lib/pkgconfig/PETSc.pc \
+  --slave /usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/PETSc.pc PETSc.pc /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_DEBUG_ARCH}/lib/pkgconfig/PETSc.pc \
   --slave /usr/share/octave/site/m/petsc petsc-octave /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_DEBUG_ARCH}/share/petsc/matlab
 
 fi
diff --git a/debian/libpetsc-complex-3.7.4-dev.postinst b/debian/libpetsc-complex-3.7.4-dev.postinst
index 0c7f486..560cc11 100644
--- a/debian/libpetsc-complex-3.7.4-dev.postinst
+++ b/debian/libpetsc-complex-3.7.4-dev.postinst
@@ -30,7 +30,7 @@ fi
 update-alternatives --install /usr/lib/petsc petsc ${PETSC_DIR_COMPLEX} ${PETSC_VERSION_NUMBER}73 \
   --slave /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc.so libpetsc.so /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_complex.so.${PETSC_VERSION} \
   --slave /usr/include/petsc petscinclude ${PETSC_DIR_COMPLEX}/include \
-  --slave /usr/lib/pkgconfig/PETSc.pc PETSc.pc ${PETSC_DIR_COMPLEX}/lib/pkgconfig/PETSc.pc \
+  --slave /usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/PETSc.pc PETSc.pc ${PETSC_DIR_COMPLEX}/lib/pkgconfig/PETSc.pc \
   --slave /usr/share/octave/site/m/petsc petsc-octave ${PETSC_DIR_COMPLEX}/share/petsc/matlab
 
 # alternative base version of petsc complex
diff --git a/debian/libpetsc3.7.4-dbg.postinst b/debian/libpetsc3.7.4-dbg.postinst
index 25e22b5..b5a9535 100644
--- a/debian/libpetsc3.7.4-dbg.postinst
+++ b/debian/libpetsc3.7.4-dbg.postinst
@@ -24,7 +24,7 @@ fi
 update-alternatives --install /usr/lib/petsc petsc /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_DEBUG_ARCH} ${PETSC_VERSION_NUMBER}37 \
   --slave /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc.so libpetsc.so /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_DEBUG_ARCH}/lib/libpetsc_real.so.${PETSC_VERSION} \
   --slave /usr/include/petsc petscinclude /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_DEBUG_ARCH}/include \
-  --slave /usr/lib/pkgconfig/PETSc.pc PETSc.pc /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_DEBUG_ARCH}/lib/pkgconfig/PETSc.pc \
+  --slave /usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/PETSc.pc PETSc.pc /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_DEBUG_ARCH}/lib/pkgconfig/PETSc.pc \
   --slave /usr/share/octave/site/m/petsc petsc-octave /usr/lib/petscdir/${PETSC_VERSION}/${PETSC_DEBUG_ARCH}/share/petsc/matlab
 
 fi
diff --git a/debian/libpetsc3.7.4-dev.postinst b/debian/libpetsc3.7.4-dev.postinst
index c720594..0021890 100644
--- a/debian/libpetsc3.7.4-dev.postinst
+++ b/debian/libpetsc3.7.4-dev.postinst
@@ -29,7 +29,7 @@ fi
 update-alternatives --install /usr/lib/petsc petsc ${PETSC_DIR_REAL} ${PETSC_VERSION_NUMBER}77 \
   --slave /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc.so libpetsc.so /usr/lib/${DEB_HOST_MULTIARCH}/libpetsc_real.so.${PETSC_VERSION} \
   --slave /usr/include/petsc petscinclude ${PETSC_DIR_REAL}/include \
-  --slave /usr/lib/pkgconfig/PETSc.pc PETSc.pc ${PETSC_DIR_REAL}/lib/pkgconfig/PETSc.pc \
+  --slave /usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/PETSc.pc PETSc.pc ${PETSC_DIR_REAL}/lib/pkgconfig/PETSc.pc \
   --slave /usr/share/octave/site/m/petsc petsc-octave ${PETSC_DIR_REAL}/share/petsc/matlab
 
 # alternative base version of petsc real

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