[rtt-ros-integration] 04/16: Added SOVERSION patch to rtt_ros
Leopold Palomo-Avellaneda
leo at alaxarxa.net
Mon Jun 8 16:08:40 UTC 2015
This is an automated email from the git hooks/post-receive script.
lepalom-guest pushed a commit to branch master
in repository rtt-ros-integration.
commit dd479a5019f65e3deb19597cc08a296fd260dc0d
Author: Leopold Palomo-Avellaneda <leopold.palomo at upc.edu>
Date: Tue Jun 2 09:23:37 2015 +0200
Added SOVERSION patch to rtt_ros
---
...001-Added-CMakeLists-to-build-the-package.patch | 14 ++++++++++----
.../0002-Needed-CMakeLists-for-the-dir.patch | 2 +-
debian/patches/0003-Added-SOVERSION-info.patch | 22 ++++++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/debian/patches/0001-Added-CMakeLists-to-build-the-package.patch b/debian/patches/0001-Added-CMakeLists-to-build-the-package.patch
index e5e556e..47ca4b3 100644
--- a/debian/patches/0001-Added-CMakeLists-to-build-the-package.patch
+++ b/debian/patches/0001-Added-CMakeLists-to-build-the-package.patch
@@ -3,20 +3,26 @@ Date: Mon, 27 Apr 2015 13:02:54 +0200
Subject: Added CMakeLists to build the package
---
- CMakeLists.txt | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
+ CMakeLists.txt | 24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
create mode 100644 CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
-index 0000000..2334abe
+index 0000000..46e92e0
--- /dev/null
+++ b/CMakeLists.txt
-@@ -0,0 +1,18 @@
+@@ -0,0 +1,24 @@
+cmake_minimum_required(VERSION 2.8.3)
+
+PROJECT(rtt-ros-integration)
+
++SET( RTT_ROS_VERSION 2.8.1 )
++STRING( REGEX MATCHALL "[0-9]+" RTT_ROS_VERSIONS ${RTT_ROS_VERSION} )
++LIST( GET RTT_ROS_VERSIONS 0 RTT_ROS_VERSION_MAJOR)
++LIST( GET RTT_ROS_VERSIONS 1 RTT_ROS_VERSION_MINOR)
++LIST( GET RTT_ROS_VERSIONS 2 RTT_ROS_VERSION_PATCH)
++
+add_subdirectory(rtt_ros)
+add_subdirectory(rtt_roscomm)
+add_subdirectory(rtt_actionlib)
diff --git a/debian/patches/0002-Needed-CMakeLists-for-the-dir.patch b/debian/patches/0002-Needed-CMakeLists-for-the-dir.patch
index 163f183..015c2cc 100644
--- a/debian/patches/0002-Needed-CMakeLists-for-the-dir.patch
+++ b/debian/patches/0002-Needed-CMakeLists-for-the-dir.patch
@@ -9,7 +9,7 @@ Subject: Needed CMakeLists for the dir
diff --git a/typekits/CMakeLists.txt b/typekits/CMakeLists.txt
new file mode 100644
-index 0000000..ad15115
+index 0000000..0ed99c2
--- /dev/null
+++ b/typekits/CMakeLists.txt
@@ -0,0 +1,15 @@
diff --git a/debian/patches/0003-Added-SOVERSION-info.patch b/debian/patches/0003-Added-SOVERSION-info.patch
new file mode 100644
index 0000000..9206d67
--- /dev/null
+++ b/debian/patches/0003-Added-SOVERSION-info.patch
@@ -0,0 +1,22 @@
+From: Leopold Palomo-Avellaneda <leopold.palomo at upc.edu>
+Date: Tue, 2 Jun 2015 09:22:30 +0200
+Subject: Added SOVERSION info
+
+---
+ rtt_ros/CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/rtt_ros/CMakeLists.txt b/rtt_ros/CMakeLists.txt
+index 2b3c4e7..826b4e0 100644
+--- a/rtt_ros/CMakeLists.txt
++++ b/rtt_ros/CMakeLists.txt
+@@ -19,6 +19,9 @@ target_link_libraries(rtt_ros
+ ${catkin_LIBRARIES}
+ ${LIBXML2_LIBRARIES}
+ )
++set_target_properties( rtt_ros PROPERTIES
++ SOVERSION "${RTT_ROS_VERSION_MAJOR}.${RTT_ROS_VERSION_MINOR}"
++ VERSION "${RTT_ROS_VERSION}")
+
+ orocos_service(rtt_ros_service src/rtt_ros_service.cpp)
+ target_link_libraries(rtt_ros_service
diff --git a/debian/patches/series b/debian/patches/series
index 27f734a..9ab5735 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
0001-Added-CMakeLists-to-build-the-package.patch
0002-Needed-CMakeLists-for-the-dir.patch
+0003-Added-SOVERSION-info.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/orocos/rtt-ros-integration.git
More information about the debian-science-commits
mailing list