[ros-gazebo-ros-pkgs] 05/07: Rebasing patching. Adapted from Jochen work
Leopold Palomo-Avellaneda
leo at alaxarxa.net
Tue Nov 8 14:29:41 UTC 2016
This is an automated email from the git hooks/post-receive script.
lepalom-guest pushed a commit to branch master
in repository ros-gazebo-ros-pkgs.
commit 6725e1af61b639e95f6288cf5946e6d8a72e0023
Author: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
Date: Tue Oct 25 16:50:22 2016 +0200
Rebasing patching. Adapted from Jochen work
---
.../patches/0002-Add-Debian-specific-SONAMEs.patch | 75 ++++++++--------------
.../patches/0003-Add-Debian-specific-SONAMEs.patch | 27 ++++++++
.../patches/0004-Add-Debian-specific-SONAMEs.patch | 24 +++++++
debian/patches/series | 2 +
4 files changed, 78 insertions(+), 50 deletions(-)
diff --git a/debian/patches/0002-Add-Debian-specific-SONAMEs.patch b/debian/patches/0002-Add-Debian-specific-SONAMEs.patch
index 8138829..4533eaa 100644
--- a/debian/patches/0002-Add-Debian-specific-SONAMEs.patch
+++ b/debian/patches/0002-Add-Debian-specific-SONAMEs.patch
@@ -1,18 +1,16 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Mon, 28 Dec 2015 17:14:40 +0100
+From: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
+Date: Tue, 25 Oct 2016 16:43:36 +0200
Subject: Add Debian specific SONAMEs
---
- gazebo_plugins/CMakeLists.txt | 31 +++++++++++++++++++++++++++++++
- gazebo_ros/CMakeLists.txt | 2 ++
- gazebo_ros_control/CMakeLists.txt | 1 +
- 3 files changed, 34 insertions(+)
+ gazebo_plugins/CMakeLists.txt | 33 ++++++++++++++++++++++++++++++++-
+ 1 file changed, 32 insertions(+), 1 deletion(-)
diff --git a/gazebo_plugins/CMakeLists.txt b/gazebo_plugins/CMakeLists.txt
-index 533c65f..6f78e07 100644
+index 2a6a14b..e804522 100644
--- a/gazebo_plugins/CMakeLists.txt
+++ b/gazebo_plugins/CMakeLists.txt
-@@ -146,10 +146,12 @@ target_link_libraries(hokuyo_node
+@@ -154,10 +154,12 @@ target_link_libraries(hokuyo_node
add_library(gazebo_ros_utils src/gazebo_ros_utils.cpp)
target_link_libraries(gazebo_ros_utils ${GAZEBO_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
@@ -25,7 +23,7 @@ index 533c65f..6f78e07 100644
add_executable(camera_synchronizer src/camera_synchronizer.cpp)
add_dependencies(camera_synchronizer ${PROJECT_NAME}_gencfg)
-@@ -165,67 +167,85 @@ add_definitions(-fPIC) # what is this for?
+@@ -173,34 +175,42 @@ add_definitions(-fPIC) # what is this for?
add_library(gazebo_ros_camera_utils src/gazebo_ros_camera_utils.cpp)
add_dependencies(gazebo_ros_camera_utils ${PROJECT_NAME}_gencfg)
target_link_libraries(gazebo_ros_camera_utils ${GAZEBO_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
@@ -40,7 +38,7 @@ index 533c65f..6f78e07 100644
target_link_libraries(gazebo_ros_camera gazebo_ros_camera_utils ${GAZEBO_LIBRARIES} CameraPlugin ${catkin_LIBRARIES})
+set_target_properties(gazebo_ros_camera PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
- if (GAZEBO_VERSION VERSION_GREATER 6.0 OR GAZEBO_VERSION VERSION_EQUAL 6.0)
+ if (NOT GAZEBO_VERSION VERSION_LESS 6.0)
add_library(gazebo_ros_elevator src/gazebo_ros_elevator.cpp)
add_dependencies(gazebo_ros_elevator ${PROJECT_NAME}_gencfg)
target_link_libraries(gazebo_ros_elevator ${GAZEBO_LIBRARIES} ElevatorPlugin ${catkin_LIBRARIES})
@@ -66,13 +64,17 @@ index 533c65f..6f78e07 100644
target_link_libraries(gazebo_ros_gpu_laser ${catkin_LIBRARIES} ${GAZEBO_LIBRARIES} GpuRayPlugin)
+set_target_properties(gazebo_ros_gpu_laser PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
+ if (NOT GAZEBO_VERSION VERSION_LESS 7.3)
+ add_library(gazebo_ros_harness src/gazebo_ros_harness.cpp)
+@@ -211,76 +221,96 @@ endif()
+
add_library(gazebo_ros_laser src/gazebo_ros_laser.cpp)
target_link_libraries(gazebo_ros_laser ${GAZEBO_LIBRARIES} RayPlugin ${catkin_LIBRARIES})
+set_target_properties(gazebo_ros_laser PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
add_library(gazebo_ros_block_laser src/gazebo_ros_block_laser.cpp)
target_link_libraries(gazebo_ros_block_laser ${GAZEBO_LIBRARIES} RayPlugin ${catkin_LIBRARIES})
-+set_target_properties(gazebo_ros_block_laser PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
++set_target_properties(gazebo_ros_block_laser PROPERTIES VERSION${gazebo_plugins_VERSION} SOVERSION "0d")
add_library(gazebo_ros_p3d src/gazebo_ros_p3d.cpp)
target_link_libraries(gazebo_ros_p3d ${GAZEBO_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
@@ -87,7 +89,7 @@ index 533c65f..6f78e07 100644
+set_target_properties(gazebo_ros_f3d PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
add_library(gazebo_ros_bumper src/gazebo_ros_bumper.cpp)
- add_dependencies(gazebo_ros_bumper gazebo_msgs_gencpp)
+ add_dependencies(gazebo_ros_bumper ${catkin_EXPORTED_TARGETS})
target_link_libraries(gazebo_ros_bumper ${GAZEBO_LIBRARIES} ${Boost_LIBRARIES} ContactPlugin ${catkin_LIBRARIES})
+set_target_properties(gazebo_ros_bumper PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
@@ -105,20 +107,20 @@ index 533c65f..6f78e07 100644
+set_target_properties(gazebo_ros_force PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
add_library(gazebo_ros_joint_trajectory src/gazebo_ros_joint_trajectory.cpp)
- add_dependencies(gazebo_ros_joint_trajectory gazebo_msgs_gencpp)
+ add_dependencies(gazebo_ros_joint_trajectory ${catkin_EXPORTED_TARGETS})
target_link_libraries(gazebo_ros_joint_trajectory ${GAZEBO_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
+-
+set_target_properties(gazebo_ros_joint_trajectory PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
-
add_library(gazebo_ros_joint_state_publisher src/gazebo_ros_joint_state_publisher.cpp)
-@@ -233,36 +253,46 @@ set_target_properties(gazebo_ros_joint_state_publisher PROPERTIES LINK_FLAGS "${
+ set_target_properties(gazebo_ros_joint_state_publisher PROPERTIES LINK_FLAGS "${ld_flags}")
set_target_properties(gazebo_ros_joint_state_publisher PROPERTIES COMPILE_FLAGS "${cxx_flags}")
- add_dependencies(gazebo_ros_joint_state_publisher gazebo_msgs_gencpp)
- target_link_libraries(gazebo_ros_joint_state_publisher ${GAZEBO_LIBRARIES} ${SDFormat_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
+set_target_properties(gazebo_ros_joint_state_publisher PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
+ add_dependencies(gazebo_ros_joint_state_publisher ${catkin_EXPORTED_TARGETS})
+ target_link_libraries(gazebo_ros_joint_state_publisher ${GAZEBO_LIBRARIES} ${SDFormat_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
add_library(gazebo_ros_joint_pose_trajectory src/gazebo_ros_joint_pose_trajectory.cpp)
- add_dependencies(gazebo_ros_joint_pose_trajectory gazebo_msgs_gencpp)
+ add_dependencies(gazebo_ros_joint_pose_trajectory ${catkin_EXPORTED_TARGETS})
target_link_libraries(gazebo_ros_joint_pose_trajectory ${GAZEBO_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
+set_target_properties(gazebo_ros_joint_pose_trajectory PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
@@ -156,9 +158,13 @@ index 533c65f..6f78e07 100644
target_link_libraries(gazebo_ros_range ${catkin_LIBRARIES} ${GAZEBO_LIBRARIES} ${Boost_LIBRARIES} RayPlugin)
+set_target_properties(gazebo_ros_range PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
+ add_library(gazebo_ros_vacuum_gripper src/gazebo_ros_vacuum_gripper.cpp)
+ target_link_libraries(gazebo_ros_vacuum_gripper ${GAZEBO_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
++set_target_properties(gazebo_ros_vacuum_gripper PROPERTIES VERSION ${gazebo_plugins_VERSION} SOVERSION "0d")
+
##
## Add your new plugin here
-@@ -271,6 +301,7 @@ target_link_libraries(gazebo_ros_range ${catkin_LIBRARIES} ${GAZEBO_LIBRARIES} $
+@@ -289,6 +319,7 @@ target_link_libraries(gazebo_ros_vacuum_gripper ${GAZEBO_LIBRARIES} ${catkin_LIB
## Template
add_library(gazebo_ros_template src/gazebo_ros_template.cpp)
target_link_libraries(gazebo_ros_template ${GAZEBO_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
@@ -166,34 +172,3 @@ index 533c65f..6f78e07 100644
install(TARGETS
hokuyo_node
-diff --git a/gazebo_ros/CMakeLists.txt b/gazebo_ros/CMakeLists.txt
-index 502686d..e514c2f 100644
---- a/gazebo_ros/CMakeLists.txt
-+++ b/gazebo_ros/CMakeLists.txt
-@@ -73,12 +73,14 @@ add_dependencies(gazebo_ros_api_plugin gazebo_msgs_gencpp ${PROJECT_NAME}_gencfg
- set_target_properties(gazebo_ros_api_plugin PROPERTIES LINK_FLAGS "${ld_flags}")
- set_target_properties(gazebo_ros_api_plugin PROPERTIES COMPILE_FLAGS "${cxx_flags}")
- target_link_libraries(gazebo_ros_api_plugin ${GAZEBO_LIBRARIES} ${SDFormat_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${TinyXML_LIBRARIES})
-+set_target_properties(gazebo_ros_api_plugin PROPERTIES VERSION ${gazebo_ros_VERSION} SOVERSION "0d")
-
- add_library(gazebo_ros_paths_plugin src/gazebo_ros_paths_plugin.cpp)
- add_dependencies(gazebo_ros_paths_plugin gazebo_msgs_gencpp ${PROJECT_NAME}_gencfg) # wait for gazebo_msgs to be built
- set_target_properties(gazebo_ros_paths_plugin PROPERTIES COMPILE_FLAGS "${cxx_flags}")
- set_target_properties(gazebo_ros_paths_plugin PROPERTIES LINK_FLAGS "${ld_flags}")
- target_link_libraries(gazebo_ros_paths_plugin ${GAZEBO_LIBRARIES} ${SDFormat_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
-+set_target_properties(gazebo_ros_paths_plugin PROPERTIES VERSION ${gazebo_ros_VERSION} SOVERSION "0d")
-
- # Install Gazebo System Plugins
- install(TARGETS gazebo_ros_api_plugin gazebo_ros_paths_plugin
-diff --git a/gazebo_ros_control/CMakeLists.txt b/gazebo_ros_control/CMakeLists.txt
-index 75145c9..5e9970c 100644
---- a/gazebo_ros_control/CMakeLists.txt
-+++ b/gazebo_ros_control/CMakeLists.txt
-@@ -40,6 +40,7 @@ include_directories(include
- ## Libraries
- add_library(${PROJECT_NAME} src/gazebo_ros_control_plugin.cpp)
- target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${GAZEBO_LIBRARIES})
-+set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${gazebo_ros_control_VERSION} SOVERSION "0d")
-
- add_library(default_robot_hw_sim src/default_robot_hw_sim.cpp)
- target_link_libraries(default_robot_hw_sim ${catkin_LIBRARIES} ${GAZEBO_LIBRARIES})
diff --git a/debian/patches/0003-Add-Debian-specific-SONAMEs.patch b/debian/patches/0003-Add-Debian-specific-SONAMEs.patch
new file mode 100644
index 0000000..f747c19
--- /dev/null
+++ b/debian/patches/0003-Add-Debian-specific-SONAMEs.patch
@@ -0,0 +1,27 @@
+From: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
+Date: Tue, 25 Oct 2016 16:46:07 +0200
+Subject: Add Debian specific SONAMEs
+
+---
+ gazebo_ros/CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/gazebo_ros/CMakeLists.txt b/gazebo_ros/CMakeLists.txt
+index 66a59c7..cf6947c 100644
+--- a/gazebo_ros/CMakeLists.txt
++++ b/gazebo_ros/CMakeLists.txt
+@@ -83,12 +83,14 @@ add_dependencies(gazebo_ros_api_plugin ${${PROJECT_NAME}_EXPORTED_TARGETS} ${cat
+ set_target_properties(gazebo_ros_api_plugin PROPERTIES LINK_FLAGS "${ld_flags}")
+ set_target_properties(gazebo_ros_api_plugin PROPERTIES COMPILE_FLAGS "${cxx_flags}")
+ target_link_libraries(gazebo_ros_api_plugin ${GAZEBO_LIBRARIES} ${SDFormat_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${TinyXML_LIBRARIES})
++set_target_properties(gazebo_ros_api_plugin PROPERTIES VERSION ${gazebo_ros_VERSION} SOVERSION "0d")
+
+ add_library(gazebo_ros_paths_plugin src/gazebo_ros_paths_plugin.cpp)
+ add_dependencies(gazebo_ros_paths_plugin ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
+ set_target_properties(gazebo_ros_paths_plugin PROPERTIES COMPILE_FLAGS "${cxx_flags}")
+ set_target_properties(gazebo_ros_paths_plugin PROPERTIES LINK_FLAGS "${ld_flags}")
+ target_link_libraries(gazebo_ros_paths_plugin ${GAZEBO_LIBRARIES} ${SDFormat_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
++set_target_properties(gazebo_ros_paths_plugin PROPERTIES VERSION ${gazebo_ros_VERSION} SOVERSION "0d")
+
+ # Install Gazebo System Plugins
+ install(TARGETS gazebo_ros_api_plugin gazebo_ros_paths_plugin
diff --git a/debian/patches/0004-Add-Debian-specific-SONAMEs.patch b/debian/patches/0004-Add-Debian-specific-SONAMEs.patch
new file mode 100644
index 0000000..f59336e
--- /dev/null
+++ b/debian/patches/0004-Add-Debian-specific-SONAMEs.patch
@@ -0,0 +1,24 @@
+From: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
+Date: Tue, 25 Oct 2016 16:48:09 +0200
+Subject: Add Debian specific SONAMEs
+
+---
+ gazebo_ros_control/CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/gazebo_ros_control/CMakeLists.txt b/gazebo_ros_control/CMakeLists.txt
+index cf228b0..37e05b9 100644
+--- a/gazebo_ros_control/CMakeLists.txt
++++ b/gazebo_ros_control/CMakeLists.txt
+@@ -51,9 +51,11 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GAZEBO_CXX_FLAGS}")
+ ## Libraries
+ add_library(${PROJECT_NAME} src/gazebo_ros_control_plugin.cpp)
+ target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${GAZEBO_LIBRARIES})
++set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${gazebo_ros_control_VERSION} SOVERSION "0d")
+
+ add_library(default_robot_hw_sim src/default_robot_hw_sim.cpp)
+ target_link_libraries(default_robot_hw_sim ${catkin_LIBRARIES} ${GAZEBO_LIBRARIES})
++set_target_properties(default_robot_hw_sim PROPERTIES VERSION ${gazebo_ros_control_VERSION} SOVERSION "0d")
+
+ ## Install
+ install(TARGETS ${PROJECT_NAME} default_robot_hw_sim
diff --git a/debian/patches/series b/debian/patches/series
index c4a5f1f..544f9f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
0001-Add-CMakeLists.txt.patch
0002-Add-Debian-specific-SONAMEs.patch
+0003-Add-Debian-specific-SONAMEs.patch
+0004-Add-Debian-specific-SONAMEs.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-gazebo-ros-pkgs.git
More information about the debian-science-commits
mailing list