[ros-pluginlib] 01/01: Convert to new catkin with multiarch

Jochen Sprickerhof jspricke-guest at moszumanska.debian.org
Mon Nov 23 06:58:55 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-pluginlib.

commit 25ae02feca85b36106f24f3b354c5ebaa91b3941
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Mon Nov 23 07:54:33 2015 +0100

    Convert to new catkin with multiarch
---
 debian/control               | 2 +-
 debian/pluginlib-dev.install | 4 ++++
 debian/rules                 | 7 +------
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index f7529ec..008507b 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, libboost-filesystem-dev, libboost-system-dev, ros-cmake-modules, libclass-loader-dev, librosconsole-bridge-dev, libroslib-dev, libtinyxml-dev, librosconsole-dev, libroscpp-core-dev
+Build-Depends: debhelper (>= 9), catkin (>> 0.6.16-2), libboost-filesystem-dev, libboost-system-dev, ros-cmake-modules, libclass-loader-dev, librosconsole-bridge-dev, libroslib-dev, libtinyxml-dev, librosconsole-dev, libroscpp-core-dev
 Standards-Version: 3.9.6
 Section: libs
 Homepage: http://wiki.ros.org/pluginlib
diff --git a/debian/pluginlib-dev.install b/debian/pluginlib-dev.install
new file mode 100644
index 0000000..e602935
--- /dev/null
+++ b/debian/pluginlib-dev.install
@@ -0,0 +1,4 @@
+usr/include
+usr/lib/*/pkgconfig
+usr/lib/*/pluginlib
+usr/share/pluginlib
diff --git a/debian/rules b/debian/rules
index 71d2fa0..86a966d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,12 +9,7 @@ include /usr/share/dpkg/default.mk
 override_dh_auto_test:
 
 override_dh_auto_install:
-	dh_auto_install --
-	-rm -f debian/pluginlib-dev/usr/*.*
-	-rm -f debian/pluginlib-dev/usr/.*
-	-rm -rf debian/pluginlib-dev/usr/lib/python2.7
-	mkdir -p debian/pluginlib-dev/usr/lib/${DEB_HOST_MULTIARCH}/
-	mv debian/pluginlib-dev/usr/lib/pkgconfig debian/pluginlib-dev/usr/lib/${DEB_HOST_MULTIARCH}/
+	dh_auto_install --destdir=debian/tmp
 
 get-orig-source:
 	uscan --verbose --force-download --repack --compress xz

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



More information about the debian-science-commits mailing list