[ros-geometry] 01/02: Convert to new catkin with multiarch

[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-geometry.

commit c6872656f48e77ca600836da81b4ad89c9df629d
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sun Nov 22 22:43:41 2015 +0100

    Convert to new catkin with multiarch
---
 debian/cl-tf.install                 |  1 -
 debian/control                       |  6 ++++--
 debian/libtf-conversions-dev.install |  6 ++----
 debian/libtf-conversions0d.install   |  4 +---
 debian/libtf-dev.install             |  5 ++---
 debian/libtf0d.install               |  3 +--
 debian/tf-tools.install              | 16 +++++++---------
 7 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/debian/cl-tf.install b/debian/cl-tf.install
index 75368ac..4f1a18c 100644
--- a/debian/cl-tf.install
+++ b/debian/cl-tf.install
@@ -1,2 +1 @@
 usr/share/common-lisp/ros/tf
-
diff --git a/debian/control b/debian/control
index 8eb20bd..6393d9f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
 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, 
+Build-Depends: debhelper (>= 9),
+		catkin (>> 0.6.16-2), libroscpp-core-dev, message-generation, libstd-msgs-dev,
 		python-all, python-setuptools, dh-python,
 		libgeometry-msgs-dev, libactionlib-msgs-dev,
 		libconsole-bridge-dev, python-rospy, libpython-dev,
@@ -27,6 +27,7 @@ Vcs-Git: git://anonscm.debian.org/debian-science/packages/ros/ros-geometry.git
 Package: libtf0d
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Multi-Arch: same
 Description: Robot OS tf transform library to keep track of multiple coordinate frames
  tf is a package that lets the user keep track of multiple coordinate frames
  over time. tf maintains the relationship between coordinate frames in a tree
@@ -91,6 +92,7 @@ Description: Robot OS tf transform library -- LISP interface
 Package: libtf-conversions0d
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, libtf0d ( = ${binary:Version}),
+Multi-Arch: same
 Description: Robot OS conversion library between tf and Eigen and KDL
  This package contains a set of conversion functions to convert
  common tf datatypes (point, vector, pose, etc) into semantically
diff --git a/debian/libtf-conversions-dev.install b/debian/libtf-conversions-dev.install
old mode 100755
new mode 100644
index 9c2cf6e..83cbe32
--- a/debian/libtf-conversions-dev.install
+++ b/debian/libtf-conversions-dev.install
@@ -1,6 +1,4 @@
-#! /usr/bin/dh-exec
 usr/include/*_conversions
 usr/share/*_conversions
-usr/lib/lib*_conversions.so
-usr/lib/pkgconfig/*_conversions.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
-
+usr/lib/*/lib*_conversions.so
+usr/lib/*/pkgconfig/*_conversions.pc
diff --git a/debian/libtf-conversions0d.install b/debian/libtf-conversions0d.install
index 8d26860..19ac5b9 100644
--- a/debian/libtf-conversions0d.install
+++ b/debian/libtf-conversions0d.install
@@ -1,3 +1 @@
-usr/lib/lib*_*.so.*
-
-
+usr/lib/*/lib*_*.so.*
diff --git a/debian/libtf-dev.install b/debian/libtf-dev.install
old mode 100755
new mode 100644
index 6484f4a..2a4a3c1
--- a/debian/libtf-dev.install
+++ b/debian/libtf-dev.install
@@ -1,5 +1,4 @@
-#! /usr/bin/dh-exec
 usr/include/tf
 usr/share/tf
-usr/lib/libtf.so
-usr/lib/pkgconfig/tf.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/*/libtf.so
+usr/lib/*/pkgconfig/tf.pc
diff --git a/debian/libtf0d.install b/debian/libtf0d.install
index 8afaafe..749f020 100644
--- a/debian/libtf0d.install
+++ b/debian/libtf0d.install
@@ -1,2 +1 @@
-usr/lib/libtf.so.*
-
+usr/lib/*/libtf.so.*
diff --git a/debian/tf-tools.install b/debian/tf-tools.install
old mode 100755
new mode 100644
index fa9f6fa..bbc21ce
--- a/debian/tf-tools.install
+++ b/debian/tf-tools.install
@@ -1,9 +1,7 @@
-#!/usr/bin/dh-exec
-usr/lib/tf/view_frames => usr/bin/view_frames_tf
-usr/lib/tf/static_transform_publisher
-usr/lib/tf/tf_change_notifier
-usr/lib/tf/tf_echo
-usr/lib/tf/tf_empty_listener
-usr/lib/tf/tf_monitor
-usr/lib/tf/tf_remap
-
+usr/lib/*/tf/view_frames
+usr/lib/*/tf/static_transform_publisher
+usr/lib/*/tf/tf_change_notifier
+usr/lib/*/tf/tf_echo
+usr/lib/*/tf/tf_empty_listener
+usr/lib/*/tf/tf_monitor
+usr/lib/*/tf/tf_remap

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