[ros-comm] 01/01: squash SONAME patches
Jochen Sprickerhof
jspricke-guest at moszumanska.debian.org
Sun Dec 14 18:51:59 UTC 2014
This is an automated email from the git hooks/post-receive script.
jspricke-guest pushed a commit to branch master
in repository ros-comm.
commit 99976b6691621faa30b2c9e902efa6200a6007b8
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date: Sun Dec 14 19:50:48 2014 +0100
squash SONAME patches
---
.../patches/0002-Add-Debian-specific-SONAMEs.patch | 122 +++++++++++++++++++++
debian/patches/0002-Add-SONAME-to-roslz4.patch | 20 ----
.../0003-Add-SONAME-to-rosbag_storage.patch | 20 ----
...patch => 0003-Add-default-ROS_MASTER_URI.patch} | 0
debian/patches/0004-Add-SONAME-to-rosconsole.patch | 31 ------
debian/patches/0005-Add-SONAME-for-xmlrpcpp.patch | 20 ----
debian/patches/0006-Add-SONAME-for-roscpp.patch | 20 ----
.../patches/0007-Add-SONAME-for-topic_tools.patch | 20 ----
debian/patches/0008-Add-SONAME-to-rosbag.patch | 20 ----
.../0010-Add-SONAME-for-message_filters.patch | 20 ----
debian/patches/series | 11 +-
11 files changed, 124 insertions(+), 180 deletions(-)
diff --git a/debian/patches/0002-Add-Debian-specific-SONAMEs.patch b/debian/patches/0002-Add-Debian-specific-SONAMEs.patch
new file mode 100644
index 0000000..82b7d87
--- /dev/null
+++ b/debian/patches/0002-Add-Debian-specific-SONAMEs.patch
@@ -0,0 +1,122 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Thu, 11 Dec 2014 13:01:16 +0100
+Subject: Add Debian specific SONAMEs
+
+---
+ clients/roscpp/CMakeLists.txt | 1 +
+ tools/rosbag/CMakeLists.txt | 1 +
+ tools/rosbag_storage/CMakeLists.txt | 1 +
+ tools/rosconsole/CMakeLists.txt | 3 +++
+ tools/topic_tools/CMakeLists.txt | 1 +
+ utilities/message_filters/CMakeLists.txt | 1 +
+ utilities/roslz4/CMakeLists.txt | 1 +
+ 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
+ src/libros/service.cpp
+ src/libros/this_node.cpp
+ )
++set_target_properties(roscpp PROPERTIES VERSION ${roscpp_VERSION} SOVERSION "0d")
+
+ 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
+ src/player.cpp
+ src/recorder.cpp
+ src/time_translator.cpp)
++set_target_properties(rosbag PROPERTIES VERSION ${rosbag_VERSION} SOVERSION "0d")
+
+ 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
+ src/view.cpp
+ src/uncompressed_stream.cpp
+ )
++set_target_properties(rosbag_storage PROPERTIES VERSION ${rosbag_storage_VERSION} SOVERSION "0d")
+
+ 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.*")
+ include_directories(include ${catkin_INCLUDE_DIRS} ${rosconsole_backend_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
+
+ add_library(rosconsole_backend_interface src/rosconsole/rosconsole_backend.cpp)
++set_target_properties(rosconsole_backend_interface PROPERTIES VERSION ${rosconsole_VERSION} SOVERSION "0d")
+
+ add_library(rosconsole src/rosconsole/rosconsole.cpp)
++set_target_properties(rosconsole PROPERTIES VERSION ${rosconsole_VERSION} SOVERSION "0d")
+ 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")
+ 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)
++ set_target_properties(rosconsole_print PROPERTIES VERSION ${rosconsole_VERSION} SOVERSION "0d")
+ 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(
+ 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)
++set_target_properties(topic_tools PROPERTIES VERSION ${topic_tools_VERSION} SOVERSION "0d")
+ 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})
+ link_directories(${catkin_LIBRARY_DIRS})
+
+ add_library(${PROJECT_NAME} src/connection.cpp)
++set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${message_filters_VERSION} SOVERSION "0d")
+ 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 1b6bac9..0bb7b62 100644
+--- a/utilities/roslz4/CMakeLists.txt
++++ b/utilities/roslz4/CMakeLists.txt
+@@ -23,6 +23,7 @@ catkin_package(
+
+ include_directories(include ${lz4_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})
+ add_library(roslz4 src/lz4s.c src/xxhash.c)
++set_target_properties(roslz4 PROPERTIES VERSION ${roslz4_VERSION} SOVERSION "0d")
+ target_link_libraries(roslz4 ${lz4_LIBRARIES} ${catkin_LIBRARIES})
+
+ # Python bindings
+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
+ src/XmlRpcUtil.cpp
+ src/XmlRpcValue.cpp
+ )
++set_target_properties(xmlrpcpp PROPERTIES VERSION ${xmlrpcpp_VERSION} SOVERSION "0d")
+
+ if(WIN32)
+ target_link_libraries(xmlrpcpp ws2_32)
diff --git a/debian/patches/0002-Add-SONAME-to-roslz4.patch b/debian/patches/0002-Add-SONAME-to-roslz4.patch
deleted file mode 100644
index be08b54..0000000
--- a/debian/patches/0002-Add-SONAME-to-roslz4.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Thu, 11 Dec 2014 13:01:16 +0100
-Subject: Add SONAME to roslz4
-
----
- utilities/roslz4/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/utilities/roslz4/CMakeLists.txt b/utilities/roslz4/CMakeLists.txt
-index 1b6bac9..0bb7b62 100644
---- a/utilities/roslz4/CMakeLists.txt
-+++ b/utilities/roslz4/CMakeLists.txt
-@@ -23,6 +23,7 @@ catkin_package(
-
- include_directories(include ${lz4_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})
- add_library(roslz4 src/lz4s.c src/xxhash.c)
-+set_target_properties(roslz4 PROPERTIES VERSION ${roslz4_VERSION} SOVERSION "0d")
- target_link_libraries(roslz4 ${lz4_LIBRARIES} ${catkin_LIBRARIES})
-
- # Python bindings
diff --git a/debian/patches/0003-Add-SONAME-to-rosbag_storage.patch b/debian/patches/0003-Add-SONAME-to-rosbag_storage.patch
deleted file mode 100644
index b9a085d..0000000
--- a/debian/patches/0003-Add-SONAME-to-rosbag_storage.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Thu, 11 Dec 2014 13:27:48 +0100
-Subject: Add SONAME to rosbag_storage
-
----
- tools/rosbag_storage/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-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
- src/view.cpp
- src/uncompressed_stream.cpp
- )
-+set_target_properties(rosbag_storage PROPERTIES VERSION ${rosbag_storage_VERSION} SOVERSION "0d")
-
- target_link_libraries(rosbag_storage ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${BZIP2_LIBRARIES} ${console_bridge_LIBRARIES})
-
diff --git a/debian/patches/0009-Add-default-ROS_MASTER_URI.patch b/debian/patches/0003-Add-default-ROS_MASTER_URI.patch
similarity index 100%
rename from debian/patches/0009-Add-default-ROS_MASTER_URI.patch
rename to debian/patches/0003-Add-default-ROS_MASTER_URI.patch
diff --git a/debian/patches/0004-Add-SONAME-to-rosconsole.patch b/debian/patches/0004-Add-SONAME-to-rosconsole.patch
deleted file mode 100644
index b763e47..0000000
--- a/debian/patches/0004-Add-SONAME-to-rosconsole.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Thu, 11 Dec 2014 13:50:45 +0100
-Subject: Add SONAME to rosconsole
-
----
- tools/rosconsole/CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
-
-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.*")
- include_directories(include ${catkin_INCLUDE_DIRS} ${rosconsole_backend_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
-
- add_library(rosconsole_backend_interface src/rosconsole/rosconsole_backend.cpp)
-+set_target_properties(rosconsole_backend_interface PROPERTIES VERSION ${rosconsole_VERSION} SOVERSION "0d")
-
- add_library(rosconsole src/rosconsole/rosconsole.cpp)
-+set_target_properties(rosconsole PROPERTIES VERSION ${rosconsole_VERSION} SOVERSION "0d")
- 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")
- 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)
-+ set_target_properties(rosconsole_print PROPERTIES VERSION ${rosconsole_VERSION} SOVERSION "0d")
- target_link_libraries(rosconsole_print rosconsole_backend_interface)
- else()
- message(FATAL_ERROR "Unknown rosconsole backend '${ROSCONSOLE_BACKEND}'")
diff --git a/debian/patches/0005-Add-SONAME-for-xmlrpcpp.patch b/debian/patches/0005-Add-SONAME-for-xmlrpcpp.patch
deleted file mode 100644
index 98ed900..0000000
--- a/debian/patches/0005-Add-SONAME-for-xmlrpcpp.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Thu, 11 Dec 2014 14:06:27 +0100
-Subject: Add SONAME for xmlrpcpp
-
----
- utilities/xmlrpcpp/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-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
- src/XmlRpcUtil.cpp
- src/XmlRpcValue.cpp
- )
-+set_target_properties(xmlrpcpp PROPERTIES VERSION ${xmlrpcpp_VERSION} SOVERSION "0d")
-
- if(WIN32)
- target_link_libraries(xmlrpcpp ws2_32)
diff --git a/debian/patches/0006-Add-SONAME-for-roscpp.patch b/debian/patches/0006-Add-SONAME-for-roscpp.patch
deleted file mode 100644
index 922ac5a..0000000
--- a/debian/patches/0006-Add-SONAME-for-roscpp.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Thu, 11 Dec 2014 14:27:13 +0100
-Subject: Add SONAME for roscpp
-
----
- clients/roscpp/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-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
- src/libros/service.cpp
- src/libros/this_node.cpp
- )
-+set_target_properties(roscpp PROPERTIES VERSION ${roscpp_VERSION} SOVERSION "0d")
-
- add_dependencies(roscpp roscpp_gencpp rosgraph_msgs_gencpp std_msgs_gencpp)
-
diff --git a/debian/patches/0007-Add-SONAME-for-topic_tools.patch b/debian/patches/0007-Add-SONAME-for-topic_tools.patch
deleted file mode 100644
index 97282c7..0000000
--- a/debian/patches/0007-Add-SONAME-for-topic_tools.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Thu, 11 Dec 2014 17:28:40 +0100
-Subject: Add SONAME for topic_tools
-
----
- tools/topic_tools/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-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(
- 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)
-+set_target_properties(topic_tools PROPERTIES VERSION ${topic_tools_VERSION} SOVERSION "0d")
- target_link_libraries(topic_tools ${catkin_LIBRARIES})
-
- add_executable(switch_mux src/switch_mux.cpp)
diff --git a/debian/patches/0008-Add-SONAME-to-rosbag.patch b/debian/patches/0008-Add-SONAME-to-rosbag.patch
deleted file mode 100644
index e1e3231..0000000
--- a/debian/patches/0008-Add-SONAME-to-rosbag.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Thu, 11 Dec 2014 21:58:19 +0100
-Subject: Add SONAME to rosbag
-
----
- tools/rosbag/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-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
- src/player.cpp
- src/recorder.cpp
- src/time_translator.cpp)
-+set_target_properties(rosbag PROPERTIES VERSION ${rosbag_VERSION} SOVERSION "0d")
-
- target_link_libraries(rosbag ${catkin_LIBRARIES} ${Boost_LIBRARIES})
-
diff --git a/debian/patches/0010-Add-SONAME-for-message_filters.patch b/debian/patches/0010-Add-SONAME-for-message_filters.patch
deleted file mode 100644
index 0dbc866..0000000
--- a/debian/patches/0010-Add-SONAME-for-message_filters.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Fri, 12 Dec 2014 18:51:33 +0100
-Subject: Add SONAME for message_filters
-
----
- utilities/message_filters/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-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})
- link_directories(${catkin_LIBRARY_DIRS})
-
- add_library(${PROJECT_NAME} src/connection.cpp)
-+set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${message_filters_VERSION} SOVERSION "0d")
- target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
-
- install(TARGETS ${PROJECT_NAME}
diff --git a/debian/patches/series b/debian/patches/series
index e96a6ab..180cbbf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,3 @@
0001-Add-CMakeLists.txt.patch
-0002-Add-SONAME-to-roslz4.patch
-0003-Add-SONAME-to-rosbag_storage.patch
-0004-Add-SONAME-to-rosconsole.patch
-0005-Add-SONAME-for-xmlrpcpp.patch
-0006-Add-SONAME-for-roscpp.patch
-0007-Add-SONAME-for-topic_tools.patch
-0008-Add-SONAME-to-rosbag.patch
-0009-Add-default-ROS_MASTER_URI.patch
-0010-Add-SONAME-for-message_filters.patch
+0002-Add-Debian-specific-SONAMEs.patch
+0003-Add-default-ROS_MASTER_URI.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-comm.git
More information about the debian-science-commits
mailing list