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

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

    Convert to new catkin with multiarch
---
 debian/control                           |  5 +++--
 debian/libcpp-common0d.install           |  2 +-
 debian/libroscpp-core-dev.install        | 15 +++++++--------
 debian/libroscpp-serialization0d.install |  2 +-
 debian/librostime0d.install              |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/debian/control b/debian/control
index 996726e..3c85890 100644
--- a/debian/control
+++ b/debian/control
@@ -6,9 +6,8 @@ Uploaders: Thomas Moulard <thomas.moulard at gmail.com>,
 Section: libs
 Priority: extra
 Build-Depends: debhelper (>= 9), 
-	       dh-exec,
 	       python,
-	       catkin,
+	       catkin (>> 0.6.16-2),
          libboost-system-dev,
          libboost-thread-dev,
          libconsole-bridge-dev,
@@ -32,6 +31,7 @@ Description: Development files for Robot OS roscpp-core
 Package: libcpp-common0d
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: Robot OS utility library
  This package is part of Robot OS (ROS). It contains the C++ library
  libcpp_common which is code for doing things that are not necessarily ROS
@@ -50,6 +50,7 @@ Description: Robot OS library for roscpp serialization
 Package: librostime0d
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: Robot OS library for time and duration
  This package is part of Robot OS (ROS). It contains Time and Duration
  implementations for C++ libraries, including roscpp. ROS has builtin
diff --git a/debian/libcpp-common0d.install b/debian/libcpp-common0d.install
index 4c670ca..e703f64 100644
--- a/debian/libcpp-common0d.install
+++ b/debian/libcpp-common0d.install
@@ -1 +1 @@
-usr/lib/libcpp_common.so.*
+usr/lib/*/libcpp_common.so.*
diff --git a/debian/libroscpp-core-dev.install b/debian/libroscpp-core-dev.install
old mode 100755
new mode 100644
index ad063bd..bbb80c8
--- a/debian/libroscpp-core-dev.install
+++ b/debian/libroscpp-core-dev.install
@@ -1,8 +1,7 @@
-#! /usr/bin/dh-exec
-usr/include/*
-usr/lib/lib*.so
-usr/lib/pkgconfig/* usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
-usr/share/cpp_common/*
-usr/share/roscpp_serialization/*
-usr/share/roscpp_traits/*
-usr/share/rostime/*
+usr/include
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig
+usr/share/cpp_common
+usr/share/roscpp_serialization
+usr/share/roscpp_traits
+usr/share/rostime
diff --git a/debian/libroscpp-serialization0d.install b/debian/libroscpp-serialization0d.install
index 5d90e8a..7644f70 100644
--- a/debian/libroscpp-serialization0d.install
+++ b/debian/libroscpp-serialization0d.install
@@ -1 +1 @@
-usr/lib/libroscpp_serialization.so.*
+usr/lib/*/libroscpp_serialization.so.*
diff --git a/debian/librostime0d.install b/debian/librostime0d.install
index 40da677..56d82e3 100644
--- a/debian/librostime0d.install
+++ b/debian/librostime0d.install
@@ -1 +1 @@
-usr/lib/librostime.so.*
+usr/lib/*/librostime.so.*

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