[ros-rospkg] 02/02: Release to unstable

[Wookey]

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

wookey pushed a commit to branch master
in repository ros-rospkg.

commit 5fe69a167042aba2cf8773c8b913143fd6c8789f
Author: Wookey <wookey at wookware.org>
Date:   Wed Nov 18 17:10:34 2015 +0000

    Release to unstable
---
 debian/changelog          | 2 +-
 debian/copyright          | 2 +-
 scripts/rosversion        | 2 +-
 src/rospkg/environment.py | 2 +-
 src/rospkg/rospack.py     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 23b2375..375b13e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@ ros-rospkg (1.0.38-1) unstable; urgency=medium
 
   * Initial release (Closes: #805261)
 
- -- Jochen Sprickerhof <debian at jochen.sprickerhof.de>  Mon, 16 Nov 2015 04:17:16 +0000
+ -- Jochen Sprickerhof <debian at jochen.sprickerhof.de>  Wed, 18 Nov 2015 17:09:51 +0000
diff --git a/debian/copyright b/debian/copyright
index 62d28c3..1567bde 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Upstream-Contact: Dirk Thomas <dthomas at osrfoundation.org>
 Source: http://wiki.ros.org/wiki/rospkg
 
 Files: *
-Copyright: 2011-2015 Willow Garage, Inc.
+Copyright: 2008-2012 Willow Garage, Inc.
 License: BSD-3-clause
 
 License: BSD-3-clause
diff --git a/scripts/rosversion b/scripts/rosversion
index 78f0677..bfd4a11 100755
--- a/scripts/rosversion
+++ b/scripts/rosversion
@@ -75,7 +75,7 @@ if len(sys.argv) == 2:
         else:
             distro_name = get_distro_name_from_roscore()
         if not distro_name:
-            print('<unknown>')
+            print('Debian')
         else:
             print(distro_name)
         sys.exit(0)
diff --git a/src/rospkg/environment.py b/src/rospkg/environment.py
index 63b7abc..ce340e8 100644
--- a/src/rospkg/environment.py
+++ b/src/rospkg/environment.py
@@ -109,7 +109,7 @@ def get_ros_package_path(env=None):
     """
     if env is None:
         env = os.environ
-    return env.get(ROS_PACKAGE_PATH, None)
+    return env.get(ROS_PACKAGE_PATH, '') + ':/usr/share'
 
 def get_ros_home(env=None):
     """
diff --git a/src/rospkg/rospack.py b/src/rospkg/rospack.py
index 8050f5f..1c61192 100644
--- a/src/rospkg/rospack.py
+++ b/src/rospkg/rospack.py
@@ -89,7 +89,7 @@ def list_by_path(manifest_name, path, cache):
             # optimization for stacks.
             del dirs[:]
             continue #leaf     
-        elif 'rospack_nosubdirs' in files:
+        elif 'rospack_nosubdirs' in files or d.startswith('/usr/share/'):
             del dirs[:]
             continue  #leaf
         # remove hidden dirs (esp. .svn/.git)

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