[ros-image-common] 02/07: Refresh patches

Jochen Sprickerhof jspricke-guest at moszumanska.debian.org
Tue Jan 19 22:18:24 UTC 2016


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

jspricke-guest pushed a commit to branch master
in repository ros-image-common.

commit 759ee96feb79353e27271273f1089e7d96f56dce
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Tue Jan 19 15:29:32 2016 +0100

    Refresh patches
---
 debian/patches/0002-Add-Debian-specific-SOVERSION.patch | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/patches/0002-Add-Debian-specific-SOVERSION.patch b/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
index 75e38da..bb35e1b 100644
--- a/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
+++ b/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
@@ -10,17 +10,17 @@ Subject: Add Debian specific SOVERSION
  4 files changed, 4 insertions(+)
 
 diff --git a/camera_calibration_parsers/CMakeLists.txt b/camera_calibration_parsers/CMakeLists.txt
-index 0893dbc..ff153ab 100644
+index 98165ed..3630137 100644
 --- a/camera_calibration_parsers/CMakeLists.txt
 +++ b/camera_calibration_parsers/CMakeLists.txt
-@@ -35,6 +35,7 @@ add_library(${PROJECT_NAME}
- )
+@@ -41,6 +41,7 @@ add_library(${PROJECT_NAME}_wrapper
+   src/parse_wrapper.cpp)
  
  target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${YAML_CPP_LIBRARIES} ${Boost_LIBRARIES})
 +set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${camera_calibration_parsers_VERSION} SOVERSION "0d")
+ target_link_libraries(${PROJECT_NAME}_wrapper ${PROJECT_NAME} ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
  
- add_dependencies(${PROJECT_NAME} sensor_msgs_gencpp)
- 
+ # Don't prepend wrapper library name with lib and add to Python libs.
 diff --git a/camera_info_manager/CMakeLists.txt b/camera_info_manager/CMakeLists.txt
 index bcb250e..bc05273 100644
 --- a/camera_info_manager/CMakeLists.txt
@@ -34,13 +34,13 @@ index bcb250e..bc05273 100644
  install(TARGETS ${PROJECT_NAME}
          DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
 diff --git a/image_transport/CMakeLists.txt b/image_transport/CMakeLists.txt
-index 72a3547..6994a9f 100644
+index 6e43f2f..7d8b0d9 100644
 --- a/image_transport/CMakeLists.txt
 +++ b/image_transport/CMakeLists.txt
 @@ -32,6 +32,7 @@ add_library(${PROJECT_NAME}
    src/subscriber.cpp
  )
- add_dependencies(${PROJECT_NAME} sensor_msgs_gencpp)
+ add_dependencies(${PROJECT_NAME} ${catkin_EXPORTED_TARGETS})
 +set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${image_transport_VERSION} SOVERSION "0d")
  target_link_libraries(${PROJECT_NAME}
    ${Boost_LIBRARIES}

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



More information about the debian-science-commits mailing list