[adios] 03/10: remove quotes that break pkg-config proper output; install

[Alastair McKinstry]

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

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

commit ab1e7b15b2488500a9fba1749f6332489efe4266
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Jun 16 13:54:55 2015 +0100

    remove quotes that break pkg-config proper output; install
---
 debian/libadios-bin.install    |  2 +-
 debian/libadios-dev.install    |  1 +
 debian/patches/pkgconfig.patch | 44 +++++++++++++++++++++---------------------
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/debian/libadios-bin.install b/debian/libadios-bin.install
index af819ed..030b966 100644
--- a/debian/libadios-bin.install
+++ b/debian/libadios-bin.install
@@ -13,6 +13,6 @@ usr/bin/skel
 usr/bin/skel_cat
 usr/bin/skel_extract
 usr/bin/skeldump
-usr/bin/type_mapper.py	
+usr/bin/type_mapper.py /usr/share/pyshared
 etc/skel		/etc/adios
 debian/bash_completion.d/* /usr/share/bash-completion/completions
diff --git a/debian/libadios-dev.install b/debian/libadios-dev.install
index 1cb7d2c..aec241d 100644
--- a/debian/libadios-dev.install
+++ b/debian/libadios-dev.install
@@ -1,2 +1,3 @@
 usr/include/*
 usr/lib/*/*.a
