[ros-ros-comm] 01/01: Convert to new catkin with multiarch
Jochen Sprickerhof
jspricke-guest at moszumanska.debian.org
Mon Nov 23 13:14:38 UTC 2015
This is an automated email from the git hooks/post-receive script.
jspricke-guest pushed a commit to branch master
in repository ros-ros-comm.
commit e8b5add4280bf7d725f39270a8713af1732ed6b9
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date: Mon Nov 23 12:20:36 2015 +0100
Convert to new catkin with multiarch
---
debian/control | 12 ++++++++++--
debian/libmessage-filters-dev.install | 5 ++---
debian/libmessage-filters0d.install | 2 +-
debian/librosbag-dev.install | 5 ++---
debian/librosbag-storage-dev.install | 5 ++---
debian/librosbag-storage0d.install | 2 +-
debian/librosbag0d.install | 2 +-
debian/librosconsole-dev.install | 5 ++---
debian/librosconsole0d.install | 2 +-
debian/libroscpp-dev.install | 5 ++---
debian/libroscpp0d.install | 2 +-
debian/libroslz4-0d.install | 2 +-
debian/libroslz4-dev.install | 5 ++---
debian/libtopic-tools-dev.install | 5 ++---
debian/libtopic-tools0d.install | 2 +-
debian/libxmlrpcpp-dev.install | 5 ++---
debian/libxmlrpcpp0d.install | 2 +-
debian/python-rosbag.install | 2 +-
debian/python-rosgraph.install | 4 ++--
debian/python-rospy.install | 2 +-
debian/python-rosservice.install | 2 +-
debian/python-rostopic.install | 2 +-
debian/rosout.install | 2 +-
debian/rules | 2 ++
debian/topic-tools.install | 2 +-
25 files changed, 44 insertions(+), 42 deletions(-)
diff --git a/debian/control b/debian/control
index 5225fa5..3f6375a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,12 +5,12 @@ Uploaders: Thomas Moulard <thomas.moulard at gmail.com>,
Leopold Palomo-Avellaneda <leo at alaxarxa.net>
Section: libs
Priority: optional
-Build-Depends: debhelper (>= 9), python, catkin, libroscpp-core-dev,
+Build-Depends: debhelper (>= 9), python, catkin (>> 0.6.16-2), libroscpp-core-dev,
python-rosunit, libconsole-bridge-dev, libboost-date-time-dev,
libboost-filesystem-dev, libboost-program-options-dev, libboost-regex-dev,
libboost-system-dev, libboost-thread-dev, libboost-signals-dev, liblz4-dev,
message-generation, libbz2-dev, libros-rosgraph-msgs-dev, libstd-msgs-dev,
- dh-python, python-dev, dh-exec
+ dh-python, python-dev
Standards-Version: 3.9.6
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/ros/ros-ros-comm.git
Vcs-Git: git://anonscm.debian.org/debian-science/packages/ros/ros-ros-comm.git
@@ -39,6 +39,7 @@ Description: development files for libroscpp
Package: libroscpp0d
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
Description: library for libroscpp
roscpp is a C++ implementation of ROS. It provides a client library that
enables C++ programmers to quickly interface with ROS Topics, Services, and
@@ -129,6 +130,7 @@ Description: Tools for recording from and playing back to ROS topics
Package: librosbag0d
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
Description: Library for recording from and playing back to ROS topics
It is intended to be high performance and avoids deserialization and
reserialization of the messages. The rosbag package provides a command-line
@@ -165,6 +167,7 @@ Description: Development files for librosbag_storage
Package: librosbag-storage0d
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
Description: Library for rosbag_storage
This is a set of tools for recording from and playing back ROS message without
relying on the ROS client library.
@@ -186,6 +189,7 @@ Description: Development files for librosconsole
Package: librosconsole0d
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
Description: library for librosconsole
ROS console output library, a C++ package that supports
console output and logging in roscpp. It provides a macro-based interface
@@ -342,6 +346,7 @@ Description: development files for libtopic_tools
Package: libtopic-tools0d
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
Description: library for libtopic_tools
Tools for directing, throttling, selecting, and otherwise messing with ROS
topics at a meta level. None of the programs in this package actually know
@@ -406,6 +411,7 @@ Description: Development files for message-filters
Package: libmessage-filters0d
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
Description: Library for message-filters
A set of message filters which take in messages and may output those messages
at a later time, based on the conditions that filter needs met.
@@ -459,6 +465,7 @@ Description: development files for libroslz4
Package: libroslz4-0d
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
Description: library for rosplz4
A Python and C++ implementation of the LZ4 streaming format. Large data
streams are split into blocks which are compressed using the very fast LZ4
@@ -492,6 +499,7 @@ Description: development files for libxmlrpcpp
Package: libxmlrpcpp0d
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
Description: library for libxmlrpcpp
XmlRpc++ is a C++ implementation of the XML-RPC protocol. This version is
heavily modified from the package available on SourceForge in order to support
diff --git a/debian/libmessage-filters-dev.install b/debian/libmessage-filters-dev.install
old mode 100755
new mode 100644
index e7f36d7..c9700d3
--- a/debian/libmessage-filters-dev.install
+++ b/debian/libmessage-filters-dev.install
@@ -1,5 +1,4 @@
-#! /usr/bin/dh-exec
usr/include/message_filters
-usr/lib/libmessage_filters.so
-usr/lib/pkgconfig/message_filters.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/*/libmessage_filters.so
+usr/lib/*/pkgconfig/message_filters.pc
usr/share/message_filters
diff --git a/debian/libmessage-filters0d.install b/debian/libmessage-filters0d.install
index e162525..87269d5 100644
--- a/debian/libmessage-filters0d.install
+++ b/debian/libmessage-filters0d.install
@@ -1 +1 @@
-usr/lib/libmessage_filters.so.*
+usr/lib/*/libmessage_filters.so.*
diff --git a/debian/librosbag-dev.install b/debian/librosbag-dev.install
old mode 100755
new mode 100644
index 2db0b5b..90e6065
--- a/debian/librosbag-dev.install
+++ b/debian/librosbag-dev.install
@@ -1,7 +1,6 @@
-#! /usr/bin/dh-exec
usr/include/rosbag/player.h
usr/include/rosbag/recorder.h
usr/include/rosbag/time_translator.h
-usr/lib/librosbag.so
-usr/lib/pkgconfig/rosbag.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/*/librosbag.so
+usr/lib/*/pkgconfig/rosbag.pc
usr/share/rosbag
diff --git a/debian/librosbag-storage-dev.install b/debian/librosbag-storage-dev.install
old mode 100755
new mode 100644
index 3e5895f..8d5678e
--- a/debian/librosbag-storage-dev.install
+++ b/debian/librosbag-storage-dev.install
@@ -1,4 +1,3 @@
-#! /usr/bin/dh-exec
usr/include/rosbag/bag.h
usr/include/rosbag/bag_player.h
usr/include/rosbag/buffer.h
@@ -11,6 +10,6 @@ usr/include/rosbag/query.h
usr/include/rosbag/stream.h
usr/include/rosbag/structures.h
usr/include/rosbag/view.h
-usr/lib/librosbag_storage.so
-usr/lib/pkgconfig/rosbag_storage.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/*/librosbag_storage.so
+usr/lib/*/pkgconfig/rosbag_storage.pc
usr/share/rosbag_storage
diff --git a/debian/librosbag-storage0d.install b/debian/librosbag-storage0d.install
index 8033ee1..eb2e8b0 100644
--- a/debian/librosbag-storage0d.install
+++ b/debian/librosbag-storage0d.install
@@ -1 +1 @@
-usr/lib/librosbag_storage.so.*
+usr/lib/*/librosbag_storage.so.*
diff --git a/debian/librosbag0d.install b/debian/librosbag0d.install
index 87193e7..557cd29 100644
--- a/debian/librosbag0d.install
+++ b/debian/librosbag0d.install
@@ -1 +1 @@
-usr/lib/librosbag.so.*
+usr/lib/*/librosbag.so.*
diff --git a/debian/librosconsole-dev.install b/debian/librosconsole-dev.install
old mode 100755
new mode 100644
index bd42f55..205fade
--- a/debian/librosconsole-dev.install
+++ b/debian/librosconsole-dev.install
@@ -1,10 +1,9 @@
-#! /usr/bin/dh-exec
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/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+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
index 3166458..81e402d 100644
--- a/debian/librosconsole0d.install
+++ b/debian/librosconsole0d.install
@@ -1 +1 @@
-usr/lib/librosconsole*.so.*
+usr/lib/*/librosconsole*.so.*
diff --git a/debian/libroscpp-dev.install b/debian/libroscpp-dev.install
old mode 100755
new mode 100644
index 7fa012d..6747a68
--- a/debian/libroscpp-dev.install
+++ b/debian/libroscpp-dev.install
@@ -1,4 +1,3 @@
-#! /usr/bin/dh-exec
usr/include/ros/transport
usr/include/ros/advertise_options.h
usr/include/ros/advertise_service_options.h
@@ -60,8 +59,8 @@ usr/include/ros/transport_subscriber_link.h
usr/include/ros/wall_timer.h
usr/include/ros/wall_timer_options.h
usr/include/ros/xmlrpc_manager.h
-usr/lib/libroscpp.so
-usr/lib/pkgconfig/roscpp.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/*/libroscpp.so
+usr/lib/*/pkgconfig/roscpp.pc
usr/share/roscpp/cmake/roscppConfig*.cmake
usr/share/roscpp/rosbuild
usr/share/roscpp/package.xml
diff --git a/debian/libroscpp0d.install b/debian/libroscpp0d.install
index cad6362..321565a 100644
--- a/debian/libroscpp0d.install
+++ b/debian/libroscpp0d.install
@@ -1 +1 @@
-usr/lib/libroscpp.so.*
+usr/lib/*/libroscpp.so.*
diff --git a/debian/libroslz4-0d.install b/debian/libroslz4-0d.install
index fb8ec36..490cf94 100644
--- a/debian/libroslz4-0d.install
+++ b/debian/libroslz4-0d.install
@@ -1 +1 @@
-usr/lib/libroslz4.so.*
+usr/lib/*/libroslz4.so.*
diff --git a/debian/libroslz4-dev.install b/debian/libroslz4-dev.install
old mode 100755
new mode 100644
index 73a902d..5371407
--- a/debian/libroslz4-dev.install
+++ b/debian/libroslz4-dev.install
@@ -1,5 +1,4 @@
-#! /usr/bin/dh-exec
usr/include/roslz4
-usr/lib/libroslz4.so
-usr/lib/pkgconfig/roslz4.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/*/libroslz4.so
+usr/lib/*/pkgconfig/roslz4.pc
usr/share/roslz4
diff --git a/debian/libtopic-tools-dev.install b/debian/libtopic-tools-dev.install
old mode 100755
new mode 100644
index 132abc8..fada97a
--- a/debian/libtopic-tools-dev.install
+++ b/debian/libtopic-tools-dev.install
@@ -1,5 +1,4 @@
-#! /usr/bin/dh-exec
usr/include/topic_tools
-usr/lib/libtopic_tools.so
-usr/lib/pkgconfig/topic_tools.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/*/libtopic_tools.so
+usr/lib/*/pkgconfig/topic_tools.pc
usr/share/topic_tools
diff --git a/debian/libtopic-tools0d.install b/debian/libtopic-tools0d.install
index 9fca008..1699aa6 100644
--- a/debian/libtopic-tools0d.install
+++ b/debian/libtopic-tools0d.install
@@ -1 +1 @@
-usr/lib/libtopic_tools.so.*
+usr/lib/*/libtopic_tools.so.*
diff --git a/debian/libxmlrpcpp-dev.install b/debian/libxmlrpcpp-dev.install
old mode 100755
new mode 100644
index e0425da..7bdc26e
--- a/debian/libxmlrpcpp-dev.install
+++ b/debian/libxmlrpcpp-dev.install
@@ -1,6 +1,5 @@
-#! /usr/bin/dh-exec
usr/include/XmlRpc*
usr/include/base64.h
-usr/lib/libxmlrpcpp.so
-usr/lib/pkgconfig/xmlrpcpp.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/*/libxmlrpcpp.so
+usr/lib/*/pkgconfig/xmlrpcpp.pc
usr/share/xmlrpcpp
diff --git a/debian/libxmlrpcpp0d.install b/debian/libxmlrpcpp0d.install
index 903d8df..7efa194 100644
--- a/debian/libxmlrpcpp0d.install
+++ b/debian/libxmlrpcpp0d.install
@@ -1 +1 @@
-usr/lib/libxmlrpcpp*.so.*
+usr/lib/*/libxmlrpcpp*.so.*
diff --git a/debian/python-rosbag.install b/debian/python-rosbag.install
index af3c324..28ea4ab 100644
--- a/debian/python-rosbag.install
+++ b/debian/python-rosbag.install
@@ -1,2 +1,2 @@
usr/bin/rosbag
-usr/lib/rosbag
+usr/lib/*/rosbag usr/lib
diff --git a/debian/python-rosgraph.install b/debian/python-rosgraph.install
index a916e5d..bdfa9be 100644
--- a/debian/python-rosgraph.install
+++ b/debian/python-rosgraph.install
@@ -1,4 +1,4 @@
usr/bin/rosgraph
-usr/lib/rosgraph
+usr/lib/*/rosgraph usr/lib
usr/share/rosgraph
-usr/lib/pkgconfig/rosgraph.pc
+usr/lib/*/pkgconfig/rosgraph.pc usr/lib/pkgconfig
diff --git a/debian/python-rospy.install b/debian/python-rospy.install
index 490ed32..657b99b 100644
--- a/debian/python-rospy.install
+++ b/debian/python-rospy.install
@@ -1,2 +1,2 @@
usr/share/rospy
-usr/lib/pkgconfig/rospy.pc
+usr/lib/*/pkgconfig/rospy.pc usr/lib/pkgconfig
diff --git a/debian/python-rosservice.install b/debian/python-rosservice.install
index 7d82649..66ed3fc 100644
--- a/debian/python-rosservice.install
+++ b/debian/python-rosservice.install
@@ -1,3 +1,3 @@
usr/bin/rosservice
-usr/lib/rosservice
+usr/lib/*/rosservice usr/lib
usr/share/rosservice
diff --git a/debian/python-rostopic.install b/debian/python-rostopic.install
index a49c790..0249db1 100644
--- a/debian/python-rostopic.install
+++ b/debian/python-rostopic.install
@@ -1,3 +1,3 @@
usr/bin/rostopic
-usr/lib/rostopic
+usr/lib/*/rostopic usr/lib
usr/share/rostopic
diff --git a/debian/rosout.install b/debian/rosout.install
index 08d6044..6eda8db 100644
--- a/debian/rosout.install
+++ b/debian/rosout.install
@@ -1,2 +1,2 @@
-usr/lib/rosout
+usr/lib/*/rosout usr/lib
usr/share/rosout
diff --git a/debian/rules b/debian/rules
index e4b0789..4b04066 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
# -*- makefile -*-
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/default.mk
%:
dh $@ --parallel --with=python2 --buildsystem=cmake
diff --git a/debian/topic-tools.install b/debian/topic-tools.install
index 33e9b6c..6cab562 100644
--- a/debian/topic-tools.install
+++ b/debian/topic-tools.install
@@ -1,2 +1,2 @@
-usr/lib/topic_tools
+usr/lib/*/topic_tools /usr/lib
usr/etc/catkin/profile.d/20.transform.bash /usr/share/bash-completion/completions
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-ros-comm.git
More information about the debian-science-commits
mailing list