[ros-actionlib] 01/01: Convert to Multi-Arch (needs new catkin package)

[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-actionlib.

commit 352983edf3429392d1184b28e49c7740f223bd2c
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Fri Nov 20 07:50:29 2015 +0100

    Convert to Multi-Arch (needs new catkin package)
---
 debian/control                  | 6 ++++--
 debian/libactionlib-dev.install | 5 ++---
 debian/libactionlib0d.install   | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 6fec097..98ff224 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ 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, libroscpp-core-dev, message-generation, libstd-msgs-dev,
+Build-Depends: debhelper (>= 9), catkin (>> 0.6.16-2),
+		libroscpp-core-dev, message-generation, libstd-msgs-dev,
 		libactionlib-msgs-dev, python-rospy, python-rostest,
 		python-all (>= 2.6.6-3), python-setuptools (>= 0.6b3),
 		libboost-dev, libboost-thread-dev, libboost-signals-dev,
@@ -26,6 +26,8 @@ Vcs-Git: git://anonscm.debian.org/debian-science/packages/ros/ros-actionlib.git
 Package: libactionlib0d
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Robot OS actionlib library
  This package is part of Robot OS (ROS). The actionlib stack provides
  a standardized interface for interfacing with preemptable
diff --git a/debian/libactionlib-dev.install b/debian/libactionlib-dev.install
old mode 100755
new mode 100644
index 21395bd..7978062
--- a/debian/libactionlib-dev.install
+++ b/debian/libactionlib-dev.install
@@ -1,5 +1,4 @@
-#! /usr/bin/dh-exec
 usr/include/actionlib
 usr/share/actionlib
-usr/lib/libactionlib.so
-usr/lib/pkgconfig/actionlib.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/*/libactionlib.so
+usr/lib/*/pkgconfig/actionlib.pc
diff --git a/debian/libactionlib0d.install b/debian/libactionlib0d.install
index dff72ce..6e86c98 100644
--- a/debian/libactionlib0d.install
+++ b/debian/libactionlib0d.install
@@ -1 +1 @@
-usr/lib/libactionlib.so.*
+usr/lib/*/libactionlib.so.*

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