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

commit 5d7c8dc4824a56ea8a521dba591f336ba91712df
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Mon Nov 23 14:50:28 2015 +0100

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

diff --git a/debian/control b/debian/control
index dbe4416..226acac 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, libboost-filesystem-dev, libboost-program-options-dev, libboost-signals-dev, libboost-system-dev, libboost-thread-dev, libassimp-dev, libgl1-mesa-dev | libgl-dev, libqt4-opengl-dev, libangles-dev, ros-cmake-modules, libimage-geometry-dev, libimage-transport-dev, libinteractive-markers-dev, liblaser-geometry-dev, libmap-msgs-dev, libmessage-filters-dev, libnav-msgs-dev, pluginlib-dev, python-qt-binding, libresource-retriever-dev, librosbag [...]
+Build-Depends: debhelper (>= 9), catkin (>> 0.6.16-2), libboost-filesystem-dev, libboost-program-options-dev, libboost-signals-dev, libboost-system-dev, libboost-thread-dev, libassimp-dev, libgl1-mesa-dev | libgl-dev, libqt4-opengl-dev, libangles-dev, ros-cmake-modules, libimage-geometry-dev, libimage-transport-dev, libinteractive-markers-dev, liblaser-geometry-dev, libmap-msgs-dev, libmessage-filters-dev, libnav-msgs-dev, pluginlib-dev, python-qt-binding, libresource-retriever-dev, libr [...]
 Standards-Version: 3.9.6
 Section: libs
 Homepage: http://wiki.ros.org/rviz
@@ -22,6 +22,7 @@ Description: 3D visualization tool for Robot OS.
 Package: librviz0d
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: 3D visualization tool for Robot OS.
  This package is part of Robot OS (ROS). This package contains 
  the rviz library.
diff --git a/debian/librviz-dev.install b/debian/librviz-dev.install
old mode 100755
new mode 100644
index 778dd6a..5426a07
--- a/debian/librviz-dev.install
+++ b/debian/librviz-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/lib/*/lib*.so
+usr/lib/*/pkgconfig
 usr/share/rviz/cmake
diff --git a/debian/librviz0d.install b/debian/librviz0d.install
index d0dbfd1..3ddde58 100644
--- a/debian/librviz0d.install
+++ b/debian/librviz0d.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-rviz.git