[ros-geometry-experimental] 02/02: Convert to new catkin with multiarch (cleanup as well)
Jochen Sprickerhof
jspricke-guest at moszumanska.debian.org
Sun Nov 22 22:27:51 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-geometry-experimental.
commit 292d067b7af83c65eaaf283317c6b4024a7b29de
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date: Sun Nov 22 23:05:18 2015 +0100
Convert to new catkin with multiarch (cleanup as well)
---
debian/cl-tf2-msgs.install | 1 -
debian/cl-tf2-srvs.install | 1 -
debian/control | 20 ++++++++++++--------
debian/libtf2-0d.install | 3 +--
debian/libtf2-bullet-dev.install | 3 +--
debian/libtf2-dev.install | 5 ++---
debian/libtf2-eigen-dev.install | 3 +--
debian/libtf2-geometry-msgs-dev.install | 3 +--
debian/libtf2-kdl-dev.install | 3 +--
debian/libtf2-msgs-dev.install | 3 +--
debian/libtf2-ros-dev.install | 5 ++---
debian/libtf2-ros0d.install | 4 +---
debian/libtf2-sensor-msgs-dev.install | 3 +--
debian/python-tf2.install | 2 +-
debian/tf2-tools.install | 3 ++-
15 files changed, 27 insertions(+), 35 deletions(-)
diff --git a/debian/cl-tf2-msgs.install b/debian/cl-tf2-msgs.install
index cd8c1d4..b8d00f7 100644
--- a/debian/cl-tf2-msgs.install
+++ b/debian/cl-tf2-msgs.install
@@ -1,2 +1 @@
usr/share/common-lisp/ros/tf2_msgs/msg
-
diff --git a/debian/cl-tf2-srvs.install b/debian/cl-tf2-srvs.install
index 691a681..c492cff 100644
--- a/debian/cl-tf2-srvs.install
+++ b/debian/cl-tf2-srvs.install
@@ -1,2 +1 @@
usr/share/common-lisp/ros/tf2_msgs/srv
-
diff --git a/debian/control b/debian/control
index 6f2d48f..f71949e 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Uploaders: Thomas Moulard <thomas.moulard at gmail.com>,
Jochen Sprickerhof <debian at jochen.sprickerhof.de>,
Leopold Palomo-Avellaneda <leo at alaxarxa.net>
Build-Depends: debhelper (>= 9), dh-exec,
- catkin, libroscpp-core-dev, message-generation, libstd-msgs-dev,
+ catkin (>> 0.6.16-2), libroscpp-core-dev, message-generation, libstd-msgs-dev,
python-all (>= 2.6.6-3), python-setuptools (>= 0.6b3), dh-python,
libgeometry-msgs-dev, libactionlib-msgs-dev,
libconsole-bridge-dev, python-rospy, libpython-dev,
@@ -26,6 +26,7 @@ Vcs-Git: git://anonscm.debian.org/debian-science/packages/ros/ros-geometry-exper
Package: libtf2-0d
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
+Multi-Arch: same
Description: ROS tf2 transform library second generation
tf2 is the second generation of the transform library, which lets the user
keep track of multiple coordinate frames over time. tf2 maintains the
@@ -64,6 +65,7 @@ Description: tf2 transform library second generation - Python
Package: libtf2-ros0d
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
+Multi-Arch: same
Description: ROS binding for tf2 transform library second generation
tf2 is the second generation of the transform library, which lets the user
keep track of multiple coordinate frames over time. tf2 maintains the
@@ -205,7 +207,7 @@ Description: ROS tf2 transform library second generation for Eigen - dev files
and lets the user transform points, vectors, etc between any two coordinate
frames at any desired point in time.
.
- This package contains the development files to convert between libtf2 and Eigen.
+ This package contains development files to convert between libtf2 and Eigen.
#tf2_geometry_msgs
Package: libtf2-geometry-msgs-dev
@@ -240,32 +242,34 @@ Package: libtf2-kdl-dev
Section: libdevel
Architecture: any
Depends: ${misc:Depends}, liborocos-kdl-dev
-Description: ROS tf2 transform library second generation for Orocos-Kdl - dev files
+Description: ROS tf2 transform library using Orocos-KDL - dev files
tf2 is the second generation of the transform library, which lets the user
keep track of multiple coordinate frames over time. tf2 maintains the
relationship between coordinate frames in a tree structure buffered in time,
and lets the user transform points, vectors, etc between any two coordinate
frames at any desired point in time.
.
- This package contains the development files to convert between tf2 and liborocos-kdl.
+ This package contains the development files to convert between tf2 and
+ liborocos-kdl.
Package: python-tf2-kdl
Section: python
Architecture: all
Depends: ${python:Depends}, ${misc:Depends}, python-genpy, python-std-msgs
-Description: ROS tf2 transform library second generation for Orocos-Kdl - Python
+Description: ROS tf2 transform library using Orocos-KDL - Python
tf2 is the second generation of the transform library, which lets the user
keep track of multiple coordinate frames over time. tf2 maintains the
relationship between coordinate frames in a tree structure buffered in time,
and lets the user transform points, vectors, etc between any two coordinate
frames at any desired point in time.
.
- This package contains the Python code to convert betweenw tf2 and liborocos-kdl.
+ This package contains the Python code to convert betweenw tf2 and
+ liborocos-kdl.
Package: tf2-tools
Section: python
-Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-genpy, python-std-msgs
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-genpy, python-std-msgs
Description: ROS tool for tf2 transform library second generation
tf2 is the second generation of the transform library, which lets the user
keep track of multiple coordinate frames over time. tf2 maintains the
diff --git a/debian/libtf2-0d.install b/debian/libtf2-0d.install
index bfa34dc..10ecd43 100644
--- a/debian/libtf2-0d.install
+++ b/debian/libtf2-0d.install
@@ -1,2 +1 @@
-usr/lib/libtf2.so.*
-
+usr/lib/*/libtf2.so.*
diff --git a/debian/libtf2-bullet-dev.install b/debian/libtf2-bullet-dev.install
old mode 100755
new mode 100644
index c8560fe..6afd547
--- a/debian/libtf2-bullet-dev.install
+++ b/debian/libtf2-bullet-dev.install
@@ -1,4 +1,3 @@
-#! /usr/bin/dh-exec
usr/include/tf2_bullet
usr/share/tf2_bullet
-usr/lib/pkgconfig/tf2_bullet.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/*/pkgconfig/tf2_bullet.pc
diff --git a/debian/libtf2-dev.install b/debian/libtf2-dev.install
old mode 100755
new mode 100644
index cebb606..d2c15ae
--- a/debian/libtf2-dev.install
+++ b/debian/libtf2-dev.install
@@ -1,5 +1,4 @@
-#! /usr/bin/dh-exec
usr/include/tf2
usr/share/tf2
-usr/lib/libtf2.so
-usr/lib/pkgconfig/tf2.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/*/libtf2.so
+usr/lib/*/pkgconfig/tf2.pc
diff --git a/debian/libtf2-eigen-dev.install b/debian/libtf2-eigen-dev.install
old mode 100755
new mode 100644
index 0336395..9ce2499
--- a/debian/libtf2-eigen-dev.install
+++ b/debian/libtf2-eigen-dev.install
@@ -1,4 +1,3 @@
-#! /usr/bin/dh-exec
usr/include/tf2_eigen
usr/share/tf2_eigen
-usr/lib/pkgconfig/tf2_eigen.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/*/pkgconfig/tf2_eigen.pc
diff --git a/debian/libtf2-geometry-msgs-dev.install b/debian/libtf2-geometry-msgs-dev.install
old mode 100755
new mode 100644
index b83b10a..ac5422d
--- a/debian/libtf2-geometry-msgs-dev.install
+++ b/debian/libtf2-geometry-msgs-dev.install
@@ -1,4 +1,3 @@
-#! /usr/bin/dh-exec
usr/include/tf2_geometry_msgs
usr/share/tf2_geometry_msgs
-usr/lib/pkgconfig/tf2_geometry_msgs.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/*/pkgconfig/tf2_geometry_msgs.pc
diff --git a/debian/libtf2-kdl-dev.install b/debian/libtf2-kdl-dev.install
old mode 100755
new mode 100644
index 0b54a88..96c7042
--- a/debian/libtf2-kdl-dev.install
+++ b/debian/libtf2-kdl-dev.install
@@ -1,4 +1,3 @@
-#! /usr/bin/dh-exec
usr/include/tf2_kdl
usr/share/tf2_kdl
-usr/lib/pkgconfig/tf2_kdl.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/*/pkgconfig/tf2_kdl.pc
diff --git a/debian/libtf2-msgs-dev.install b/debian/libtf2-msgs-dev.install
old mode 100755
new mode 100644
index 718a241..f2fa414
--- a/debian/libtf2-msgs-dev.install
+++ b/debian/libtf2-msgs-dev.install
@@ -1,4 +1,3 @@
-#! /usr/bin/dh-exec
usr/include/tf2_msgs
usr/share/tf2_msgs
-usr/lib/pkgconfig/tf2_msgs.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/*/pkgconfig/tf2_msgs.pc
diff --git a/debian/libtf2-ros-dev.install b/debian/libtf2-ros-dev.install
old mode 100755
new mode 100644
index fd38a83..776b3fd
--- a/debian/libtf2-ros-dev.install
+++ b/debian/libtf2-ros-dev.install
@@ -1,5 +1,4 @@
-#! /usr/bin/dh-exec
usr/include/tf2_ros
usr/share/tf2_ros
-usr/lib/libtf2_ros.so
-usr/lib/pkgconfig/tf2_ros.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/*/libtf2_ros.so
+usr/lib/*/pkgconfig/tf2_ros.pc
diff --git a/debian/libtf2-ros0d.install b/debian/libtf2-ros0d.install
index 091104a..70f1118 100644
--- a/debian/libtf2-ros0d.install
+++ b/debian/libtf2-ros0d.install
@@ -1,3 +1 @@
-usr/lib/libtf2_ros.so.*
-usr/lib/tf2_ros/* /usr/bin
-
+usr/lib/*/libtf2_ros.so.*
diff --git a/debian/libtf2-sensor-msgs-dev.install b/debian/libtf2-sensor-msgs-dev.install
old mode 100755
new mode 100644
index d056aa4..b781462
--- a/debian/libtf2-sensor-msgs-dev.install
+++ b/debian/libtf2-sensor-msgs-dev.install
@@ -1,4 +1,3 @@
-#! /usr/bin/dh-exec
usr/include/tf2_sensor_msgs
usr/share/tf2_sensor_msgs
-usr/lib/pkgconfig/tf2_sensor_msgs.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/*/pkgconfig/tf2_sensor_msgs.pc
diff --git a/debian/python-tf2.install b/debian/python-tf2.install
index 686a538..b9c4723 100644
--- a/debian/python-tf2.install
+++ b/debian/python-tf2.install
@@ -1,2 +1,2 @@
usr/share/tf2_py
-usr/lib/pkgconfig/tf2_py.pc
+usr/lib/*/pkgconfig/tf2_py.pc /usr/lib/pkgconfig
diff --git a/debian/tf2-tools.install b/debian/tf2-tools.install
index 027b8a3..4a158b9 100755
--- a/debian/tf2-tools.install
+++ b/debian/tf2-tools.install
@@ -1,2 +1,3 @@
#!/usr/bin/dh-exec
-usr/lib/tf2_tools/view_frames.py => usr/bin/view_frames
+usr/lib/*/tf2_ros/* /usr/bin
+tf2_tools/scripts/view_frames.py => usr/bin/view_frames
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-geometry-experimental.git
More information about the debian-science-commits
mailing list