[ros-ros-control] 02/03: Rebase patches
Jochen Sprickerhof
jspricke at moszumanska.debian.org
Sun Dec 4 16:05:57 UTC 2016
This is an automated email from the git hooks/post-receive script.
jspricke pushed a commit to branch master
in repository ros-ros-control.
commit c65625d4db434b889a7e1fa4ae7bbae918740aa2
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date: Sun Dec 4 16:56:35 2016 +0100
Rebase patches
---
debian/patches/0002-Add-Debian-specific-SOVERSION.patch | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/debian/patches/0002-Add-Debian-specific-SOVERSION.patch b/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
index 7eb6b1d..7eb5899 100644
--- a/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
+++ b/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
@@ -8,10 +8,10 @@ Subject: Add Debian specific SOVERSION
2 files changed, 3 insertions(+)
diff --git a/controller_manager/CMakeLists.txt b/controller_manager/CMakeLists.txt
-index d44f110..c644344 100644
+index ba9ed9f..925f6c7 100644
--- a/controller_manager/CMakeLists.txt
+++ b/controller_manager/CMakeLists.txt
-@@ -21,6 +21,7 @@ add_library(${PROJECT_NAME}
+@@ -23,6 +23,7 @@ add_library(${PROJECT_NAME}
include/controller_manager/controller_loader.h
)
target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
@@ -20,10 +20,10 @@ index d44f110..c644344 100644
if(catkin_EXPORTED_TARGETS)
add_dependencies(${PROJECT_NAME} ${catkin_EXPORTED_TARGETS})
diff --git a/transmission_interface/CMakeLists.txt b/transmission_interface/CMakeLists.txt
-index bf0e823..2b16b27 100644
+index 91af3bb..f92de2b 100644
--- a/transmission_interface/CMakeLists.txt
+++ b/transmission_interface/CMakeLists.txt
-@@ -40,6 +40,7 @@ add_library(${PROJECT_NAME}_parser
+@@ -38,6 +38,7 @@ add_library(${PROJECT_NAME}_parser
src/transmission_parser.cpp include/transmission_interface/transmission_parser.h
)
target_link_libraries(${PROJECT_NAME}_parser ${catkin_LIBRARIES} ${TinyXML_LIBRARIES})
@@ -31,7 +31,7 @@ index bf0e823..2b16b27 100644
# Transmission loader library
-@@ -51,6 +52,7 @@ target_link_libraries(${PROJECT_NAME}_loader
+@@ -49,6 +50,7 @@ target_link_libraries(${PROJECT_NAME}_loader
${PROJECT_NAME}_parser
${catkin_LIBRARIES}
${TinyXML_LIBRARIES})
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-ros-control.git
More information about the debian-science-commits
mailing list