[ros-random-numbers] 03/04: Refresh patches

Jochen Sprickerhof jspricke-guest at moszumanska.debian.org
Sun Jul 10 21:06:43 UTC 2016


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

jspricke-guest pushed a commit to annotated tag debian/0.3.1-1
in repository ros-random-numbers.

commit 2f19191ebad233df54730346cd53afb49f92f041
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sun Jul 10 22:59:21 2016 +0200

    Refresh patches
---
 .../0001-Add-Debian-specific-SOVERSION.patch       |  4 ++--
 ...002-Use-catkin-variables-for-install-dirs.patch | 27 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/debian/patches/0001-Add-Debian-specific-SOVERSION.patch b/debian/patches/0001-Add-Debian-specific-SOVERSION.patch
index 65bc786..ebf0175 100644
--- a/debian/patches/0001-Add-Debian-specific-SOVERSION.patch
+++ b/debian/patches/0001-Add-Debian-specific-SOVERSION.patch
@@ -7,7 +7,7 @@ Subject: Add Debian specific SOVERSION
  1 file changed, 1 insertion(+)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a704301..45a7799 100644
+index d23bb19..c1a8778 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -17,6 +17,7 @@ add_library(${PROJECT_NAME}
@@ -17,4 +17,4 @@ index a704301..45a7799 100644
 +set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${random_numbers_VERSION} SOVERSION "0d")
  
  install(TARGETS ${PROJECT_NAME}
-         ARCHIVE DESTINATION lib
+         ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
diff --git a/debian/patches/0002-Use-catkin-variables-for-install-dirs.patch b/debian/patches/0002-Use-catkin-variables-for-install-dirs.patch
deleted file mode 100644
index 3b3323e..0000000
--- a/debian/patches/0002-Use-catkin-variables-for-install-dirs.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Mon, 23 Nov 2015 08:12:52 +0100
-Subject: Use catkin variables for install dirs
-
----
- CMakeLists.txt | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 45a7799..c1a8778 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -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/${PROJECT_NAME}/
-+        DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})
diff --git a/debian/patches/series b/debian/patches/series
index 7263444..6eac731 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-Add-Debian-specific-SOVERSION.patch
-0002-Use-catkin-variables-for-install-dirs.patch

-- 
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