[ros-geometric-shapes] 02/02: 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-geometric-shapes.

commit 30d6b48f7f123340fa899e2810cad1324c9e3395
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sun Nov 22 19:08:22 2015 +0100

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

diff --git a/debian/control b/debian/control
index 0e4bd4f..832628f 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, libboost-system-dev, libboost-filesystem-dev, libassimp-dev, liboctomap-dev, catkin, ros-cmake-modules, libvisualization-msgs-dev, libshape-msgs-dev, libresource-retriever-dev, librandom-numbers-dev, libeigen-stl-containers-dev, libeigen3-dev, libqhull-dev
+Build-Depends: debhelper (>= 9), libboost-system-dev, libboost-filesystem-dev, libassimp-dev, liboctomap-dev, catkin (>> 0.6.16-2), ros-cmake-modules, libvisualization-msgs-dev, libshape-msgs-dev, libresource-retriever-dev, librandom-numbers-dev, libeigen-stl-containers-dev, libeigen3-dev, libqhull-dev
 Standards-Version: 3.9.6
 Section: libs
 Homepage: http://wiki.ros.org/geometric_shapes
@@ -24,6 +24,7 @@ Description: Robot OS geometric_shapes package - development files
 Package: libgeometric-shapes0d
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Multi-Arch: same
 Description: Robot OS geometric_shapes package
  This package is part of Robot OS (ROS), and contains generic
  definitions of geometric shapes and bodies.
diff --git a/debian/libgeometric-shapes-dev.install b/debian/libgeometric-shapes-dev.install
old mode 100755
new mode 100644
index 3e9d46f..cfa1c52
--- a/debian/libgeometric-shapes-dev.install
+++ b/debian/libgeometric-shapes-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/libgeometric-shapes0d.install b/debian/libgeometric-shapes0d.install
index d0dbfd1..3ddde58 100644
--- a/debian/libgeometric-shapes0d.install
+++ b/debian/libgeometric-shapes0d.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-geometric-shapes.git