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

commit 30bcc76727b973f7e4ab48009055940aac4ce90a
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Mon Nov 23 15:20:28 2015 +0100

    Convert to new catkin with multiarch
---
 debian/control                       | 7 +++++--
 debian/libcv-bridge-dev.install      | 9 ++++-----
 debian/libcv-bridge0d.install        | 2 +-
 debian/libimage-geometry-dev.install | 9 ++++-----
 debian/libimage-geometry0d.install   | 2 +-
 debian/libopencv-apps-dev.install    | 9 ++++-----
 debian/libopencv-apps0d.install      | 4 ++--
 7 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/debian/control b/debian/control
index 56392c8..7322965 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), catkin, librosconsole-dev, libsensor-msgs-dev, libboost-python-dev, libopencv-dev, libdynamic-reconfigure-config-init-mutex-dev, message-generation, libimage-transport-dev, libnodeletlib-dev, libroscpp-dev, python-numpy, python-dynamic-reconfigure, libstd-srvs-dev
+Build-Depends: debhelper (>= 9), catkin (>> 0.6.16-2), librosconsole-dev, libsensor-msgs-dev, libboost-python-dev, libopencv-dev, libdynamic-reconfigure-config-init-mutex-dev, message-generation, libimage-transport-dev, libnodeletlib-dev, libroscpp-dev, python-numpy, python-dynamic-reconfigure, libstd-srvs-dev, dh-python, python
 Standards-Version: 3.9.6
 Section: libs
 Homepage: http://wiki.ros.org/vision_opencv
@@ -22,13 +22,14 @@ Description: camera_calibration_parsers Robot OS package - development
 Package: libcv-bridge0d
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: camera_calibration_parsers Robot OS package
  This package is part of Robot OS (ROS). It is a library containing
  routines for reading and writing camera calibration parameters.
 
 Package: python-cv-bridge
 Section: python
-Architecture: all
+Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-genpy, python-std-msgs
 Description: polled_camera ROS package - Python bindings
  This package is part of Robot OS (ROS). It contains the python
@@ -48,6 +49,7 @@ Description: camera_calibration_parsers Robot OS package - development
 Package: libimage-geometry0d
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: camera_calibration_parsers Robot OS package
  This package is part of Robot OS (ROS). It contains routines for
  reading and writing camera calibration parameters.
@@ -74,6 +76,7 @@ Description: camera_calibration_parsers Robot OS package - development
 Package: libopencv-apps0d
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: camera_calibration_parsers Robot OS package
  This package is part of Robot OS (ROS). It is a library for reading
  and writing camera calibration parameters.
diff --git a/debian/libcv-bridge-dev.install b/debian/libcv-bridge-dev.install
old mode 100755
new mode 100644
index c054bf9..67b597a
--- a/debian/libcv-bridge-dev.install
+++ b/debian/libcv-bridge-dev.install
@@ -1,5 +1,4 @@
-#! /usr/bin/dh-exec
-usr/include/cv_bridge/*
-usr/lib/libcv_bridge.so
-usr/lib/pkgconfig/cv_bridge.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
-usr/share/cv_bridge/*
+usr/include/cv_bridge
+usr/lib/*/libcv_bridge.so
+usr/lib/*/pkgconfig/cv_bridge.pc
+usr/share/cv_bridge
diff --git a/debian/libcv-bridge0d.install b/debian/libcv-bridge0d.install
index c55d43b..d5d9d6f 100644
--- a/debian/libcv-bridge0d.install
+++ b/debian/libcv-bridge0d.install
@@ -1 +1 @@
-usr/lib/libcv_bridge.so.*
+usr/lib/*/libcv_bridge.so.*
diff --git a/debian/libimage-geometry-dev.install b/debian/libimage-geometry-dev.install
old mode 100755
new mode 100644
index 42941f5..d4dc8c8
--- a/debian/libimage-geometry-dev.install
+++ b/debian/libimage-geometry-dev.install
@@ -1,5 +1,4 @@
-#! /usr/bin/dh-exec
-usr/include/image_geometry/*
-usr/lib/libimage_geometry.so
-usr/lib/pkgconfig/image_geometry.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
-usr/share/image_geometry/*
+usr/include/image_geometry
+usr/lib/*/libimage_geometry.so
+usr/lib/*/pkgconfig/image_geometry.pc
+usr/share/image_geometry
diff --git a/debian/libimage-geometry0d.install b/debian/libimage-geometry0d.install
index 56f7fab..2ee44b7 100644
--- a/debian/libimage-geometry0d.install
+++ b/debian/libimage-geometry0d.install
@@ -1 +1 @@
-usr/lib/libimage_geometry.so.*
+usr/lib/*/libimage_geometry.so.*
diff --git a/debian/libopencv-apps-dev.install b/debian/libopencv-apps-dev.install
old mode 100755
new mode 100644
index bf47883..baef5fd
--- a/debian/libopencv-apps-dev.install
+++ b/debian/libopencv-apps-dev.install
@@ -1,5 +1,4 @@
-#! /usr/bin/dh-exec
-usr/include/opencv_apps/*
-usr/lib/libopencv_apps.so
-usr/lib/pkgconfig/opencv_apps.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
-usr/share/opencv_apps/*
+usr/include/opencv_apps
+usr/lib/*/libopencv_apps.so
+usr/lib/*/pkgconfig/opencv_apps.pc
+usr/share/opencv_apps
diff --git a/debian/libopencv-apps0d.install b/debian/libopencv-apps0d.install
index 7afb9a3..803a8fe 100644
--- a/debian/libopencv-apps0d.install
+++ b/debian/libopencv-apps0d.install
@@ -1,2 +1,2 @@
-usr/lib/opencv_apps
-usr/lib/libopencv_apps.so.*
+usr/lib/*/opencv_apps
+usr/lib/*/libopencv_apps.so.*

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