[ros-interactive-markers] 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-interactive-markers.

commit 8ff0c4a7ab95afb40650f70b16ac078d9c60a23f
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sun Nov 22 23:43:07 2015 +0100

    Convert to new catkin with multiarch
---
 debian/control                            | 3 ++-
 debian/libinteractive-markers-dev.install | 5 ++---
 debian/libinteractive-markers0d.install   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index dd93163..a26feb5 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, librosconsole-dev, libroscpp-dev, python-rospy, librostest-dev, libstd-msgs-dev, libtf-dev, libvisualization-msgs-dev
+Build-Depends: debhelper (>= 9), catkin (>> 0.6.16-2), librosconsole-dev, libroscpp-dev, python-rospy, librostest-dev, libstd-msgs-dev, libtf-dev, libvisualization-msgs-dev, python-all
 Standards-Version: 3.9.6
 Section: libs
 Homepage: http://wiki.ros.org/interactive_markers
@@ -23,6 +23,7 @@ Description: ROS interactive_markers package - development files
 Package: libinteractive-markers0d
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Multi-Arch: same
 Description: ROS interactive_markers package
  3D interactive marker communication library for RViz and similar tools.
  .
diff --git a/debian/libinteractive-markers-dev.install b/debian/libinteractive-markers-dev.install
old mode 100755
new mode 100644
index 3e9d46f..cfa1c52
--- a/debian/libinteractive-markers-dev.install
+++ b/debian/libinteractive-markers-dev.install
@@ -1,5 +1,4 @@
-#! /usr/bin/dh-exec
 usr/include
-usr/lib/lib*.so
-usr/lib/pkgconfig/*.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*.pc
 usr/share
diff --git a/debian/libinteractive-markers0d.install b/debian/libinteractive-markers0d.install
index d0dbfd1..3ddde58 100644
--- a/debian/libinteractive-markers0d.install
+++ b/debian/libinteractive-markers0d.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-interactive-markers.git