[ros-comm] 04/17: Add rosconsole packaging

[Jochen Sprickerhof]

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 d7774c825d4c6b4b78dfec16c95d26dd585b4b28
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Thu Dec 11 14:02:37 2014 +0100

    Add rosconsole packaging
---
 debian/control                                     | 20 ++++++++++----
 debian/librosconsole-dev.install                   |  9 +++++++
 debian/librosconsole0d.install                     |  1 +
 debian/patches/0004-Add-SONAME-to-rosconsole.patch | 31 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 5 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 061f045..61fd1d1 100644
--- a/debian/control
+++ b/debian/control
@@ -74,12 +74,22 @@ Description: library for rosbag_storage
  .
  This package contains the library.
 
-Package: rosconsole
+Package: librosconsole-dev
+Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}
-Multi-Arch: foreign
-Description: FIXME
- FIXME　FIXME　FIXME
+Depends: librosconsole0d (= ${binary:Version}), ${misc:Depends}
+Description: development files for librosconsole
+ ROS console output library.
+ .
+ This package contains the development files for the library.
+
+Package: librosconsole0d
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: library for librosconsole
+ ROS console output library.
+ .
+ This package contains the library.
 
 Package: rosgraph
 Architecture: any
diff --git a/debian/librosconsole-dev.install b/debian/librosconsole-dev.install
new file mode 100644
index 0000000..70047f1
--- /dev/null
+++ b/debian/librosconsole-dev.install
@@ -0,0 +1,9 @@
+usr/include/rosconsole
+usr/include/ros/assert.h
+usr/include/ros/console_backend.h
+usr/include/ros/console.h
+usr/include/ros/static_assert.h
+usr/lib/librosconsole*.so
+usr/lib/pkgconfig/rosconsole.pc
+usr/share/rosconsole
+usr/share/ros
diff --git a/debian/librosconsole0d.install b/debian/librosconsole0d.install
new file mode 100644
index 0000000..3166458
--- /dev/null
+++ b/debian/librosconsole0d.install
@@ -0,0 +1 @@
+usr/lib/librosconsole*.so.*
diff --git a/debian/patches/0004-Add-SONAME-to-rosconsole.patch b/debian/patches/0004-Add-SONAME-to-rosconsole.patch
new file mode 100644
index 0000000..b763e47
--- /dev/null
+++ b/debian/patches/0004-Add-SONAME-to-rosconsole.patch
@@ -0,0 +1,31 @@
+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/series b/debian/patches/series
index 07c44fe..5c72248 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Add-CMakeLists.txt.patch
 0002-Add-SONAME-to-roslz4.patch
 0003-Add-SONAME-to-rosbag_storage.patch
+0004-Add-SONAME-to-rosconsole.patch

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