[ros-genlisp] 01/01: Fix paths

Jochen Sprickerhof jspricke-guest at moszumanska.debian.org
Tue Nov 24 15:42:49 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-genlisp.

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

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

diff --git a/debian/patches/0001-Fix-location-of-gen_lisp.py.patch b/debian/patches/0001-Fix-location-of-gen_lisp.py.patch
new file mode 100644
index 0000000..46b07d3
--- /dev/null
+++ b/debian/patches/0001-Fix-location-of-gen_lisp.py.patch
@@ -0,0 +1,21 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Tue, 24 Nov 2015 13:28:17 +0100
+Subject: Fix location of gen_lisp.py
+
+---
+ cmake/genlisp-extras.cmake.em | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/genlisp-extras.cmake.em b/cmake/genlisp-extras.cmake.em
+index c62037d..b9cdf46 100644
+--- a/cmake/genlisp-extras.cmake.em
++++ b/cmake/genlisp-extras.cmake.em
+@@ -4,7 +4,7 @@ set(GENLISP_BIN "@(CMAKE_CURRENT_SOURCE_DIR)/scripts/gen_lisp.py")
+ set(GENLISP_TEMPLATE_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts")
+ @[else]@
+ # bin and template dir variables in installspace
+-set(GENLISP_BIN "${genlisp_DIR}/../../../@(CATKIN_PACKAGE_BIN_DESTINATION)/gen_lisp.py")
++set(GENLISP_BIN "/usr/lib/genlisp/gen_lisp.py")
+ set(GENLISP_TEMPLATE_DIR "${genlisp_DIR}/..")
+ @[end if]@
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e423f74
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-location-of-gen_lisp.py.patch
diff --git a/debian/python-genlisp.install b/debian/python-genlisp.install
index 09c5df9..2c42c7c 100644
--- a/debian/python-genlisp.install
+++ b/debian/python-genlisp.install
@@ -1,4 +1,4 @@
 usr/share/genlisp
-usr/lib/*/genlisp /usr/lib/genlisp
+usr/lib/*/genlisp /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-genlisp.git



More information about the debian-science-commits mailing list