[robot-model] 01/01: Refresh patches

Jochen Sprickerhof jspricke-guest at moszumanska.debian.org
Sun Sep 13 16:33:13 UTC 2015


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

jspricke-guest pushed a commit to branch master
in repository robot-model.

commit fc51480cad661696e8961da23016ccc29a1ba4f9
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sun Sep 13 18:33:00 2015 +0200

    Refresh 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 56d1d7f..a1eb6f0 100644
--- a/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
+++ b/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
@@ -29,17 +29,17 @@ index 43ed0c8..6366507 100644
  set_target_properties(${PROJECT_NAME}
    PROPERTIES COMPILER_FLAGS "${COLLADA_DOM_CFLAGS_OTHER}"
 diff --git a/collada_urdf/CMakeLists.txt b/collada_urdf/CMakeLists.txt
-index 0e301e9..cd7a2b2 100644
+index 524f2e9..756c39c 100644
 --- a/collada_urdf/CMakeLists.txt
 +++ b/collada_urdf/CMakeLists.txt
-@@ -64,6 +64,7 @@ target_link_libraries(${PROJECT_NAME} ${TinyXML_LIBRARIES} ${catkin_LIBRARIES} $
+@@ -58,6 +58,7 @@ target_link_libraries(${PROJECT_NAME} ${TinyXML_LIBRARIES} ${catkin_LIBRARIES} $
    ${Boost_LIBRARIES} ${ASSIMP_LIBRARIES})
  set_target_properties(${PROJECT_NAME} PROPERTIES COMPILER_FLAGS "${ASSIMP_CXX_FLAGS} ${ASSIMP_CFLAGS_OTHER}")
  set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "${ASSIMP_LINK_FLAGS}") 
 +set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${collada_urdf_VERSION} SOVERSION "0d")
  
  add_executable(urdf_to_collada src/urdf_to_collada.cpp)
- target_link_libraries(urdf_to_collada ${catkin_LIBRARIES} ${PCRECPP_LIBRARIES} ${COLLADA_DOM_LIBRARIES}
+ target_link_libraries(urdf_to_collada ${catkin_LIBRARIES} ${COLLADA_DOM_LIBRARIES}  
 diff --git a/kdl_parser/CMakeLists.txt b/kdl_parser/CMakeLists.txt
 index eedaf8a..a101f64 100644
 --- a/kdl_parser/CMakeLists.txt
@@ -53,13 +53,13 @@ index eedaf8a..a101f64 100644
  add_executable(check_kdl_parser src/check_kdl_parser.cpp )
  target_link_libraries(check_kdl_parser ${PROJECT_NAME})
 diff --git a/urdf/CMakeLists.txt b/urdf/CMakeLists.txt
-index 6e0a655..d196e42 100644
+index ae7437e..1a5c582 100644
 --- a/urdf/CMakeLists.txt
 +++ b/urdf/CMakeLists.txt
 @@ -34,6 +34,7 @@ link_directories(${catkin_LIBRARY_DIRS})
  
  add_library(${PROJECT_NAME} src/model.cpp src/rosconsole_bridge.cpp)
- target_link_libraries(${PROJECT_NAME} ${TinyXML_LIBRARIES} ${catkin_LIBRARIES} ${urdfdom_LIBRARIES} ${libpcrecpp_LIBRARIES})
+ target_link_libraries(${PROJECT_NAME} ${TinyXML_LIBRARIES} ${catkin_LIBRARIES} ${urdfdom_LIBRARIES})
 +set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${urdf_VERSION} SOVERSION "0d")
  
  if(APPLE)

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



More information about the debian-science-commits mailing list