[roscpp-core] 01/01: sqash SONAME patches

[Jochen Sprickerhof]

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

jspricke-guest pushed a commit to branch master
in repository roscpp-core.

commit 41256d5a5657365ad9fb89d8902776f87e53e1f9
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sun Dec 14 19:53:16 2014 +0100

    sqash SONAME patches
---
 .../patches/0002-Add-Debian-specific-SONAMEs.patch | 46 ++++++++++++++++++++++
 ...d-Debian-specific-SOVERSION-to-cpp_common.patch | 20 ----------
 .../0003-Add-SONAME-for-roscpp_serialization.patch | 20 ----------
 debian/patches/0004-Add-SONAME-for-rostime.patch   | 20 ----------
 debian/patches/series                              |  4 +-
 5 files changed, 47 insertions(+), 63 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..3df455e
--- /dev/null
+++ b/debian/patches/0002-Add-Debian-specific-SONAMEs.patch
@@ -0,0 +1,46 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Tue, 9 Dec 2014 17:15:47 +0100
+Subject: Add Debian specific SONAMEs
+
+---
+ cpp_common/CMakeLists.txt           | 1 +
+ roscpp_serialization/CMakeLists.txt | 1 +
+ rostime/CMakeLists.txt              | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/cpp_common/CMakeLists.txt b/cpp_common/CMakeLists.txt
+index 5e83800..836fc9d 100644
+--- a/cpp_common/CMakeLists.txt
++++ b/cpp_common/CMakeLists.txt
+@@ -33,6 +33,7 @@ endif(HAVE_GLIBC_BACKTRACE)
+ 
+ add_library(${PROJECT_NAME} src/debug.cpp src/header.cpp)
+ target_link_libraries(${PROJECT_NAME} ${Boost_LIBRARIES} ${console_bridge_LIBRARIES})
++set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${cpp_common_VERSION} SOVERSION "0d")
+ 
+ install(TARGETS ${PROJECT_NAME}
+   ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+diff --git a/roscpp_serialization/CMakeLists.txt b/roscpp_serialization/CMakeLists.txt
+index 889c989..6a025bc 100644
+--- a/roscpp_serialization/CMakeLists.txt
++++ b/roscpp_serialization/CMakeLists.txt
+@@ -11,6 +11,7 @@ include_directories(include ${catkin_INCLUDE_DIRS})
+ link_directories(${catkin_LIBRARY_DIRS})
+ 
+ add_library(roscpp_serialization src/serialization.cpp)
++set_target_properties(roscpp_serialization PROPERTIES VERSION ${roscpp_serialization_VERSION} SOVERSION "0d")
+ 
+ install(TARGETS roscpp_serialization
+   ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+diff --git a/rostime/CMakeLists.txt b/rostime/CMakeLists.txt
+index 7ecc67f..af6b777 100644
+--- a/rostime/CMakeLists.txt
++++ b/rostime/CMakeLists.txt
+@@ -16,6 +16,7 @@ add_library(rostime
+   src/duration.cpp
+   src/rate.cpp
+   src/time.cpp)
++set_target_properties(rostime PROPERTIES VERSION ${rostime_VERSION} SOVERSION "0d")
+ 
+ target_link_libraries(rostime ${Boost_LIBRARIES})
+ if(NOT APPLE)
diff --git a/debian/patches/0002-Add-Debian-specific-SOVERSION-to-cpp_common.patch b/debian/patches/0002-Add-Debian-specific-SOVERSION-to-cpp_common.patch
deleted file mode 100644
index 3bb2d67..0000000
--- a/debian/patches/0002-Add-Debian-specific-SOVERSION-to-cpp_common.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Tue, 9 Dec 2014 17:15:47 +0100
-Subject: Add Debian specific SOVERSION to cpp_common
-
----
- cpp_common/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cpp_common/CMakeLists.txt b/cpp_common/CMakeLists.txt
-index 5e83800..836fc9d 100644
---- a/cpp_common/CMakeLists.txt
-+++ b/cpp_common/CMakeLists.txt
-@@ -33,6 +33,7 @@ endif(HAVE_GLIBC_BACKTRACE)
- 
- add_library(${PROJECT_NAME} src/debug.cpp src/header.cpp)
- target_link_libraries(${PROJECT_NAME} ${Boost_LIBRARIES} ${console_bridge_LIBRARIES})
-+set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${cpp_common_VERSION} SOVERSION "0d")
- 
- install(TARGETS ${PROJECT_NAME}
-   ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
diff --git a/debian/patches/0003-Add-SONAME-for-roscpp_serialization.patch b/debian/patches/0003-Add-SONAME-for-roscpp_serialization.patch
deleted file mode 100644
index 0046955..0000000
--- a/debian/patches/0003-Add-SONAME-for-roscpp_serialization.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Fri, 12 Dec 2014 14:29:33 +0100
-Subject: Add SONAME for roscpp_serialization
-
----
- roscpp_serialization/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/roscpp_serialization/CMakeLists.txt b/roscpp_serialization/CMakeLists.txt
-index 889c989..6a025bc 100644
---- a/roscpp_serialization/CMakeLists.txt
-+++ b/roscpp_serialization/CMakeLists.txt
-@@ -11,6 +11,7 @@ include_directories(include ${catkin_INCLUDE_DIRS})
- link_directories(${catkin_LIBRARY_DIRS})
- 
- add_library(roscpp_serialization src/serialization.cpp)
-+set_target_properties(roscpp_serialization PROPERTIES VERSION ${roscpp_serialization_VERSION} SOVERSION "0d")
- 
- install(TARGETS roscpp_serialization
-   ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
diff --git a/debian/patches/0004-Add-SONAME-for-rostime.patch b/debian/patches/0004-Add-SONAME-for-rostime.patch
deleted file mode 100644
index f73f589..0000000
--- a/debian/patches/0004-Add-SONAME-for-rostime.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Fri, 12 Dec 2014 14:33:28 +0100
-Subject: Add SONAME for rostime
-
----
- rostime/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/rostime/CMakeLists.txt b/rostime/CMakeLists.txt
-index 7ecc67f..af6b777 100644
---- a/rostime/CMakeLists.txt
-+++ b/rostime/CMakeLists.txt
-@@ -16,6 +16,7 @@ add_library(rostime
-   src/duration.cpp
-   src/rate.cpp
-   src/time.cpp)
-+set_target_properties(rostime PROPERTIES VERSION ${rostime_VERSION} SOVERSION "0d")
- 
- target_link_libraries(rostime ${Boost_LIBRARIES})
- if(NOT APPLE)
diff --git a/debian/patches/series b/debian/patches/series
index 74b9dbf..c4a5f1f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 0001-Add-CMakeLists.txt.patch
-0002-Add-Debian-specific-SOVERSION-to-cpp_common.patch
-0003-Add-SONAME-for-roscpp_serialization.patch
-0004-Add-SONAME-for-rostime.patch
+0002-Add-Debian-specific-SONAMEs.patch

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