[ros-roslisp] 01/03: Imported Upstream version 1.9.20

[Jochen Sprickerhof]

This is an automated email from the git hooks/post-receive script.

jspricke-guest pushed a commit to annotated tag debian/1.9.20-1
in repository ros-roslisp.

commit 60962e96e85c186fe99f891a233f3af748096be3
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sun Jul 10 09:54:12 2016 +0200

    Imported Upstream version 1.9.20
---
 CHANGELOG.rst                 | 8 ++++++++
 cmake/roslisp-extras.cmake.em | 8 ++++++--
 package.xml                   | 2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 2cbf83f..802b371 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,14 @@
 Changelog for package roslisp
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.9.20 (2016-04-14)
+-------------------
+* Merge pull request `#28 <https://github.com/ros/roslisp/issues/28>`_ from gaya-/master
+  In ADD_LISP_EXECUTABLE added a check for slashes in first argument
+* in cmake script minor nicification
+* [cmake] in ADD_LISP_EXECUTABLE added a check for slashes in first argument
+* Contributors: Gayane Kazhoyan, Georg Bartels
+
 1.9.19 (2015-08-14)
 -----------
 * Merge pull request `#25 <https://github.com/ros/roslisp/issues/25>`_ from airballking/symbol-codes
diff --git a/cmake/roslisp-extras.cmake.em b/cmake/roslisp-extras.cmake.em
index e9d6280..5159423 100644
--- a/cmake/roslisp-extras.cmake.em
+++ b/cmake/roslisp-extras.cmake.em
@@ -11,7 +11,7 @@ set(ROSLISP_EXE_SCRIPT "@(CMAKE_CURRENT_SOURCE_DIR)/scripts/make_exe_script")
 # location of script in installspace
 set(ROSLISP_MAKE_NODE_BIN "${roslisp_DIR}/../scripts/make_node_exec")
 set(ROSLISP_COMPILE_MANIFEST_BIN "${roslisp_DIR}/../scripts/compile_load_manifest")
-set(ROSLISP_EXE_SCRIPT "${roslisp_DIR}/..//scripts/make_exe_script")
+set(ROSLISP_EXE_SCRIPT "${roslisp_DIR}/../scripts/make_exe_script")
 @[end if]@
 
 # Build up a list of executables, in order to make them depend on each
@@ -70,9 +70,13 @@ function(add_lisp_executable output system_name entry_point)
     message(SEND_ERROR "[roslisp] add_lisp_executable can only have 3 arguments")
   endif()
 
+  if(output MATCHES "/")
+    message(WARNING "First argument of ADD_LISP_EXECUTABLE (${output}) cannot contain slashes! Ignoring.")
+    string(REPLACE "/" "_" output ${output})
+  endif()
+
   set(targetdir ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_BIN_DESTINATION})
   set(targetname _roslisp_${output})
-  string(REPLACE "/" "_" targetname ${targetname})
 
   # create directory if it does not exist
   file(MAKE_DIRECTORY ${targetdir})
diff --git a/package.xml b/package.xml
index 52615dd..16b22b4 100644
--- a/package.xml
+++ b/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>roslisp</name>
-  <version>1.9.19</version>
+  <version>1.9.20</version>
   <description>Lisp client library for ROS, the Robot Operating System.</description>
   <maintainer email="georg.bartels at cs.uni-bremen.de">Georg Bartels</maintainer>
   <maintainer email="moesenle at cs.tum.edu">Lorenz Moesenlechner</maintainer>

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