[ros-random-numbers] 01/01: Fix patch

Jochen Sprickerhof jspricke-guest at moszumanska.debian.org
Mon Nov 23 07:19:50 UTC 2015


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

jspricke-guest pushed a commit to branch master
in repository ros-random-numbers.

commit 18b345ee5d6075d4ffe1bd0d52a273bbcd1b076e
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Mon Nov 23 08:17:31 2015 +0100

    Fix patch
---
 .../0002-Use-catkin-variables-for-install-dirs.patch  | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/debian/patches/0002-Use-catkin-variables-for-install-dirs.patch b/debian/patches/0002-Use-catkin-variables-for-install-dirs.patch
index 6ac4d40..3b3323e 100644
--- a/debian/patches/0002-Use-catkin-variables-for-install-dirs.patch
+++ b/debian/patches/0002-Use-catkin-variables-for-install-dirs.patch
@@ -3,24 +3,25 @@ Date: Mon, 23 Nov 2015 08:12:52 +0100
 Subject: Use catkin variables for install dirs
 
 ---
- CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ CMakeLists.txt | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 45a7799..ae064a1 100644
+index 45a7799..c1a8778 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -20,10 +20,10 @@ target_link_libraries(${PROJECT_NAME} ${Boost_LIBRARIES})
+@@ -20,10 +20,8 @@ target_link_libraries(${PROJECT_NAME} ${Boost_LIBRARIES})
  set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${random_numbers_VERSION} SOVERSION "0d")
  
  install(TARGETS ${PROJECT_NAME}
 -        ARCHIVE DESTINATION lib
 -        LIBRARY DESTINATION lib)
+-
+-install(DIRECTORY include/
+-        DESTINATION include
+-        FILES_MATCHING PATTERN "*.h")
 +        ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
 +        LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})
  
- install(DIRECTORY include/
--        DESTINATION include
-+        DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
-         FILES_MATCHING PATTERN "*.h")
- 
++install(DIRECTORY include/${PROJECT_NAME}/
++        DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})

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



More information about the debian-science-commits mailing list