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

commit 1f3a0b42179cf7cc7d04e5b4a9649bb0c073f591
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Mon Nov 23 08:23:47 2015 +0100

    Convert to new catkin with multiarch
---
 debian/control                           | 12 +++++-------
 debian/libresource-retriever-dev.install |  5 ++---
 debian/libresource-retriever0d.install   |  2 +-
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/debian/control b/debian/control
index dc5e7f6..9364d30 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, librosconsole-dev, libroslib-dev,libcurl4-openssl-dev | libcurl-dev
+Build-Depends: debhelper (>= 9), catkin (>> 0.6.16-2), librosconsole-dev, libroslib-dev, libcurl4-openssl-dev | libcurl-dev, python-all
 Standards-Version: 3.9.6
 Section: libs
 Homepage: http://www.ros.org/wiki/resource_retriever
@@ -14,14 +14,14 @@ Vcs-Git: git://anonscm.debian.org/debian-science/packages/ros/ros-resource-retri
 Package: libresource-retriever0d
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Multi-Arch: same
 Description: Robot OS resource_retriever library
  This package is part of Robot OS (ROS). It retrieves data from
  url-format files such as http://, ftp://, package:// file://, etc.,
  and loads the data into memory. The package:// url for ros packages
  is translated into a local file:// url. The resource retriever was
  initially designed to load mesh files into memory, but it can be used
- for any type of data. The resource retriever is based on the the
- libcurl library.
+ for any type of data. The resource retriever is based on the libcurl library.
  .
  This package contains the library itself.
 
@@ -36,8 +36,7 @@ Description: Robot OS resource_retriever library - development files
  and loads the data into memory. The package:// url for ros packages
  is translated into a local file:// url. The resource retriever was
  initially designed to load mesh files into memory, but it can be used
- for any type of data. The resource retriever is based on the the
- libcurl library.
+ for any type of data. The resource retriever is based on the libcurl library.
  .
  This package contains the development files.
 
@@ -51,7 +50,6 @@ Description: Robot OS resource_retriever library - Python
  and loads the data into memory. The package:// url for ros packages
  is translated into a local file:// url. The resource retriever was
  initially designed to load mesh files into memory, but it can be used
- for any type of data. The resource retriever is based on the the
- libcurl library.
+ for any type of data. The resource retriever is based on the libcurl library.
  .
  This package contains the Python binding.
diff --git a/debian/libresource-retriever-dev.install b/debian/libresource-retriever-dev.install
old mode 100755
new mode 100644
index 9a56576..72ea5a2
--- a/debian/libresource-retriever-dev.install
+++ b/debian/libresource-retriever-dev.install
@@ -1,5 +1,4 @@
-#! /usr/bin/dh-exec
 usr/include
 usr/share
-usr/lib/lib*.so
-usr/lib/pkgconfig/*.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*.pc
diff --git a/debian/libresource-retriever0d.install b/debian/libresource-retriever0d.install
index d0dbfd1..3ddde58 100644
--- a/debian/libresource-retriever0d.install
+++ b/debian/libresource-retriever0d.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-resource-retriever.git