[ros-robot-model] 01/01: Convert to new catkin with multiarch

Mon Nov 23 08:11:13 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-robot-model.

commit 3e87fe7eeff8f4afb6435935b1bbfc26035c3850
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Mon Nov 23 09:04:56 2015 +0100

    Convert to new catkin with multiarch
---
 debian/control                           | 8 ++++++--
 debian/joint-state-publisher.install     | 2 +-
 debian/libcollada-parser-dev.install     | 5 ++---
 debian/libcollada-parser0d.install       | 2 +-
 debian/libcollada-urdf-dev.install       | 5 ++---
 debian/libcollada-urdf0d.install         | 4 ++--
 debian/libkdl-parser-dev.install         | 5 ++---
 debian/libkdl-parser0d.install           | 2 +-
 debian/liburdf-dev.install               | 5 ++---
 debian/liburdf-parser-plugin-dev.install | 3 +--
 debian/liburdf0d.install                 | 2 +-
 11 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/debian/control b/debian/control
index 89aa60a..19338a2 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ 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, libboost-system-dev, liburdfdom-headers-dev, libboost-thread-dev, liburdfdom-dev, pluginlib-dev, librosconsole-bridge-dev, libroscpp-dev, ros-cmake-modules, libtinyxml-dev, libboost-system-dev, libclass-loader-dev, libangles-dev, libresource-retriever-dev, libgeometric-shapes-dev, libtf-dev, libassimp-dev, libboost-filesystem-dev, libboost-program-options-dev, libcollada-dom2.4-dp-dev, liborocos-kdl-dev, librostest-dev, libpcre3-dev, libo [...]
+Build-Depends: debhelper (>= 9), catkin (>> 0.6.16-2), libboost-system-dev, liburdfdom-headers-dev, libboost-thread-dev, liburdfdom-dev, pluginlib-dev, librosconsole-bridge-dev, libroscpp-dev, ros-cmake-modules, libtinyxml-dev, libboost-system-dev, libclass-loader-dev, libangles-dev, libresource-retriever-dev, libgeometric-shapes-dev, libtf-dev, libassimp-dev, libboost-filesystem-dev, libboost-program-options-dev, libcollada-dom2.4-dp-dev, liborocos-kdl-dev, librostest-dev, libpcre3-dev, [...]
 Standards-Version: 3.9.6
 Section: libs
 Homepage: http://wiki.ros.org/robot_model
@@ -27,6 +27,7 @@ Description: Development files for ROS collada_parser library
 Package: libcollada-parser0d
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: ROS collada_parser library
  This package contains a C++ parser for the Collada robot description format.
  The parser reads a Collada XML robot description, and creates a C++ URDF
@@ -52,6 +53,7 @@ Description: Development files for ROS collada_urdf library
 Package: libcollada-urdf0d
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: ROS collada_urdf library
  This package contains a tool to convert Unified Robot Description Format
  (URDF) documents into COLLAborative Design Activity (COLLADA) documents.
@@ -64,7 +66,7 @@ Description: ROS collada_urdf library
 Package: joint-state-publisher
 Section: utils
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, python
 Description: ROS joint_state_publisher
  This package contains a tool for setting and publishing joint state values for
  a given URDF.
@@ -84,6 +86,7 @@ Description: Development files for ROS collada_urdf library
 Package: libkdl-parser0d
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: ROS collada_urdf library
  The Kinematics and Dynamics Library (KDL) defines a tree structure to
  represent the kinematic and dynamic parameters of a robot mechanism.
@@ -107,6 +110,7 @@ Description: Development files for ROS urdf library
 Package: liburdf0d
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: ROS urdf library
  This package contains a C++ parser for the Unified Robot Description Format
  (URDF), which is an XML format for representing a robot model. The code API of
