[ros-genmsg] 01/01: Fix genmsg_check_deps.py installation

Jochen Sprickerhof jspricke-guest at moszumanska.debian.org
Tue Nov 24 15:43:59 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-genmsg.

commit ba8d6f9bcc8c5e27c1f90079badd6c5d8a3b9b0e
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Tue Nov 24 13:20:13 2015 +0100

    Fix genmsg_check_deps.py installation
---
 .../0003-Fix-location-of-genmsg_check_deps.py.patch | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 debian/python-genmsg.install                        |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/debian/patches/0003-Fix-location-of-genmsg_check_deps.py.patch b/debian/patches/0003-Fix-location-of-genmsg_check_deps.py.patch
new file mode 100644
index 0000000..1f63305
--- /dev/null
+++ b/debian/patches/0003-Fix-location-of-genmsg_check_deps.py.patch
@@ -0,0 +1,21 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Tue, 24 Nov 2015 13:19:54 +0100
+Subject: Fix location of genmsg_check_deps.py
+
+---
+ cmake/genmsg-extras.cmake.em | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/genmsg-extras.cmake.em b/cmake/genmsg-extras.cmake.em
+index c9871b7..1912673 100644
+--- a/cmake/genmsg-extras.cmake.em
++++ b/cmake/genmsg-extras.cmake.em
+@@ -13,7 +13,7 @@ set(GENMSG_LANGS_DESTINATION "etc/ros/genmsg")
+ set(GENMSG_CHECK_DEPS_SCRIPT "@(CMAKE_CURRENT_SOURCE_DIR)/scripts/genmsg_check_deps.py")
+ @[else]@
+ # bin dir variables in installspace
+-set(GENMSG_CHECK_DEPS_SCRIPT "${genmsg_DIR}/../../../@(CATKIN_PACKAGE_BIN_DESTINATION)/genmsg_check_deps.py")
++set(GENMSG_CHECK_DEPS_SCRIPT "/usr/lib/genmsg/genmsg_check_deps.py")
+ @[end if]@
+ 
+ include(CMakeParseArguments)
diff --git a/debian/patches/series b/debian/patches/series
index 2a18834..61247e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Activate-NO_DEFAULT_PATH-in-find_file-again.patch
 0002-Search-in-for-message-generators.patch
+0003-Fix-location-of-genmsg_check_deps.py.patch
diff --git a/debian/python-genmsg.install b/debian/python-genmsg.install
index 8eda2a9..9217773 100644
--- a/debian/python-genmsg.install
+++ b/debian/python-genmsg.install
@@ -1,3 +1,3 @@
 usr/share/genmsg
-usr/lib/*/genmsg /usr/lib/genmsg
+usr/lib/*/genmsg /usr/lib
 usr/lib/*/pkgconfig /usr/lib

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



More information about the debian-science-commits mailing list