[ros-genpy] 01/01: Fix location of genmsg_py.py

[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-genpy.

commit 6d40564d029f2412743e0398b47b311609d4962e
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Tue Nov 24 13:33:07 2015 +0100

    Fix location of genmsg_py.py
---
 .../patches/0001-Fix-location-of-genmsg_py.py.patch | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 debian/python-genpy.install                         |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/debian/patches/0001-Fix-location-of-genmsg_py.py.patch b/debian/patches/0001-Fix-location-of-genmsg_py.py.patch
new file mode 100644
index 0000000..901433f
--- /dev/null
+++ b/debian/patches/0001-Fix-location-of-genmsg_py.py.patch
@@ -0,0 +1,21 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Tue, 24 Nov 2015 13:32:39 +0100
+Subject: Fix location of genmsg_py.py
+
+---
+ cmake/genpy-extras.cmake.em | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/genpy-extras.cmake.em b/cmake/genpy-extras.cmake.em
+index 16b9660..7f4ab47 100644
+--- a/cmake/genpy-extras.cmake.em
++++ b/cmake/genpy-extras.cmake.em
+@@ -3,7 +3,7 @@
+ set(GENPY_BIN_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts")
+ @[else]@
+ # location of scripts in installspace
+-set(GENPY_BIN_DIR "${genpy_DIR}/../../../@(CATKIN_PACKAGE_BIN_DESTINATION)")
++set(GENPY_BIN_DIR "/usr/lib/genpy")
+ @[end if]@
+ 
+ set(GENMSG_PY_BIN ${GENPY_BIN_DIR}/genmsg_py.py)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..de2d3ac
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-location-of-genmsg_py.py.patch
diff --git a/debian/python-genpy.install b/debian/python-genpy.install
index e8e8034..21a1732 100644
--- a/debian/python-genpy.install
+++ b/debian/python-genpy.install
@@ -1,4 +1,4 @@
 usr/share/genpy
-usr/lib/*/genpy /usr/lib/genpy
+usr/lib/*/genpy /usr/lib
 usr/lib/*/pkgconfig /usr/lib
 usr/etc/ros /etc

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