diff --git a/debian/joint-state-publisher.install b/debian/joint-state-publisher.install
index d208f52..8344129 100644
--- a/debian/joint-state-publisher.install
+++ b/debian/joint-state-publisher.install
@@ -1,2 +1,2 @@
-usr/lib/joint_state_publisher
+usr/lib/*/joint_state_publisher/* usr/bin
 /usr/share/joint_state_publisher/package.xml
diff --git a/debian/libcollada-parser-dev.install b/debian/libcollada-parser-dev.install
old mode 100755
new mode 100644
index 4ef5013..36adbea
--- a/debian/libcollada-parser-dev.install
+++ b/debian/libcollada-parser-dev.install
@@ -1,5 +1,4 @@
-#! /usr/bin/dh-exec
 usr/include/collada_parser
-usr/lib/libcollada_parser.so
-usr/lib/pkgconfig/collada_parser.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/*/libcollada_parser.so
+usr/lib/*/pkgconfig/collada_parser.pc
 usr/share/collada_parser
diff --git a/debian/libcollada-parser0d.install b/debian/libcollada-parser0d.install
index 16e5625..e094554 100644
--- a/debian/libcollada-parser0d.install
+++ b/debian/libcollada-parser0d.install
@@ -1 +1 @@
-usr/lib/libcollada_parser.so.*
+usr/lib/*/libcollada_parser.so.*
diff --git a/debian/libcollada-urdf-dev.install b/debian/libcollada-urdf-dev.install
old mode 100755
new mode 100644
index a1c8b83..2a54e54
--- a/debian/libcollada-urdf-dev.install
+++ b/debian/libcollada-urdf-dev.install
@@ -1,5 +1,4 @@
-#! /usr/bin/dh-exec
 usr/include/collada_urdf
-usr/lib/libcollada_urdf.so
-usr/lib/pkgconfig/collada_urdf.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/*/libcollada_urdf.so
+usr/lib/*/pkgconfig/collada_urdf.pc
 usr/share/collada_urdf
diff --git a/debian/libcollada-urdf0d.install b/debian/libcollada-urdf0d.install
index 9eb0ad9..16665fd 100644
--- a/debian/libcollada-urdf0d.install
+++ b/debian/libcollada-urdf0d.install
@@ -1,2 +1,2 @@
-usr/lib/collada_urdf
-usr/lib/libcollada_urdf.so.*
+usr/lib/*/collada_urdf
+usr/lib/*/libcollada_urdf.so.*
diff --git a/debian/libkdl-parser-dev.install b/debian/libkdl-parser-dev.install
old mode 100755
new mode 100644
index b18c2ea..d15f921
--- a/debian/libkdl-parser-dev.install
+++ b/debian/libkdl-parser-dev.install
@@ -1,5 +1,4 @@
-#! /usr/bin/dh-exec
 usr/include/kdl_parser
-usr/lib/libkdl_parser.so
-usr/lib/pkgconfig/kdl_parser.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/*/libkdl_parser.so
+usr/lib/*/pkgconfig/kdl_parser.pc
 usr/share/kdl_parser
diff --git a/debian/libkdl-parser0d.install b/debian/libkdl-parser0d.install
index a04505a..dee7eeb 100644
--- a/debian/libkdl-parser0d.install
+++ b/debian/libkdl-parser0d.install
@@ -1 +1 @@
-usr/lib/libkdl_parser.so.*
+usr/lib/*/libkdl_parser.so.*
diff --git a/debian/liburdf-dev.install b/debian/liburdf-dev.install
old mode 100755
new mode 100644
index 48e18c2..1714b5b
--- a/debian/liburdf-dev.install
+++ b/debian/liburdf-dev.install
@@ -1,5 +1,4 @@
-#! /usr/bin/dh-exec
 usr/include/urdf
-usr/lib/liburdf.so
-usr/lib/pkgconfig/urdf.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/*/liburdf.so
+usr/lib/*/pkgconfig/urdf.pc
 usr/share/urdf
diff --git a/debian/liburdf-parser-plugin-dev.install b/debian/liburdf-parser-plugin-dev.install
old mode 100755
new mode 100644
index 0c84a61..8b722ab
--- a/debian/liburdf-parser-plugin-dev.install
+++ b/debian/liburdf-parser-plugin-dev.install
@@ -1,4 +1,3 @@
-#! /usr/bin/dh-exec
 usr/include/urdf_parser_plugin
-usr/lib/pkgconfig/urdf_parser_plugin.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/*/pkgconfig/urdf_parser_plugin.pc
 usr/share/urdf_parser_plugin
diff --git a/debian/liburdf0d.install b/debian/liburdf0d.install
index 27f4ac8..44d408c 100644
--- a/debian/liburdf0d.install
+++ b/debian/liburdf0d.install
@@ -1 +1 @@
-usr/lib/liburdf.so.*
+usr/lib/*/liburdf.so.*

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

