[ignition-common] 01/01: Add a patch to fix installation path

Jose Luis Rivero jrivero-guest at moszumanska.debian.org
Mon Jan 30 23:38:33 UTC 2017


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

jrivero-guest pushed a commit to branch master
in repository ignition-common.

commit 45d9451a68fb4f0fbffd7c186a990ed47bb48ba5
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Mon Jan 30 23:38:06 2017 +0000

    Add a patch to fix installation path
---
 debian/patches/0005_fix_install_paths.patch | 18 ++++++++++++++++++
 debian/patches/series                       |  5 +----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/debian/patches/0005_fix_install_paths.patch b/debian/patches/0005_fix_install_paths.patch
new file mode 100644
index 0000000..48f6bb4
--- /dev/null
+++ b/debian/patches/0005_fix_install_paths.patch
@@ -0,0 +1,18 @@
+Description: Fix installation paths
+Author: Jose Luis Rivero <jrivero at osrfoundation.org>
+Origin: upstream, https://bitbucket.org/ignitionrobotics/ign-common/pull-requests/14
+
+diff --git a/include/ignition/common/CMakeLists.txt b/include/ignition/common/CMakeLists.txt
+index 0cdfdfb..bbfd8d4 100644
+--- a/include/ignition/common/CMakeLists.txt
++++ b/include/ignition/common/CMakeLists.txt
+@@ -58,5 +58,7 @@ endforeach()
+ configure_file (${CMAKE_CURRENT_SOURCE_DIR}/ign_auto_headers.hh.in
+   ${CMAKE_CURRENT_BINARY_DIR}/${IGN_PROJECT_NAME}.hh)
+ 
+-ign_install_includes("" ${CMAKE_CURRENT_BINARY_DIR}/${IGN_PROJECT_NAME}.hh)
+-ign_install_includes(${IGN_PROJECT_NAME} ${headers})
++
++
++ign_install_includes("${INCLUDE_INSTALL_DIR_POSTFIX}/ignition" ${CMAKE_CURRENT_BINARY_DIR}/${IGN_PROJECT_NAME}.hh)
++ign_install_includes("${INCLUDE_INSTALL_DIR_POSTFIX}/ignition/${IGN_PROJECT_NAME}" ${headers})
diff --git a/debian/patches/series b/debian/patches/series
index c3440c8..0ad533b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-0001_use_system_gtest.patch
-0002_respect_cflags.patch
-0003_use_c++11_in_gtest.patch
-0004_exclude_exception_test.patch
+0005_fix_install_paths.patch

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



More information about the debian-science-commits mailing list