[ros-rosconsole-bridge] 01/03: 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-rosconsole-bridge.

commit 708ee610a9220fc5960e3e4fc7d2c72b14f40f39
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Mon Nov 23 14:28:00 2015 +0100

    Convert to new catkin with multiarch
---
 debian/control                          | 3 ++-
 debian/librosconsole-bridge-dev.install | 7 +++----
 debian/librosconsole-bridge0d.install   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 114e001..b57876e 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, libconsole-bridge-dev,
+Build-Depends: debhelper (>= 9), catkin (>> 0.6.16-2), libconsole-bridge-dev,
 	librosconsole-dev, libroscpp-core-dev, libboost-regex-dev,
 	dh-exec (>=0.3)
 Standards-Version: 3.9.6
@@ -26,6 +26,7 @@ Description: Robot OS library for connecting console logging types
 Package: librosconsole-bridge0d
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: Robot OS library for connecting console logging types
  This package is part of Robot OS (ROS). It contains a library used in
  conjunction with console_bridge and rosconsole for connecting
diff --git a/debian/librosconsole-bridge-dev.install b/debian/librosconsole-bridge-dev.install
old mode 100755
new mode 100644
index cf8e00c..50bd5d5
--- a/debian/librosconsole-bridge-dev.install
+++ b/debian/librosconsole-bridge-dev.install
@@ -1,5 +1,4 @@
-#! /usr/bin/dh-exec
-usr/include/*
-usr/lib/lib*.so
-usr/lib/pkgconfig/* usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/include
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig
 usr/share/rosconsole_bridge/*
diff --git a/debian/librosconsole-bridge0d.install b/debian/librosconsole-bridge0d.install
index d0dbfd1..3ddde58 100644
--- a/debian/librosconsole-bridge0d.install
+++ b/debian/librosconsole-bridge0d.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-rosconsole-bridge.git