+usr/lib/*/pkgconfig/*
diff --git a/debian/patches/pkgconfig.patch b/debian/patches/pkgconfig.patch
index 741848a..3b77871 100644
--- a/debian/patches/pkgconfig.patch
+++ b/debian/patches/pkgconfig.patch
@@ -11,7 +11,7 @@ Index: adios-1.8.0/adios.pc.in
 +# Standard defines for pkg-config
 +prefix=@prefix@
 +exec_prefix=${prefix}
-+libdir=${prefix}/lib/x86_64-linux-gnu
++libdir=@libdir@
 +includedir=${prefix}/include
 +
 +#
@@ -22,36 +22,36 @@ Index: adios-1.8.0/adios.pc.in
 +ADIOS_DIR=${prefix}
 +
 +# Flags to build code using ADIOS write API (and read API)
-+ADIOS_INC="-I${ADIOS_DIR}/include @ADIOSLIB_CPPFLAGS@ @ADIOSLIB_CFLAGS@"
-+ADIOS_CLIB="-L${libdir} -ladios @ADIOSLIB_LDFLAGS@ @ADIOSLIB_LDADD@ @LDFLAGS@ @LIBS@"
-+ADIOS_FLIB="-L${libdir} -ladiosf @ADIOSLIB_LDFLAGS@ @ADIOSLIB_LDADD@ @LDFLAGS@ @LIBS@"
-+ADIOS_V1_FLIB="-L${libdir} -ladiosf_v1 @ADIOSLIB_LDFLAGS@ @ADIOSLIB_LDADD@ @LDFLAGS@ @LIBS@"
++ADIOS_INC=-I${ADIOS_DIR}/include @ADIOSLIB_CPPFLAGS@ @ADIOSLIB_CFLAGS@
++ADIOS_CLIB=-L${libdir} -ladios @ADIOSLIB_LDFLAGS@ @ADIOSLIB_LDADD@ @LDFLAGS@ @LIBS@
++ADIOS_FLIB=-L${libdir} -ladiosf @ADIOSLIB_LDFLAGS@ @ADIOSLIB_LDADD@ @LDFLAGS@ @LIBS@
++ADIOS_V1_FLIB=-L${libdir} -ladiosf_v1 @ADIOSLIB_LDFLAGS@ @ADIOSLIB_LDADD@ @LDFLAGS@ @LIBS@
 +
 +# Flags to build code using ADIOS read API only
-+ADIOSREAD_INC="-I${prefix}/include @ADIOSREADLIB_CPPFLAGS@ @ADIOSREADLIB_CFLAGS@"
-+ADIOSREAD_V1_INC="-I${prefix}/include @MACRODEFFLAG at ADIOS_USE_READ_API_1 @ADIOSREADLIB_CPPFLAGS@ @ADIOSREADLIB_CFLAGS@"
-+ADIOSREAD_CLIB="-L${libdir} -ladiosread @ADIOSREADLIB_LDFLAGS@ @ADIOSREADLIB_LDADD@"
-+ADIOSREAD_FLIB="-L${libdir} -ladiosreadf @ADIOSREADLIB_LDFLAGS@ @ADIOSREADLIB_LDADD@"
-+ADIOSREAD_V1_FLIB="-L${libdir} -ladiosreadf_v1 @ADIOSREADLIB_LDFLAGS@ @ADIOSREADLIB_LDADD@"
++ADIOSREAD_INC=-I${prefix}/include @ADIOSREADLIB_CPPFLAGS@ @ADIOSREADLIB_CFLAGS@
++ADIOSREAD_V1_INC=-I${prefix}/include @MACRODEFFLAG at ADIOS_USE_READ_API_1 @ADIOSREADLIB_CPPFLAGS@ @ADIOSREADLIB_CFLAGS@
++ADIOSREAD_CLIB=-L${libdir} -ladiosread @ADIOSREADLIB_LDFLAGS@ @ADIOSREADLIB_LDADD@
++ADIOSREAD_FLIB=-L${libdir} -ladiosreadf @ADIOSREADLIB_LDFLAGS@ @ADIOSREADLIB_LDADD@
++ADIOSREAD_V1_FLIB=-L${libdir} -ladiosreadf_v1 @ADIOSREADLIB_LDFLAGS@ @ADIOSREADLIB_LDADD@
 +
 +# Flags to build code using ADIOS read API only in a sequential code (no MPI)
-+ADIOSREAD_SEQ_INC="-I${prefix}/include @ADIOSREADLIB_SEQ_CPPFLAGS@ @ADIOSREADLIB_SEQ_CFLAGS@"
-+ADIOSREAD_SEQ_V1_INC="-I${prefix}/include @MACRODEFFLAG at ADIOS_USE_READ_API_1 @ADIOSREADLIB_SEQ_CPPFLAGS@ @ADIOSREADLIB_SEQ_CFLAGS@"
-+ADIOSREAD_SEQ_CLIB="-L${libdir} -ladiosread_nompi @ADIOSREADLIB_SEQ_LDFLAGS@ @ADIOSREADLIB_SEQ_LDADD@"
-+ADIOSREAD_SEQ_FLIB="-L${libdir} -ladiosreadf_nompi @ADIOSREADLIB_SEQ_LDFLAGS@ @ADIOSREADLIB_SEQ_LDADD@"
-+ADIOSREAD_SEQ_V1_FLIB="-L${libdir} -ladiosreadf_nompi_v1 @ADIOSREADLIB_SEQ_LDFLAGS@ @ADIOSREADLIB_SEQ_LDADD@"
++ADIOSREAD_SEQ_INC=-I${prefix}/include @ADIOSREADLIB_SEQ_CPPFLAGS@ @ADIOSREADLIB_SEQ_CFLAGS@
++ADIOSREAD_SEQ_V1_INC=-I${prefix}/include @MACRODEFFLAG at ADIOS_USE_READ_API_1 @ADIOSREADLIB_SEQ_CPPFLAGS@ @ADIOSREADLIB_SEQ_CFLAGS@
++ADIOSREAD_SEQ_CLIB=-L${libdir} -ladiosread_nompi @ADIOSREADLIB_SEQ_LDFLAGS@ @ADIOSREADLIB_SEQ_LDADD@
++ADIOSREAD_SEQ_FLIB=-L${libdir} -ladiosreadf_nompi @ADIOSREADLIB_SEQ_LDFLAGS@ @ADIOSREADLIB_SEQ_LDADD@
++ADIOSREAD_SEQ_V1_FLIB=-L${libdir} -ladiosreadf_nompi_v1 @ADIOSREADLIB_SEQ_LDFLAGS@ @ADIOSREADLIB_SEQ_LDADD@
 +
 +#Flags to build code using ADIOS write API in a sequential code (no MPI)
-+ADIOS_SEQ_INC="-I${prefix}/include @ADIOSLIB_SEQ_CPPFLAGS@ @ADIOSLIB_SEQ_CFLAGS@"
-+ADIOS_SEQ_CLIB="-L${libdir} -ladios_nompi @ADIOSLIB_SEQ_LDFLAGS@ @ADIOSLIB_SEQ_LDADD@ @LDFLAGS@ @LIBS@"
-+ADIOS_SEQ_FLIB="-L${libdir} -ladiosf_nompi @ADIOSLIB_SEQ_LDFLAGS@ @ADIOSLIB_SEQ_LDADD@ @LDFLAGS@ @LIBS@"
-+ADIOS_SEQ_V1_FLIB="-L${libdir} -ladiosf_nompi_v1 @ADIOSLIB_SEQ_LDFLAGS@ @ADIOSLIB_SEQ_LDADD@ @LDFLAGS@ @LIBS@"
++ADIOS_SEQ_INC=-I${prefix}/include @ADIOSLIB_SEQ_CPPFLAGS@ @ADIOSLIB_SEQ_CFLAGS@
++ADIOS_SEQ_CLIB=-L${libdir} -ladios_nompi @ADIOSLIB_SEQ_LDFLAGS@ @ADIOSLIB_SEQ_LDADD@ @LDFLAGS@ @LIBS@
++ADIOS_SEQ_FLIB=-L${libdir} -ladiosf_nompi @ADIOSLIB_SEQ_LDFLAGS@ @ADIOSLIB_SEQ_LDADD@ @LDFLAGS@ @LIBS@
++ADIOS_SEQ_V1_FLIB=-L${libdir} -ladiosf_nompi_v1 @ADIOSLIB_SEQ_LDFLAGS@ @ADIOSLIB_SEQ_LDADD@ @LDFLAGS@ @LIBS@
 +
 +#The following flags are not used. It is only for internal utilities of ADIOS, using libadios_internal_nompi.a
-+ADIOS_INT_INC="-I${prefix}/include @ADIOSLIB_INT_CPPFLAGS@ @ADIOSLIB_INT_CFLAGS@"
-+ADIOS_INT_CLIB="-L${libdir} -ladios_internal_nompi @ADIOSLIB_INT_LDFLAGS@ @ADIOSLIB_INT_LDADD@ @LDFLAGS@ @LIBS@"
++ADIOS_INT_INC=-I${prefix}/include @ADIOSLIB_INT_CPPFLAGS@ @ADIOSLIB_INT_CFLAGS@
++ADIOS_INT_CLIB=-L${libdir} -ladios_internal_nompi @ADIOSLIB_INT_LDFLAGS@ @ADIOSLIB_INT_LDADD@ @LDFLAGS@ @LIBS@
 +
-+VERSIONSTRING="@VERSION@"
++VERSIONSTRING=@VERSION@
 +
 +
 +Name: adios

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