[catkin] 01/01: Add patch for generated pkg-config files

[Jochen Sprickerhof]

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

jspricke-guest pushed a commit to branch master
in repository catkin.

commit 8cb1e7a9d06ab4f565ce9830a343bdea6dfbdcc2
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Fri Dec 12 15:19:51 2014 +0100

    Add patch for generated pkg-config files
---
 ...Don-t-add-default-paths-to-pkg-config-file.patch | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 2 files changed, 22 insertions(+)

diff --git a/debian/patches/0003-Don-t-add-default-paths-to-pkg-config-file.patch b/debian/patches/0003-Don-t-add-default-paths-to-pkg-config-file.patch
new file mode 100644
index 0000000..9d48c3e
--- /dev/null
+++ b/debian/patches/0003-Don-t-add-default-paths-to-pkg-config-file.patch
@@ -0,0 +1,21 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Fri, 12 Dec 2014 15:15:49 +0100
+Subject: Don't add default paths to pkg-config file
+
+---
+ cmake/em/pkg.pc.em | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/em/pkg.pc.em b/cmake/em/pkg.pc.em
+index a4f7257..38d5c73 100644
+--- a/cmake/em/pkg.pc.em
++++ b/cmake/em/pkg.pc.em
+@@ -3,6 +3,6 @@ prefix=@PROJECT_SPACE_DIR
+ Name: @(CATKIN_PACKAGE_PREFIX + PROJECT_NAME)
+ Description: Description of @PROJECT_NAME
+ Version: @PROJECT_VERSION
+-Cflags: @(' '.join(['-I%s' % include for include in PROJECT_PKG_CONFIG_INCLUDE_DIRS]))
+-Libs: -L at PROJECT_SPACE_DIR/lib @(' '.join(PKG_CONFIG_LIBRARIES_WITH_PREFIX))
++Cflags: @(' '.join(['-I%s' % include for include in PROJECT_PKG_CONFIG_INCLUDE_DIRS if not include.startswith('/usr/include')]))
++Libs: @('-L%s/lib' % PROJECT_SPACE_DIR if not PROJECT_SPACE_DIR.startswith('/usr') else '') @(' '.join(PKG_CONFIG_LIBRARIES_WITH_PREFIX))
+ Requires: @(PROJECT_CATKIN_DEPENDS)
diff --git a/debian/patches/series b/debian/patches/series
index a9f8c48..947cf0a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Remove-NO_DEFAULT_PATH-and-NO_CMAKE_FIND_ROOT_PATH-f.patch
 0002-Add-usr-as-default-workspace-path.patch
+0003-Don-t-add-default-paths-to-pkg-config-file.patch

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