[ros-dynamic-reconfigure] 01/02: Convert to new catkin with multiarch

Jochen Sprickerhof jspricke-guest at moszumanska.debian.org
Sun Nov 22 17:38:52 UTC 2015


This is an automated email from the git hooks/post-receive script.

jspricke-guest pushed a commit to branch master
in repository ros-dynamic-reconfigure.

commit a5815f9c365b4e0c69180c054f9a0db2d93cdb5e
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sun Nov 22 18:27:53 2015 +0100

    Convert to new catkin with multiarch
---
 debian/cl-dynamic-reconfigure.install     | 1 -
 debian/control                            | 3 ++-
 debian/libdynamic-reconfigure-dev.install | 5 ++---
 debian/libdynamic-reconfigure0d.install   | 2 +-
 debian/python-dynamic-reconfigure.install | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/debian/cl-dynamic-reconfigure.install b/debian/cl-dynamic-reconfigure.install
index 7e93936..5787a2b 100644
--- a/debian/cl-dynamic-reconfigure.install
+++ b/debian/cl-dynamic-reconfigure.install
@@ -1,2 +1 @@
 usr/share/common-lisp/ros/dynamic_reconfigure
-
diff --git a/debian/control b/debian/control
index 6636cfd..403917d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ 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, libroscpp-core-dev, message-generation, libstd-msgs-dev, 
+		catkin (>> 0.6.16-2), libroscpp-core-dev, message-generation, libstd-msgs-dev,
 		python-rospy, python-rostest, 
 		python-all (>= 2.6.6-3), python-setuptools (>= 0.6b3),
 		libboost-dev, libboost-thread-dev, libboost-signals-dev,
@@ -26,6 +26,7 @@ Vcs-Git: git://anonscm.debian.org/debian-science/packages/ros/ros-dynamic-reconf
 Package: libdynamic-reconfigure0d
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Multi-Arch: same
 Description: Robot OS dynamic-reconfigure library
  This package is part of Robot OS (ROS), and contains the
  dynamic_reconfigure package which provides a means to change node
diff --git a/debian/libdynamic-reconfigure-dev.install b/debian/libdynamic-reconfigure-dev.install
old mode 100755
new mode 100644
index 07f3175..6e82f58
--- a/debian/libdynamic-reconfigure-dev.install
+++ b/debian/libdynamic-reconfigure-dev.install
@@ -1,5 +1,4 @@
-#! /usr/bin/dh-exec
 usr/include/dynamic_reconfigure
 usr/share/dynamic_reconfigure
-usr/lib/lib*.so
-usr/lib/pkgconfig/dynamic_reconfigure.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/dynamic_reconfigure.pc
diff --git a/debian/libdynamic-reconfigure0d.install b/debian/libdynamic-reconfigure0d.install
index 5e9c55d..f6ad689 100644
--- a/debian/libdynamic-reconfigure0d.install
+++ b/debian/libdynamic-reconfigure0d.install
@@ -1,2 +1,2 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
 
diff --git a/debian/python-dynamic-reconfigure.install b/debian/python-dynamic-reconfigure.install
index 8dbfea1..2ea732a 100644
--- a/debian/python-dynamic-reconfigure.install
+++ b/debian/python-dynamic-reconfigure.install
@@ -1 +1 @@
-usr/lib/dynamic_reconfigure/* usr/bin
+usr/lib/*/dynamic_reconfigure/* usr/bin

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



More information about the debian-science-commits mailing list