[ros-bond-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-bond-core.

commit c3ee9b4062deeb53a8d82f7c6a27275e65120c29
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sun Nov 22 18:14:56 2015 +0100

    Convert to new catkin with multiarch
---
 debian/control                | 3 ++-
 debian/libbond-dev.install    | 2 +-
 debian/libbondcpp-dev.install | 5 ++---
 debian/libbondcpp0d.install   | 2 +-
 debian/libsmc-dev.install     | 2 +-
 debian/python-bondpy.install  | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index eed2e16..21bf101 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, message-generation, libstd-msgs-dev, dh-exec,
+Build-Depends: debhelper (>= 9), catkin (>> 0.6.16-2), message-generation, libstd-msgs-dev, dh-exec,
 		python-all (>= 2.6.6-3), python-setuptools (>=0.6b3),
 		ros-cmake-modules, libroscpp-dev, librosconsole-dev,
 		libros-rosgraph-msgs-dev, libxmlrpcpp-dev, uuid-dev,
@@ -101,6 +101,7 @@ Description: Development files for Robot OS bondcpp library
 Package: libbondcpp0d
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: Robot OS bondcpp library
  This package is part of Robot OS (ROS). It is the 'bond' process state
  machine library C++ implementation.
diff --git a/debian/libbond-dev.install b/debian/libbond-dev.install
index a115afa..7f76015 100644
--- a/debian/libbond-dev.install
+++ b/debian/libbond-dev.install
@@ -1,3 +1,3 @@
 usr/include/bond/*
-usr/lib/pkgconfig/bond.pc
+usr/lib/*/pkgconfig/bond.pc
 usr/share/bond/*
diff --git a/debian/libbondcpp-dev.install b/debian/libbondcpp-dev.install
old mode 100755
new mode 100644
index dab0726..16e6ec1
--- a/debian/libbondcpp-dev.install
+++ b/debian/libbondcpp-dev.install
@@ -1,5 +1,4 @@
-#! /usr/bin/dh-exec
 usr/include/bondcpp/*
-usr/lib/lib*.so
-usr/lib/pkgconfig/bondcpp.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/bondcpp.pc
 usr/share/bondcpp/*
diff --git a/debian/libbondcpp0d.install b/debian/libbondcpp0d.install
index d0dbfd1..3ddde58 100644
--- a/debian/libbondcpp0d.install
+++ b/debian/libbondcpp0d.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/libsmc-dev.install b/debian/libsmc-dev.install
index 095d360..fa9e24d 100644
--- a/debian/libsmc-dev.install
+++ b/debian/libsmc-dev.install
@@ -1,2 +1,2 @@
 usr/include/smclib/*
-debian/tmp/usr/share/smclib
+usr/share/smclib
diff --git a/debian/python-bondpy.install b/debian/python-bondpy.install
index a458e8b..7389e2b 100644
--- a/debian/python-bondpy.install
+++ b/debian/python-bondpy.install
@@ -1 +1 @@
-debian/tmp/usr/share/bondpy
+usr/share/bondpy

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