[ros-nodelet-core] 01/03: New upstream version 1.9.7

Jochen Sprickerhof jspricke at moszumanska.debian.org
Fri Nov 4 08:51:42 UTC 2016


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

jspricke pushed a commit to annotated tag debian/1.9.7-1
in repository ros-nodelet-core.

commit 98b95c1c0a3a9dc75fc47963c283412dd3421491
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Fri Nov 4 09:50:43 2016 +0100

    New upstream version 1.9.7
---
 nodelet/CHANGELOG.rst                  | 6 ++++++
 nodelet/package.xml                    | 2 +-
 nodelet/scripts/declared_nodelets      | 9 +++++----
 nodelet_core/CHANGELOG.rst             | 3 +++
 nodelet_core/package.xml               | 2 +-
 nodelet_topic_tools/CHANGELOG.rst      | 3 +++
 nodelet_topic_tools/package.xml        | 2 +-
 test_nodelet/CHANGELOG.rst             | 3 +++
 test_nodelet/package.xml               | 2 +-
 test_nodelet_topic_tools/CHANGELOG.rst | 3 +++
 test_nodelet_topic_tools/package.xml   | 2 +-
 11 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/nodelet/CHANGELOG.rst b/nodelet/CHANGELOG.rst
index ee735ca..a6ba0cb 100644
--- a/nodelet/CHANGELOG.rst
+++ b/nodelet/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog for package nodelet
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.9.7 (2016-10-24)
+------------------
+* Use rospkg instead of roslib in declared_nodelets
+  Close https://github.com/ros/nodelet_core/issues/48
+* Contributors: Kentaro Wada
+
 1.9.6 (2016-09-20)
 ------------------
 
diff --git a/nodelet/package.xml b/nodelet/package.xml
index 64ca637..7de17cf 100644
--- a/nodelet/package.xml
+++ b/nodelet/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>nodelet</name>
-  <version>1.9.6</version>
+  <version>1.9.7</version>
   <description>
     The nodelet package is designed to provide a way to run multiple
     algorithms in the same process with zero copy transport between
diff --git a/nodelet/scripts/declared_nodelets b/nodelet/scripts/declared_nodelets
index 9b9e02f..b0703ce 100755
--- a/nodelet/scripts/declared_nodelets
+++ b/nodelet/scripts/declared_nodelets
@@ -34,21 +34,22 @@
 
 
 
-import roslib
+import rospkg
 from xml.dom import minidom
 import xml
 
 nodelet_files = []
 
-for p in roslib.rospack.rospack_depends_on_1('nodelet'):
+rp = rospkg.RosPack()
+for p in rp.get_depends_on('nodelet', implicit=False):
     #print "Processing package %s to find declared nodelets"%p
-    manifest = roslib.manifest.load_manifest(p)
+    manifest = rp.get_manifest(p)
     for e in manifest.exports:
         try:
             if e.__dict__['tag'] == 'nodelet':
                 plugin_file = e.get('plugin')
                 if plugin_file:
-                    plugin_file = plugin_file.replace('${prefix}',roslib.packages.get_pkg_dir(p))
+                    plugin_file = plugin_file.replace('${prefix}', rp.get_path(p))
                     nodelet_files.append(plugin_file)
         except Exception, ex:
             print ex 
diff --git a/nodelet_core/CHANGELOG.rst b/nodelet_core/CHANGELOG.rst
index d2493f2..b537bd9 100644
--- a/nodelet_core/CHANGELOG.rst
+++ b/nodelet_core/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package nodelet_core
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.9.7 (2016-10-24)
+------------------
+
 1.9.6 (2016-09-20)
 ------------------
 
diff --git a/nodelet_core/package.xml b/nodelet_core/package.xml
index 26bde92..e129603 100644
--- a/nodelet_core/package.xml
+++ b/nodelet_core/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>nodelet_core</name>
-  <version>1.9.6</version>
+  <version>1.9.7</version>
   <description>Nodelet Core Metapackage</description>
   <maintainer email="mikael at osrfoundation.org">Mikael Arguedas</maintainer>
   <license>BSD</license>
diff --git a/nodelet_topic_tools/CHANGELOG.rst b/nodelet_topic_tools/CHANGELOG.rst
index 98b07a1..c8e35ec 100644
--- a/nodelet_topic_tools/CHANGELOG.rst
+++ b/nodelet_topic_tools/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package nodelet_topic_tools
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.9.7 (2016-10-24)
+------------------
+
 1.9.6 (2016-09-20)
 ------------------
 * Add NodeletLazy abstract class for lazy transport (`#45 <https://github.com/ros/nodelet_core/issues/45>`_)
diff --git a/nodelet_topic_tools/package.xml b/nodelet_topic_tools/package.xml
index a865606..9c29408 100644
--- a/nodelet_topic_tools/package.xml
+++ b/nodelet_topic_tools/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>nodelet_topic_tools</name>
-  <version>1.9.6</version>
+  <version>1.9.7</version>
   <description>
     This package contains common nodelet tools such as a mux, demux and throttle.
   </description>
diff --git a/test_nodelet/CHANGELOG.rst b/test_nodelet/CHANGELOG.rst
index ad0b8f8..c37405c 100644
--- a/test_nodelet/CHANGELOG.rst
+++ b/test_nodelet/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package test_nodelet
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.9.7 (2016-10-24)
+------------------
+
 1.9.6 (2016-09-20)
 ------------------
 
diff --git a/test_nodelet/package.xml b/test_nodelet/package.xml
index cbf8894..02752f3 100644
--- a/test_nodelet/package.xml
+++ b/test_nodelet/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>test_nodelet</name>
-  <version>1.9.6</version>
+  <version>1.9.7</version>
   <description>
     A package for nodelet unit tests
   </description>
diff --git a/test_nodelet_topic_tools/CHANGELOG.rst b/test_nodelet_topic_tools/CHANGELOG.rst
index 9abb2d8..6f61b87 100644
--- a/test_nodelet_topic_tools/CHANGELOG.rst
+++ b/test_nodelet_topic_tools/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package test_nodelet_topic_tools
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.9.7 (2016-10-24)
+------------------
+
 1.9.6 (2016-09-20)
 ------------------
 * Add NodeletLazy abstract class for lazy transport (`#45 <https://github.com/ros/nodelet_core/issues/45>`_)
diff --git a/test_nodelet_topic_tools/package.xml b/test_nodelet_topic_tools/package.xml
index f96ebf0..3f9aea1 100644
--- a/test_nodelet_topic_tools/package.xml
+++ b/test_nodelet_topic_tools/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>test_nodelet_topic_tools</name>
-  <version>1.9.6</version>
+  <version>1.9.7</version>
   <description>
     A package for nodelet_topic_tools unit tests.
   </description>

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



More information about the debian-science-commits mailing list