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

commit a989e62d96412e0060bec717daef628078be106b
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sun Nov 22 23:32:35 2015 +0100

    Convert to new catkin with multiarch
---
 debian/control                                   | 6 +++++-
 debian/libcamera-calibration-parsers-dev.install | 5 ++---
 debian/libcamera-calibration-parsers0d.install   | 4 ++--
 debian/libcamera-info-manager-dev.install        | 9 ++++-----
 debian/libcamera-info-manager0d.install          | 2 +-
 debian/libimage-transport-dev.install            | 9 ++++-----
 debian/libimage-transport0d.install              | 4 ++--
 debian/libpolled-camera-dev.install              | 9 ++++-----
 debian/libpolled-camera0d.install                | 4 ++--
 9 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/debian/control b/debian/control
index 4b5a71f..b23dbe7 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, libsensor-msgs-dev, librosconsole-dev, libboost-filesystem-dev, libyaml-cpp0.3-dev, libroscpp-dev, libmessage-filters-dev, pluginlib-dev, libroslib-dev, message-generation, libstd-msgs-dev, librostest-dev
+Build-Depends: debhelper (>= 9), catkin (>> 0.6.16-2), libsensor-msgs-dev, librosconsole-dev, libboost-filesystem-dev, libyaml-cpp0.3-dev, libroscpp-dev, libmessage-filters-dev, pluginlib-dev, libroslib-dev, message-generation, libstd-msgs-dev, librostest-dev, python-all
 Standards-Version: 3.9.6
 Section: libs
 Homepage: http://www.ros.org/wiki/image_common
@@ -22,6 +22,7 @@ Description: Robot OS camera_calibration_parsers package - development
 Package: libcamera-calibration-parsers0d
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: Robot OS camera_calibration_parsers package
  This package is part of Robot OS (ROS). It provides routines for
  reading and writing camera calibration parameters.
@@ -38,6 +39,7 @@ Description: Robot OS camera_info_manager package - development
 Package: libcamera-info-manager0d
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: Robot OS camera_info_manager package
  This package is part of Robot OS (ROS). It provides a C++ interface
  for camera calibration information: CameraInfo, SetCameraInfo service
@@ -58,6 +60,7 @@ Description: Robot OS image_transport package - development
 Package: libimage-transport0d
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: Robot OS image_transport package
  This package is part of Robot OS (ROS). This library should always be
  used to subscribe to and publish images. It (image_transport)
@@ -78,6 +81,7 @@ Description: Robot OS polled_camera package - development
 Package: libpolled-camera0d
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: Robot OS polled_camera package
  This package is part of Robot OS (ROS). It contains a service and C++
  helper classes for implementing a polled camera driver node and
diff --git a/debian/libcamera-calibration-parsers-dev.install b/debian/libcamera-calibration-parsers-dev.install
old mode 100755
new mode 100644
index 603c7e2..a89dc5a
--- a/debian/libcamera-calibration-parsers-dev.install
+++ b/debian/libcamera-calibration-parsers-dev.install
@@ -1,5 +1,4 @@
-#! /usr/bin/dh-exec
 usr/include/camera_calibration_parsers/*
-usr/lib/libcamera_calibration_parsers.so
-usr/lib/pkgconfig/camera_calibration_parsers.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/*/libcamera_calibration_parsers.so
+usr/lib/*/pkgconfig/camera_calibration_parsers.pc
 usr/share/camera_calibration_parsers/*
diff --git a/debian/libcamera-calibration-parsers0d.install b/debian/libcamera-calibration-parsers0d.install
index 1b9ef77..cb58f21 100644
--- a/debian/libcamera-calibration-parsers0d.install
+++ b/debian/libcamera-calibration-parsers0d.install
@@ -1,2 +1,2 @@
-usr/lib/camera_calibration_parsers/*
-usr/lib/libcamera_calibration_parsers.so.*
+usr/lib/*/camera_calibration_parsers
+usr/lib/*/libcamera_calibration_parsers.so.*
diff --git a/debian/libcamera-info-manager-dev.install b/debian/libcamera-info-manager-dev.install
old mode 100755
new mode 100644
index 4df72b1..effeeab
--- a/debian/libcamera-info-manager-dev.install
+++ b/debian/libcamera-info-manager-dev.install
@@ -1,5 +1,4 @@
-#! /usr/bin/dh-exec
-usr/include/camera_info_manager/*
-usr/lib/libcamera_info_manager.so
-usr/lib/pkgconfig/camera_info_manager.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
-usr/share/camera_info_manager/*
+usr/include/camera_info_manager
+usr/lib/*/libcamera_info_manager.so
+usr/lib/*/pkgconfig/camera_info_manager.pc
+usr/share/camera_info_manager
diff --git a/debian/libcamera-info-manager0d.install b/debian/libcamera-info-manager0d.install
index 44de616..fa5ed82 100644
--- a/debian/libcamera-info-manager0d.install
+++ b/debian/libcamera-info-manager0d.install
@@ -1 +1 @@
-usr/lib/libcamera_info_manager.so.*
+usr/lib/*/libcamera_info_manager.so.*
diff --git a/debian/libimage-transport-dev.install b/debian/libimage-transport-dev.install
old mode 100755
new mode 100644
index 8a4dc7c..9d58964
--- a/debian/libimage-transport-dev.install
+++ b/debian/libimage-transport-dev.install
@@ -1,5 +1,4 @@
-#! /usr/bin/dh-exec
-usr/include/image_transport/*
-usr/lib/libimage_transport*.so
-usr/lib/pkgconfig/image_transport.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
-usr/share/image_transport/*
+usr/include/image_transport
+usr/lib/*/libimage_transport*.so
+usr/lib/*/pkgconfig/image_transport.pc
+usr/share/image_transport
diff --git a/debian/libimage-transport0d.install b/debian/libimage-transport0d.install
index 6303fa8..36c8d3e 100644
--- a/debian/libimage-transport0d.install
+++ b/debian/libimage-transport0d.install
@@ -1,2 +1,2 @@
-usr/lib/image_transport/*
-usr/lib/libimage_transport*.so.*
+usr/lib/*/image_transport
+usr/lib/*/libimage_transport*.so.*
diff --git a/debian/libpolled-camera-dev.install b/debian/libpolled-camera-dev.install
old mode 100755
new mode 100644
index d4553ad..25a0ba4
--- a/debian/libpolled-camera-dev.install
+++ b/debian/libpolled-camera-dev.install
@@ -1,5 +1,4 @@
-#! /usr/bin/dh-exec
-usr/include/polled_camera/*
-usr/lib/libpolled_camera.so
-usr/lib/pkgconfig/polled_camera.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
-usr/share/polled_camera/*
+usr/include/polled_camera
+usr/lib/*/libpolled_camera.so
+usr/lib/*/pkgconfig/polled_camera.pc
+usr/share/polled_camera
diff --git a/debian/libpolled-camera0d.install b/debian/libpolled-camera0d.install
index 0ca5948..8535f71 100644
--- a/debian/libpolled-camera0d.install
+++ b/debian/libpolled-camera0d.install
@@ -1,2 +1,2 @@
-usr/lib/polled_camera/*
-usr/lib/libpolled_camera.so.*
+usr/lib/*/polled_camera
+usr/lib/*/libpolled_camera.so.*

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