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

commit 799ebe313b778428db5595c5d74ed9bb91adec2f
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Mon Nov 23 10:58:44 2015 +0100

    Convert to new catkin with multiarch
---
 debian/control               |  3 ++-
 debian/copyright             | 28 ++--------------------------
 debian/libroslib-dev.install |  8 ++++----
 debian/libroslib0d.install   |  2 +-
 debian/python-roslib.install |  2 +-
 5 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/debian/control b/debian/control
index 6af4578..0b83a3d 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Section: libs
 Priority: extra
 Build-Depends: debhelper (>= 9),
 	       python,
-	       catkin,
+	       catkin (>> 0.6.16-2),
          librospack-dev,
          libboost-program-options-dev,
          libboost-filesystem-dev,
@@ -74,6 +74,7 @@ Description: development files for roslib (Robot OS)
 Package: libroslib0d
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: library for roslib (Robot OS)
  This package is part of Robot OS (ROS). It provides the base
  dependencies and support libraries for ROS. roslib contains many of
diff --git a/debian/copyright b/debian/copyright
index 390b4d7..1524ba0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,37 +6,13 @@ Source: https://github.com/ros/ros/tags
 Files: *
 Copyright: 2008-2010, 2012, Willow Garage, Inc
 License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- .
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-  * Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.
-  * Neither the name of copyright holder nor the names of its
-    contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
 
 Files: debian/*
 Copyright: 2013, Thomas Moulard <thomas.moulard at gmail.com>
            2013-2014, Jochen Sprickerhof <debian at jochen.sprickerhof.de>
 License: BSD-3-clause
+
+License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
diff --git a/debian/libroslib-dev.install b/debian/libroslib-dev.install
index c66b9c7..3e6d3f4 100644
--- a/debian/libroslib-dev.install
+++ b/debian/libroslib-dev.install
@@ -1,5 +1,5 @@
-usr/include/*
-usr/lib/lib*.so
-usr/lib/pkgconfig/roslib.pc
-usr/share/roslib/*
+usr/include
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/roslib.pc
+usr/share/roslib
 usr/etc/catkin/profile.d/*.sh /etc/catkin/profile.d/
diff --git a/debian/libroslib0d.install b/debian/libroslib0d.install
index d0dbfd1..3ddde58 100644
--- a/debian/libroslib0d.install
+++ b/debian/libroslib0d.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/python-roslib.install b/debian/python-roslib.install
index daf65b9..0a49e59 100644
--- a/debian/python-roslib.install
+++ b/debian/python-roslib.install
@@ -1 +1 @@
-usr/lib/roslib/gendeps
+usr/lib/*/roslib/gendeps usr/lib/roslib

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