[ros-ros-comm] 04/05: refresh patch

[Riku Voipio]

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

riku pushed a commit to branch master
in repository ros-ros-comm.

commit cbeff315639750140063f61e779d4be1f2ec017a
Author: Riku Voipio <riku.voipio at linaro.org>
Date:   Tue Nov 10 16:03:55 2015 +0200

    refresh patch
---
 .../patches/0002-Add-Debian-specific-SONAMEs.patch | 34 ++++++----------------
 1 file changed, 9 insertions(+), 25 deletions(-)

diff --git a/debian/patches/0002-Add-Debian-specific-SONAMEs.patch b/debian/patches/0002-Add-Debian-specific-SONAMEs.patch
index b060863..73852d4 100644
--- a/debian/patches/0002-Add-Debian-specific-SONAMEs.patch
+++ b/debian/patches/0002-Add-Debian-specific-SONAMEs.patch
@@ -13,11 +13,9 @@ Subject: Add Debian specific SONAMEs
  utilities/xmlrpcpp/CMakeLists.txt        | 1 +
  8 files changed, 10 insertions(+)
 
-diff --git a/clients/roscpp/CMakeLists.txt b/clients/roscpp/CMakeLists.txt
-index 252d43f..bbaaecc 100644
 --- a/clients/roscpp/CMakeLists.txt
 +++ b/clients/roscpp/CMakeLists.txt
-@@ -115,6 +115,7 @@ add_library(roscpp
+@@ -115,6 +115,7 @@
    src/libros/service.cpp
    src/libros/this_node.cpp
    )
@@ -25,11 +23,9 @@ index 252d43f..bbaaecc 100644
  
  add_dependencies(roscpp roscpp_gencpp rosgraph_msgs_gencpp std_msgs_gencpp)
  
-diff --git a/tools/rosbag/CMakeLists.txt b/tools/rosbag/CMakeLists.txt
-index 4d063ea..2cfdcff 100644
 --- a/tools/rosbag/CMakeLists.txt
 +++ b/tools/rosbag/CMakeLists.txt
-@@ -20,6 +20,7 @@ add_library(rosbag
+@@ -20,6 +20,7 @@
    src/player.cpp
    src/recorder.cpp
    src/time_translator.cpp)
@@ -37,11 +33,9 @@ index 4d063ea..2cfdcff 100644
  
  target_link_libraries(rosbag ${catkin_LIBRARIES} ${Boost_LIBRARIES})
  
-diff --git a/tools/rosbag_storage/CMakeLists.txt b/tools/rosbag_storage/CMakeLists.txt
-index 7c0679b..cc4be7b 100644
 --- a/tools/rosbag_storage/CMakeLists.txt
 +++ b/tools/rosbag_storage/CMakeLists.txt
-@@ -30,6 +30,7 @@ add_library(rosbag_storage
+@@ -33,6 +33,7 @@
    src/view.cpp
    src/uncompressed_stream.cpp
  )
@@ -49,11 +43,9 @@ index 7c0679b..cc4be7b 100644
  
  target_link_libraries(rosbag_storage ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${BZIP2_LIBRARIES} ${console_bridge_LIBRARIES})
  
-diff --git a/tools/rosconsole/CMakeLists.txt b/tools/rosconsole/CMakeLists.txt
-index f7a4c00..4fb3526 100644
 --- a/tools/rosconsole/CMakeLists.txt
 +++ b/tools/rosconsole/CMakeLists.txt
-@@ -63,8 +63,10 @@ ENDIF(${CMAKE_SYSTEM} MATCHES "Darwin-11.*")
+@@ -63,8 +63,10 @@
  include_directories(include ${catkin_INCLUDE_DIRS} ${rosconsole_backend_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
  
  add_library(rosconsole_backend_interface src/rosconsole/rosconsole_backend.cpp)
@@ -64,7 +56,7 @@ index f7a4c00..4fb3526 100644
  target_link_libraries(rosconsole ${rosconsole_backend_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
  
  if(ROSCONSOLE_BACKEND STREQUAL "log4cxx")
-@@ -80,6 +82,7 @@ elseif(ROSCONSOLE_BACKEND STREQUAL "glog")
+@@ -80,6 +82,7 @@
    target_link_libraries(rosconsole_glog rosconsole_backend_interface ${GLOG_LIBRARIES})
  elseif(ROSCONSOLE_BACKEND STREQUAL "print")
    add_library(rosconsole_print src/rosconsole/impl/rosconsole_print.cpp)
@@ -72,11 +64,9 @@ index f7a4c00..4fb3526 100644
    target_link_libraries(rosconsole_print rosconsole_backend_interface)
  else()
    message(FATAL_ERROR "Unknown rosconsole backend '${ROSCONSOLE_BACKEND}'")
-diff --git a/tools/topic_tools/CMakeLists.txt b/tools/topic_tools/CMakeLists.txt
-index 620e230..bb390f9 100644
 --- a/tools/topic_tools/CMakeLists.txt
 +++ b/tools/topic_tools/CMakeLists.txt
-@@ -27,6 +27,7 @@ catkin_package(
+@@ -27,6 +27,7 @@
  catkin_add_env_hooks(20.transform SHELLS bash DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/env-hooks)
  
  add_library(topic_tools src/shape_shifter.cpp src/parse.cpp)
@@ -84,11 +74,9 @@ index 620e230..bb390f9 100644
  target_link_libraries(topic_tools ${catkin_LIBRARIES})
  
  add_executable(switch_mux src/switch_mux.cpp)
-diff --git a/utilities/message_filters/CMakeLists.txt b/utilities/message_filters/CMakeLists.txt
-index e40f480..97e7e2c 100644
 --- a/utilities/message_filters/CMakeLists.txt
 +++ b/utilities/message_filters/CMakeLists.txt
-@@ -14,6 +14,7 @@ include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
+@@ -14,6 +14,7 @@
  link_directories(${catkin_LIBRARY_DIRS})
  
  add_library(${PROJECT_NAME} src/connection.cpp)
@@ -96,11 +84,9 @@ index e40f480..97e7e2c 100644
  target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
  
  install(TARGETS ${PROJECT_NAME}
-diff --git a/utilities/roslz4/CMakeLists.txt b/utilities/roslz4/CMakeLists.txt
-index 6e539bf..a3d601f 100644
 --- a/utilities/roslz4/CMakeLists.txt
 +++ b/utilities/roslz4/CMakeLists.txt
-@@ -23,6 +23,7 @@ catkin_package(
+@@ -23,6 +23,7 @@
  
  include_directories(include ${lz4_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})
  add_library(roslz4 src/lz4s.c src/xxhash.c)
@@ -108,11 +94,9 @@ index 6e539bf..a3d601f 100644
  target_link_libraries(roslz4 ${lz4_LIBRARIES} ${catkin_LIBRARIES})
  
  if(NOT ANDROID)
-diff --git a/utilities/xmlrpcpp/CMakeLists.txt b/utilities/xmlrpcpp/CMakeLists.txt
-index 89061fd..67b1a4c 100644
 --- a/utilities/xmlrpcpp/CMakeLists.txt
 +++ b/utilities/xmlrpcpp/CMakeLists.txt
-@@ -25,6 +25,7 @@ add_library(xmlrpcpp
+@@ -25,6 +25,7 @@
    src/XmlRpcUtil.cpp
    src/XmlRpcValue.cpp
    )

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