diff -Nru ros-genmsg-0.5.6/CHANGELOG.rst ros-genmsg-0.5.7/CHANGELOG.rst --- ros-genmsg-0.5.6/CHANGELOG.rst 2014-10-13 17:44:39.000000000 +0000 +++ ros-genmsg-0.5.7/CHANGELOG.rst 2016-03-05 00:26:23.000000000 +0000 @@ -2,6 +2,13 @@ Changelog for package genmsg ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.5.7 (2016-03-04) +------------------ +* find_package(catkin) and add run dependency on catkin (`#61 `_) +* improve readability of error message +* fix doc for BASE_DIR in add\_*_files (`#59 `_) +* fix some more minor typos (`#56 `_, `#57 `_) + 0.5.6 (2014-10-13) ------------------ * fix interpreter globals collision with multiple message templates or modules (`#53 `_) diff -Nru ros-genmsg-0.5.6/cmake/genmsg-extras.cmake.em ros-genmsg-0.5.7/cmake/genmsg-extras.cmake.em --- ros-genmsg-0.5.6/cmake/genmsg-extras.cmake.em 2014-10-13 17:44:39.000000000 +0000 +++ ros-genmsg-0.5.7/cmake/genmsg-extras.cmake.em 2016-03-05 00:26:23.000000000 +0000 @@ -8,6 +8,9 @@ # set destination for langs set(GENMSG_LANGS_DESTINATION "etc/ros/genmsg") +# We need various macros and variables that are provided by catkin +find_package(catkin REQUIRED) + @[if DEVELSPACE]@ # bin dir variables in develspace set(GENMSG_CHECK_DEPS_SCRIPT "@(CMAKE_CURRENT_SOURCE_DIR)/scripts/genmsg_check_deps.py") @@ -267,7 +270,7 @@ list(APPEND handled_deps ${dep}) if(NOT ${dep}_FOUND AND NOT ${dep}_SOURCE_DIR) - message(FATAL_ERROR "Messages depends on unknown pkg: ${dep} (Missing find_package(${dep}?))") + message(FATAL_ERROR "Messages depends on unknown pkg: ${dep} (Missing 'find_package(${dep})'?)") endif() unset(_dep_msg_paths_file CACHE) diff -Nru ros-genmsg-0.5.6/debian/changelog ros-genmsg-0.5.7/debian/changelog --- ros-genmsg-0.5.6/debian/changelog 2015-12-22 14:54:18.000000000 +0000 +++ ros-genmsg-0.5.7/debian/changelog 2016-07-21 08:25:34.000000000 +0000 @@ -1,4 +1,23 @@ -ros-genmsg (0.5.6-3~20151222) trusty; urgency=medium +ros-genmsg (0.5.7-1~20160721) trusty; urgency=medium + + * Imported Upstream version 0.5.7 + * Refresh patches + + -- Jochen Sprickerhof Sat, 18 Jun 2016 11:06:44 +0200 + +ros-genmsg (0.5.6-5) unstable; urgency=medium + + * Add missing dependency + + -- Jochen Sprickerhof Mon, 22 Feb 2016 15:34:10 +0100 + +ros-genmsg (0.5.6-4) unstable; urgency=medium + + * Adopt to new libexec location in catkin + + -- Jochen Sprickerhof Tue, 16 Feb 2016 08:32:46 +0100 + +ros-genmsg (0.5.6-3) unstable; urgency=medium * Convert to new catkin with multiarch diff -Nru ros-genmsg-0.5.6/debian/control ros-genmsg-0.5.7/debian/control --- ros-genmsg-0.5.6/debian/control 2015-12-17 22:50:31.000000000 +0000 +++ ros-genmsg-0.5.7/debian/control 2016-07-07 08:10:29.000000000 +0000 @@ -5,7 +5,7 @@ Uploaders: Thomas Moulard , Jochen Sprickerhof , Leopold Palomo-Avellaneda -Build-Depends: debhelper (>= 9), catkin (>> 0.6.16-2), python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), dh-python +Build-Depends: debhelper (>= 9), catkin (>= 0.6.16-4), python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), dh-python Standards-Version: 3.9.6 Homepage: http://wiki.ros.org/genmsg Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/ros/ros-genmsg.git @@ -14,7 +14,7 @@ Package: python-genmsg Architecture: all -Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} +Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-empy Description: Python library for generating Robot OS message and service data This package is part of Robot OS (ROS). Project genmsg exists in order to decouple code generation (from .msg & .srv format files) from diff -Nru ros-genmsg-0.5.6/debian/patches/0001-Activate-NO_DEFAULT_PATH-in-find_file-again.patch ros-genmsg-0.5.7/debian/patches/0001-Activate-NO_DEFAULT_PATH-in-find_file-again.patch --- ros-genmsg-0.5.6/debian/patches/0001-Activate-NO_DEFAULT_PATH-in-find_file-again.patch 2015-12-17 22:50:31.000000000 +0000 +++ ros-genmsg-0.5.7/debian/patches/0001-Activate-NO_DEFAULT_PATH-in-find_file-again.patch 2016-07-07 08:10:29.000000000 +0000 @@ -7,10 +7,10 @@ 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmake/genmsg-extras.cmake.em b/cmake/genmsg-extras.cmake.em -index ba98807..31fae76 100644 +index 7e2a7ef..70a93fb 100644 --- a/cmake/genmsg-extras.cmake.em +++ b/cmake/genmsg-extras.cmake.em -@@ -272,8 +272,7 @@ macro(generate_messages) +@@ -275,8 +275,7 @@ macro(generate_messages) unset(_dep_msg_paths_file CACHE) set(filename "share/${dep}/cmake/${dep}-msg-paths.cmake") diff -Nru ros-genmsg-0.5.6/debian/patches/0002-Search-in-for-message-generators.patch ros-genmsg-0.5.7/debian/patches/0002-Search-in-for-message-generators.patch --- ros-genmsg-0.5.6/debian/patches/0002-Search-in-for-message-generators.patch 2015-12-17 22:50:31.000000000 +0000 +++ ros-genmsg-0.5.7/debian/patches/0002-Search-in-for-message-generators.patch 2016-07-07 08:10:29.000000000 +0000 @@ -7,10 +7,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/genmsg-extras.cmake.em b/cmake/genmsg-extras.cmake.em -index 31fae76..c9871b7 100644 +index 70a93fb..fe73eb3 100644 --- a/cmake/genmsg-extras.cmake.em +++ b/cmake/genmsg-extras.cmake.em -@@ -20,7 +20,7 @@ include(CMakeParseArguments) +@@ -23,7 +23,7 @@ include(CMakeParseArguments) # find message generators in all workspaces set(message_generators "") diff -Nru ros-genmsg-0.5.6/debian/patches/0003-Fix-location-of-genmsg_check_deps.py.patch ros-genmsg-0.5.7/debian/patches/0003-Fix-location-of-genmsg_check_deps.py.patch --- ros-genmsg-0.5.6/debian/patches/0003-Fix-location-of-genmsg_check_deps.py.patch 2015-12-17 22:50:31.000000000 +0000 +++ ros-genmsg-0.5.7/debian/patches/0003-Fix-location-of-genmsg_check_deps.py.patch 2016-07-07 08:10:29.000000000 +0000 @@ -7,10 +7,10 @@ 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 +index fe73eb3..29e406f 100644 --- a/cmake/genmsg-extras.cmake.em +++ b/cmake/genmsg-extras.cmake.em -@@ -13,7 +13,7 @@ set(GENMSG_LANGS_DESTINATION "etc/ros/genmsg") +@@ -16,7 +16,7 @@ find_package(catkin REQUIRED) set(GENMSG_CHECK_DEPS_SCRIPT "@(CMAKE_CURRENT_SOURCE_DIR)/scripts/genmsg_check_deps.py") @[else]@ # bin dir variables in installspace diff -Nru ros-genmsg-0.5.6/debian/python-genmsg.install ros-genmsg-0.5.7/debian/python-genmsg.install --- ros-genmsg-0.5.6/debian/python-genmsg.install 2015-12-17 22:50:31.000000000 +0000 +++ ros-genmsg-0.5.7/debian/python-genmsg.install 2016-07-07 08:10:29.000000000 +0000 @@ -1,3 +1,3 @@ usr/share/genmsg -usr/lib/*/genmsg /usr/lib +usr/lib/genmsg usr/lib/*/pkgconfig /usr/lib diff -Nru ros-genmsg-0.5.6/doc/conf.py ros-genmsg-0.5.7/doc/conf.py --- ros-genmsg-0.5.6/doc/conf.py 2014-10-13 17:44:39.000000000 +0000 +++ ros-genmsg-0.5.7/doc/conf.py 2016-03-05 00:26:23.000000000 +0000 @@ -131,7 +131,7 @@ # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] +html_static_path = [] # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. @@ -256,8 +256,8 @@ # Example configuration for intersphinx: refer to the Python standard library. intersphinx_mapping = { 'genmsg': ('http://ros.org/doc/api/genmsg/html', None), - 'vcstools': ('http://ros.org/doc/api/vcstools/html', None), - 'rosinstall': ('http://ros.org/doc/api/rosinstall/html', None), - 'rospkg': ('http://ros.org/doc/api/rosinstall/html', None), - 'rosdep2': ('http://ros.org/doc/api/rosdep2/html', None), + 'vcstools': ('http://docs.ros.org/independent/api/vcstools/html', None), + 'rosinstall': ('http://docs.ros.org/independent/api/rosinstall/html', None), + 'rospkg': ('http://docs.ros.org/independent/api/rospkg/html', None), + 'rosdep2': ('http://docs.ros.org/independent/api/rosdep/html', None), } diff -Nru ros-genmsg-0.5.6/doc/usermacros.rst ros-genmsg-0.5.7/doc/usermacros.rst --- ros-genmsg-0.5.6/doc/usermacros.rst 2014-10-13 17:44:39.000000000 +0000 +++ ros-genmsg-0.5.7/doc/usermacros.rst 2016-03-05 00:26:23.000000000 +0000 @@ -1,13 +1,14 @@ User macro reference ==================== -.. cmake:macro:: add_message_files(DIRECTORY dir FILES file1 [file2...] [PACKAGE pkgname] [NOINSTALL]) +.. cmake:macro:: add_message_files(DIRECTORY dir FILES file1 [file2...] [BASE_DIR base_dir] [NOINSTALL]) :param DIRECTORY: Directory containing messages. May be absolute or - relative to ``CMAKE_CURRENT_SOURCE_DIR``. + relative to ``CMAKE_CURRENT_SOURCE_DIR``. The name will also be used as the install folder as + `share//`. Default is `msg`. :param FILES: Files containing messages, relative to `msgdir` - :param PACKAGE: Optional alternate packagename (if the current project doesn't match the - desired namespace for the messages) + :param BASE_DIR: Absolute path used and only used as an alternate source message folder. Has + precedence over DIRECTORY. Only used by `add_action_files()`. :param NOINSTALL: Do not automatically install the messages to the package's share/ directory. Register the listed files as requiring message generation and installation. diff -Nru ros-genmsg-0.5.6/.hgignore ros-genmsg-0.5.7/.hgignore --- ros-genmsg-0.5.6/.hgignore 2014-10-13 17:44:39.000000000 +0000 +++ ros-genmsg-0.5.7/.hgignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -syntax: glob -*.orig -*.swp -*.pyc -*.DS_Store -*~ -*.log -MANIFEST -.coverage -nosetests.xml -syntax: regexp -(target|build|dist)/.* - diff -Nru ros-genmsg-0.5.6/package.xml ros-genmsg-0.5.7/package.xml --- ros-genmsg-0.5.6/package.xml 2014-10-13 17:44:39.000000000 +0000 +++ ros-genmsg-0.5.7/package.xml 2016-03-05 00:26:23.000000000 +0000 @@ -1,7 +1,7 @@ genmsg - 0.5.6 + 0.5.7 Standalone Python library for generating ROS message and service data structures for various languages. @@ -17,6 +17,7 @@ Ken Conley catkin + catkin diff -Nru ros-genmsg-0.5.6/src/genmsg/gentools.py ros-genmsg-0.5.7/src/genmsg/gentools.py --- ros-genmsg-0.5.6/src/genmsg/gentools.py 2014-10-13 17:44:39.000000000 +0000 +++ ros-genmsg-0.5.7/src/genmsg/gentools.py 2016-03-05 00:26:23.000000000 +0000 @@ -160,7 +160,7 @@ Compute the full type name of message/service 'pkg/type'. :param package_name: name of package file is in, ``str`` - :file_name: name of the msg og srv file, ``str`` + :file_name: name of the msg or srv file, ``str`` :returns: typename in format 'pkg/type' :raises: :exc:`MsgGenerationException` if file_name ends with an unknown file extension """ diff -Nru ros-genmsg-0.5.6/src/genmsg/msgs.py ros-genmsg-0.5.7/src/genmsg/msgs.py --- ros-genmsg-0.5.6/src/genmsg/msgs.py 2014-10-13 17:44:39.000000000 +0000 +++ ros-genmsg-0.5.7/src/genmsg/msgs.py 2016-03-05 00:26:23.000000000 +0000 @@ -234,10 +234,10 @@ def __init__(self, types, names, constants, text, full_name, package = '', short_name = ''): """ - :param types: list of field types, in order of declaration, ``[str]]`` - :param names: list of field names, in order of declaration, ``[str]]`` + :param types: list of field types, in order of declaration, ``[str]`` + :param names: list of field names, in order of declaration, ``[str]`` :param constants: List of :class:`Constant` declarations, ``[Constant]`` - :param text: text of declaration, ``str` + :param text: text of declaration, ``str`` :raises: :exc:`InvalidMsgSpec` If spec is invalid (e.g. fields with the same name) """ alt_package, alt_short_name = package_resource_name(full_name)