[ros-gencpp] 01/01: Fix location of gen_cpp.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-gencpp.

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

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

diff --git a/debian/patches/0001-Fix-location-of-gen_cpp.py.patch b/debian/patches/0001-Fix-location-of-gen_cpp.py.patch
new file mode 100644
index 0000000..9c99de1
--- /dev/null
+++ b/debian/patches/0001-Fix-location-of-gen_cpp.py.patch
@@ -0,0 +1,21 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Tue, 24 Nov 2015 13:25:50 +0100
+Subject: Fix location of gen_cpp.py
+
+---
+ cmake/gencpp-extras.cmake.em | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/gencpp-extras.cmake.em b/cmake/gencpp-extras.cmake.em
+index 88ce935..9bbc51f 100644
+--- a/cmake/gencpp-extras.cmake.em
++++ b/cmake/gencpp-extras.cmake.em
+@@ -4,7 +4,7 @@ set(GENCPP_BIN "@(CMAKE_CURRENT_SOURCE_DIR)/scripts/gen_cpp.py")
+ set(GENCPP_TEMPLATE_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts")
+ @[else]@
+ # bin and template dir variables in installspace
+-set(GENCPP_BIN "${gencpp_DIR}/../../../@(CATKIN_PACKAGE_BIN_DESTINATION)/gen_cpp.py")
++set(GENCPP_BIN "/usr/lib/gencpp/gen_cpp.py")
+ set(GENCPP_TEMPLATE_DIR "${gencpp_DIR}/..")
+ @[end if]@
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..935e837
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-location-of-gen_cpp.py.patch
diff --git a/debian/python-gencpp.install b/debian/python-gencpp.install
index 969fade..22ae229 100644
--- a/debian/python-gencpp.install
+++ b/debian/python-gencpp.install
@@ -1,4 +1,4 @@
 usr/share/gencpp
-usr/lib/*/gencpp /usr/lib/gencpp
+usr/lib/*/gencpp /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-gencpp.git