[emos] 19/37: WIP: update pkgconfig patch

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository emos.

commit 6db8b79c1e727a30905e8d94e83403b9bea74cb5
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon May 25 21:33:34 2015 +0100

    WIP: update pkgconfig patch
---
 debian/patches/pkgconfig.patch | 143 ++++++++++++++++++++++++++---------------
 1 file changed, 92 insertions(+), 51 deletions(-)

diff --git a/debian/patches/pkgconfig.patch b/debian/patches/pkgconfig.patch
index 48f4253..ff9ac5c 100644
--- a/debian/patches/pkgconfig.patch
+++ b/debian/patches/pkgconfig.patch
@@ -3,60 +3,101 @@ Author: Alastair McKinstry <mckinstry at debian.org>
 Last-Updated: 2015-05-13
 Forwarded: no
 
-# Add a pkgconfig directory to emoslib, which installs emos.pc and
-# emosR64.pc files.
-# -- Alastair McKinstry, 2009-05-16
-diff -Nur -x '*.orig' -x '*~' emos/pkgconfig/emos.pc.in emos.new/pkgconfig/emos.pc.in
---- emos/pkgconfig/emos.pc.in	1970-01-01 01:00:00.000000000 +0100
-+++ emos.new/pkgconfig/emos.pc.in	2009-04-17 14:56:25.000000000 +0100
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
+Index: emoslib-000403+dfsg.1/CMakeLists.txt
+===================================================================
+--- emoslib-000403+dfsg.1.orig/CMakeLists.txt
++++ emoslib-000403+dfsg.1/CMakeLists.txt
+@@ -129,6 +129,13 @@ endif()
+ 
+ ecbuild_generate_config_headers( DESTINATION ${INSTALL_INCLUDE_DIR}/libemos )
+ 
++ecbuild_pkgconfig(NAME emos 
++                  DESCRIPTION "ECMWF Interpolation and query library" 
++                  URL https://software.ecmwf.int/wiki/display/EMOS/Emoslib)
++ecbuild_pkgconfig(NAME emosR64
++                  DESCRIPTION "ECMWF Interpolation and query library" 
++                  URL https://software.ecmwf.int/wiki/display/EMOS/Emoslib)
++
+ configure_file( libemos_config.h.in  libemos_config.h  @ONLY )
+ configure_file( libemos_version.h.in libemos_version.h @ONLY )
+ configure_file( libemos_version.c.in libemos_version.c @ONLY )
+Index: emoslib-000403+dfsg.1/cmake/emos.pc.in
+===================================================================
+--- /dev/null
++++ emoslib-000403+dfsg.1/cmake/emos.pc.in
+@@ -0,0 +1,35 @@
++# This pkg-config file is generated by ecbuild_pkgconfig()
++# with template ecbuild/cmake/pkg-config.pc.in
++
++git_tag=@PKGCONFIG_GIT_TAG@
++
++prefix=@CMAKE_INSTALL_PREFIX@
 +exec_prefix=${prefix}
-+libdir=@libdir@
++libdir=${prefix}/@INSTALL_LIB_DIR@
++includedir=${prefix}/@INSTALL_INCLUDE_DIR@
++bindir=${prefix}/@INSTALL_BIN_DIR@
++fmoddir=${prefix}/@INSTALL_INCLUDE_DIR@
++
++CC=@CMAKE_C_COMPILER@
++CXX=@CMAKE_CXX_COMPILER@
++FC=@CMAKE_Fortran_COMPILER@
++
++rpath=@RPATH_FLAG@${libdir}
++
++libs=-L${libdir} -lemos
++
++libs_private=-lemos -lgfortran -lm
 +
++cflags=-I${prefix}/include/pbio -I${prefix}/include/interpolation -I${prefix}/include/gribex
++ at PKGCONFIG_VARIABLES@
++#====================================================================
 +Name: emos
-+Description: ECMWF interpolation library 
-+Version: @VERSION@
-+Libs:  -L${libdir} -lemos 
-+Libs.private: -$L{libdir} -lemos -lgfortran -lm
-+CFlags: -I${prefix}/include/pbio -I${prefix}/include/interpolation -I${prefix}/include/gribex
-diff -Nur -x '*.orig' -x '*~' emos/pkgconfig/emosR64.pc.in emos.new/pkgconfig/emosR64.pc.in
---- emos/pkgconfig/emosR64.pc.in	1970-01-01 01:00:00.000000000 +0100
-+++ emos.new/pkgconfig/emosR64.pc.in	2009-04-17 14:56:39.000000000 +0100
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
++Description: ECMWF Interpolation library
++URL: @PKGCONFIG_URL@
++Version: @PKGCONFIG_VERSION@
++Libs: ${libs}
++Libs.private: ${libs_private}
++Requires: @PKGCONFIG_REQUIRES@
++Requires.private: @PKGCONFIG_REQUIRES_PRIVATE@
++Cflags: ${cflags}
++#====================================================================
+Index: emoslib-000403+dfsg.1/cmake/emosR64.pc.in
+===================================================================
+--- /dev/null
++++ emoslib-000403+dfsg.1/cmake/emosR64.pc.in
+@@ -0,0 +1,35 @@
++# This pkg-config file is generated by ecbuild_pkgconfig()
++# with template ecbuild/cmake/pkg-config.pc.in
++
++git_tag=@PKGCONFIG_GIT_TAG@
++
++prefix=@CMAKE_INSTALL_PREFIX@
 +exec_prefix=${prefix}
-+libdir=@libdir@
++libdir=${prefix}/@INSTALL_LIB_DIR@
++includedir=${prefix}/@INSTALL_INCLUDE_DIR@
++bindir=${prefix}/@INSTALL_BIN_DIR@
++fmoddir=${prefix}/@INSTALL_INCLUDE_DIR@
++
++CC=@CMAKE_C_COMPILER@
++CXX=@CMAKE_CXX_COMPILER@
++FC=@CMAKE_Fortran_COMPILER@
++
++rpath=@RPATH_FLAG@${libdir}
++
++libs=-L${libdir} -lemosR64
++
++libs_private=-lemosR64 -lgfortran -lm
 +
++cflags=-I${prefix}/include/pbio -I${prefix}/include/interpolation -I${prefix}/include/gribex
++ at PKGCONFIG_VARIABLES@
++#====================================================================
 +Name: emosR64
-+Description: ECMWF interpolation library 
-+Version: @VERSION@
-+Libs:  -L${libdir} -lemosR64
-+Libs.private: -$L{libdir} -lemosR64 -lgfortran -lm
-+CFlags: -I${prefix}/include/pbio -I${prefix}/include/interpolation -I${prefix}/include/gribex
-diff -Nur -x '*.orig' -x '*~' emos/pkgconfig/Makefile.in emos.new/pkgconfig/Makefile.in
---- emos/pkgconfig/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-+++ emos.new/pkgconfig/Makefile.in	2009-04-17 21:53:44.000000000 +0100
-@@ -0,0 +1,22 @@
-+#
-+#                                 Makefile for libemos/pkgconfig
-+#
-+#
-+#
-+INSTALL = @INSTALL@
-+INSTALL_DATA= @INSTALL_DATA@
-+prefix=@prefix@
-+pkgconfigdir=@libdir@/pkgconfig
-+
-+TARGETS      = all clean install
-+
-+all:  
-+
-+clean:
-+
-+install:
-+	mkdir -p $(pkgconfigdir)
-+	$(INSTALL_DATA) emos.pc         $(pkgconfigdir)
-+	$(INSTALL_DATA) emosR64.pc      $(pkgconfigdir)
-+
-+.PHONY: all clean install
++Description: ECMWF Interpolation library
++URL: @PKGCONFIG_URL@
++Version: @PKGCONFIG_VERSION@
++Libs: ${libs}
++Libs.private: ${libs_private}
++Requires: @PKGCONFIG_REQUIRES@
++Requires.private: @PKGCONFIG_REQUIRES_PRIVATE@
++Cflags: ${cflags}
++#====================================================================

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