[ros-rospack] 01/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-rospack.

commit bec52d122710a07b2411d1966422f39428429544
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Mon Nov 23 14:44:40 2015 +0100

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

diff --git a/debian/control b/debian/control
index cbeceb2..c103fe2 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), cmake, catkin, libboost-filesystem-dev, libboost-program-options-dev, libboost-system-dev, libpython-dev, libtinyxml-dev, libgtest-dev, ros-cmake-modules
+Build-Depends: debhelper (>= 9), catkin (>> 0.6.16-2), libboost-filesystem-dev, libboost-program-options-dev, libboost-system-dev, libpython-dev, libtinyxml-dev, libgtest-dev, ros-cmake-modules
 Standards-Version: 3.9.6
 Section: libs
 Homepage: https://github.com/ros/rospack
@@ -29,6 +29,7 @@ Description: Robot OS package information library header files
 Package: librospack0d
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: Robot OS package information library
  This package is part of Robot OS (ROS). rospack is a command-line
  tool for retrieving information about ROS packages available on the
diff --git a/debian/librospack-dev.install b/debian/librospack-dev.install
index bdf72b5..23ce3cd 100644
--- a/debian/librospack-dev.install
+++ b/debian/librospack-dev.install
@@ -1,4 +1,4 @@
-usr/include/*
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
-usr/share/rospack/*
+usr/include
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig
+usr/share/rospack
diff --git a/debian/librospack0d.install b/debian/librospack0d.install
index d0dbfd1..3ddde58 100644
--- a/debian/librospack0d.install
+++ b/debian/librospack0d.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-rospack.git