[ros-nodelet-core] 01/01: 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-nodelet-core.

commit e297004955fa3fc8fd7cfb1bc12d86d8638b8b07
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Mon Nov 23 07:39:53 2015 +0100

    Convert to new catkin with multiarch
---
 debian/control                            | 3 ++-
 debian/libnodelet-topic-tools-dev.install | 7 +++----
 debian/libnodeletlib-dev.install          | 9 ++++-----
 debian/libnodeletlib0d.install            | 2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/debian/control b/debian/control
index 1c2eb1c..45dd1ec 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), catkin, libbondcpp-dev, ros-cmake-modules,
+Build-Depends: debhelper (>= 9), catkin (>> 0.6.16-2), libbondcpp-dev, ros-cmake-modules,
 		libbond-dev, message-runtime, libroscpp-core-dev,
 		libstd-msgs-dev, libroscpp-dev, librosconsole-dev,
 		libros-rosgraph-msgs-dev, libxmlrpcpp-dev,
@@ -74,6 +74,7 @@ Description: ROS nodelet library - development
 Package: libnodeletlib0d
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: ROS nodelet library
  The nodelet package is designed to provide a way to run multiple algorithms in
  the same process with zero copy transport between algorithms.
diff --git a/debian/libnodelet-topic-tools-dev.install b/debian/libnodelet-topic-tools-dev.install
old mode 100755
new mode 100644
index 778acff..227a5a0
--- a/debian/libnodelet-topic-tools-dev.install
+++ b/debian/libnodelet-topic-tools-dev.install
@@ -1,4 +1,3 @@
-#! /usr/bin/dh-exec
-usr/include/nodelet_topic_tools/*
-usr/lib/pkgconfig/nodelet_topic_tools.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
-usr/share/nodelet_topic_tools/*
+usr/include/nodelet_topic_tools
+usr/lib/*/pkgconfig/nodelet_topic_tools.pc
+usr/share/nodelet_topic_tools
diff --git a/debian/libnodeletlib-dev.install b/debian/libnodeletlib-dev.install
old mode 100755
new mode 100644
index 1472645..46bed8b
--- a/debian/libnodeletlib-dev.install
+++ b/debian/libnodeletlib-dev.install
@@ -1,10 +1,9 @@
-#! /usr/bin/dh-exec
 usr/include/nodelet/exception.h
 usr/include/nodelet/loader.h
 usr/include/nodelet/nodelet.h
-usr/include/nodelet/detail/*
-usr/lib/lib*.so
-usr/lib/nodelet
-usr/lib/pkgconfig/nodelet.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/include/nodelet/detail
+usr/lib/*/lib*.so
+usr/lib/*/nodelet
+usr/lib/*/pkgconfig/nodelet.pc
 usr/share/nodelet/cmake/nodeletConfig*
 usr/share/nodelet/package.xml
diff --git a/debian/libnodeletlib0d.install b/debian/libnodeletlib0d.install
index d0dbfd1..3ddde58 100644
--- a/debian/libnodeletlib0d.install
+++ b/debian/libnodeletlib0d.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*

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