New Upstream Snapshot - ros-rospkg

Ready changes

Summary

Merged new upstream version: 1.4.0+git20220609.1.721a25c (was: 1.4.0).

Diff

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
deleted file mode 100644
index 129771b..0000000
--- a/.github/workflows/ci.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-name: rospkg-ci
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-
-jobs:
-    build:
-      strategy:
-        matrix:
-          os: [ubuntu-latest, macos-latest]
-          python: ['3.7', '3.8', '3.9', '3.10']
-          include:
-          - os: ubuntu-18.04
-            python: '2.7'
-          - os: ubuntu-18.04
-            python: '3.6'
-      name: rospkg tests
-      runs-on: ${{matrix.os}}
-
-      steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python ${{matrix.python}}
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{matrix.python}}
-      - name: Install dependencies
-        run: |
-          if test ${{matrix.python}} = 2.7; then
-            python -m pip install pyparsing==2.4.7 'PyYAML<6.0'
-          fi
-          python -m pip install --upgrade pip setuptools
-          python -m pip install mock pytest pytest-cov
-          python setup.py build develop
-      - name: Run tests
-        run: |
-          python -m pytest --cov=rospkg test
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index fc89708..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-syntax: glob
-*.orig
-*.swp
-*.pyc
-*.DS_Store
-*~
-*.log
-.coverage
-src/rospkg.egg-info
-syntax: regexp
-(target|build|dist)/.*
-
-dist
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
deleted file mode 100644
index bf81984..0000000
--- a/CHANGELOG.rst
+++ /dev/null
@@ -1,70 +0,0 @@
-1.4.0 (2022-02-24)
-------------------
-- Add OS_RASPBIAN definition.
-  - https://github.com/ros-infrastructure/rospkg/pull/244
-- Add Conda OS detection.
-  - https://github.com/ros-infrastructure/rospkg/pull/224
-  - Fix syntax error in Conda detector
-  - https://github.com/ros-infrastructure/rospkg/pull/249
-- Avoid use of deprectated distro.linux_distribution() function.
-  - https://github.com/ros-infrastructure/rospkg/pull/248
-- Enable tests on python 3.10, bump actions/setup-python version.
-  - https://github.com/ros-infrastructure/rospkg/pull/246
-- Run tests with pytest instead of nose.
-  - https://github.com/ros-infrastructure/rospkg/pull/247
-- Drop support for python < 2.6.
-  - https://github.com/ros-infrastructure/rospkg/pull/242
-- Only add pypi dependency on distro with python >= 3.8.
-  - https://github.com/ros-infrastructure/rospkg/pull/245
-- Use unittest.mock where possible.
-  - https://github.com/ros-infrastructure/rospkg/pull/240
-- Update debian codename mapping.
-  - https://github.com/ros-infrastructure/rospkg/pull/238
-- Refactor CI platforms.
-  - https://github.com/ros-infrastructure/rospkg/pull/237
-- Fix test for riscv machines.
-  - https://github.com/ros-infrastructure/rospkg/pull/234
-- Add macOS Monterey to OS detection.
-  - https://github.com/ros-infrastructure/rospkg/pull/229
-- Remove legacy rosbuild files.
-  - https://github.com/ros-infrastructure/rospkg/pull/231
-- Add rosversion option to show all ROS package names and their versions.
-  - https://github.com/ros-infrastructure/rospkg/pull/221
-- Address problems with CI
-  - Require PyYAML < 6.0 for Python 2.
-  - Drop Travis CI configuration and Python 3.4.
-  - Use yaml.safe_load
-  - https://github.com/ros-infrastructure/rospkg/pull/228
-- Update release distributions. 
-  - Drop support for EOL Ubuntu distros.
-  - Drop support for EOL Debian distros.
-  - Add Ubuntu Jammy and Debian Bullseye for python3 releases.
-  - https://github.com/ros-infrastructure/rospkg/pull/227
-  - https://github.com/ros-infrastructure/rospkg/pull/236
-- Return list from ManifestManager.list().
-  - https://github.com/ros-infrastructure/rospkg/pull/220
-
-1.3.0 (2021-03-31)
--------------------
-- Fix for detecting big sur (and newer) versions of macOS
-  - https://github.com/ros-infrastructure/rospkg/pull/216
-- Add "opensuse-leap" support to os_detect.py
-  - https://github.com/ros-infrastructure/rospkg/pull/218
-- Switch RedHat-likes to FdoDetect, add some RHEL clones
-  - https://github.com/ros-infrastructure/rospkg/pull/219
-
-1.2.10 (2021-02-04)
--------------------
-- Fix CentOS 8.3 detection
-  - https://github.com/ros-infrastructure/rospkg/pull/215
-
-1.2.9 (2020-11-12)
-------------------
-- Add armv8l to tripwire_uname test.
-  - https://github.com/ros-infrastructure/rospkg/pull/206
-- Add OS detection for Buildroot.
-  - https://github.com/ros-infrastructure/rospkg/pull/205
-- Add OS detection for EulerOS.
-  - https://github.com/ros-infrastructure/rospkg/pull/200
-- Use GitHub Actions for rospkg CI.
-  - https://github.com/ros-infrastructure/rospkg/pull/212
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 555ec90..0000000
--- a/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-.PHONY: all setup clean_dist distro clean install testsetup test
-
-NAME=rospkg
-VERSION=`./setup.py --version`
-
-all:
-	echo "noop for debbuild"
-
-setup:
-	echo "building version ${VERSION}"
-
-clean_dist:
-	-rm -f MANIFEST
-	-rm -rf dist
-	-rm -rf deb_dist
-
-distro: setup clean_dist
-	python setup.py sdist
-
-clean: clean_dist
-	echo "clean"
-
-install: distro
-	sudo checkinstall python setup.py install
-
-testsetup:
-	echo "running rospkg tests"
-
-test: testsetup
-	cd test && pytest && pytest-3
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..d46fed0
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,18 @@
+Metadata-Version: 2.1
+Name: rospkg
+Version: 1.4.0
+Summary: ROS package library
+Home-page: http://wiki.ros.org/rospkg
+Author: Ken Conley
+Author-email: kwc@willowgarage.com
+Maintainer: ROS Infrastructure Team
+License: BSD
+Project-URL: Source code, https://github.com/ros-infrastructure/rospkg
+Project-URL: Issue tracker, https://github.com/ros-infrastructure/rospkg/issues
+Keywords: ROS
+Classifier: Programming Language :: Python
+Classifier: License :: OSI Approved :: BSD License
+Provides-Extra: test
+
+        Library for retrieving information about ROS packages and stacks.
+        
diff --git a/debian/changelog b/debian/changelog
index 2e5597a..4c1daee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ros-rospkg (1.4.0+git20220609.1.721a25c-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Wed, 08 Feb 2023 13:58:27 -0000
+
 ros-rospkg (1.4.0-2) unstable; urgency=medium
 
   [ Debian Janitor ]
diff --git a/debian/patches/0001-Set-default-ROS_PACKAGE_PATH-to-usr-share.patch b/debian/patches/0001-Set-default-ROS_PACKAGE_PATH-to-usr-share.patch
index 098d7fe..007b55b 100644
--- a/debian/patches/0001-Set-default-ROS_PACKAGE_PATH-to-usr-share.patch
+++ b/debian/patches/0001-Set-default-ROS_PACKAGE_PATH-to-usr-share.patch
@@ -7,10 +7,10 @@ Subject: Set default ROS_PACKAGE_PATH to /usr/share
  test/test_rospkg_environment.py | 6 +++---
  2 files changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/src/rospkg/environment.py b/src/rospkg/environment.py
-index e807978..f05b563 100644
---- a/src/rospkg/environment.py
-+++ b/src/rospkg/environment.py
+Index: ros-rospkg.git/src/rospkg/environment.py
+===================================================================
+--- ros-rospkg.git.orig/src/rospkg/environment.py
++++ ros-rospkg.git/src/rospkg/environment.py
 @@ -114,7 +114,7 @@ def get_ros_package_path(env=None):
      """
      if env is None:
@@ -20,10 +20,10 @@ index e807978..f05b563 100644
  
  
  def get_ros_home(env=None):
-diff --git a/test/test_rospkg_environment.py b/test/test_rospkg_environment.py
-index 2e44ce0..5512814 100644
---- a/test/test_rospkg_environment.py
-+++ b/test/test_rospkg_environment.py
+Index: ros-rospkg.git/test/test_rospkg_environment.py
+===================================================================
+--- ros-rospkg.git.orig/test/test_rospkg_environment.py
++++ ros-rospkg.git/test/test_rospkg_environment.py
 @@ -52,13 +52,13 @@ def test_get_ros_root():
  
  def test_get_ros_package_path():
diff --git a/debian/patches/0002-Limit-search-in-usr-share.patch b/debian/patches/0002-Limit-search-in-usr-share.patch
index 025e668..32b77a3 100644
--- a/debian/patches/0002-Limit-search-in-usr-share.patch
+++ b/debian/patches/0002-Limit-search-in-usr-share.patch
@@ -8,11 +8,11 @@ ROS packages.
  src/rospkg/rospack.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/src/rospkg/rospack.py b/src/rospkg/rospack.py
-index 3520321..9c10069 100644
---- a/src/rospkg/rospack.py
-+++ b/src/rospkg/rospack.py
-@@ -95,7 +95,7 @@ def list_by_path(manifest_name, path, cache):
+Index: ros-rospkg.git/src/rospkg/rospack.py
+===================================================================
+--- ros-rospkg.git.orig/src/rospkg/rospack.py
++++ ros-rospkg.git/src/rospkg/rospack.py
+@@ -95,7 +95,7 @@ def list_by_path(manifest_name, path, ca
              # optimization for stacks.
              del dirs[:]
              continue  # leaf
diff --git a/debian/patches/0003-Set-rosversion-to-Debian.patch b/debian/patches/0003-Set-rosversion-to-Debian.patch
index d07639b..5e40dc7 100644
--- a/debian/patches/0003-Set-rosversion-to-Debian.patch
+++ b/debian/patches/0003-Set-rosversion-to-Debian.patch
@@ -6,10 +6,10 @@ Subject: Set rosversion to Debian
  src/rospkg/rosversion.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/src/rospkg/rosversion.py b/src/rospkg/rosversion.py
-index 4c41d73..65f815f 100644
---- a/src/rospkg/rosversion.py
-+++ b/src/rospkg/rosversion.py
+Index: ros-rospkg.git/src/rospkg/rosversion.py
+===================================================================
+--- ros-rospkg.git.orig/src/rospkg/rosversion.py
++++ ros-rospkg.git/src/rospkg/rosversion.py
 @@ -121,7 +121,7 @@ def main():
          else:
              distro_name = get_distro_name_from_roscore()
diff --git a/debian/patches/0004-Skip-broken-test-case.patch b/debian/patches/0004-Skip-broken-test-case.patch
index 7492b03..8940707 100644
--- a/debian/patches/0004-Skip-broken-test-case.patch
+++ b/debian/patches/0004-Skip-broken-test-case.patch
@@ -6,10 +6,10 @@ Subject: Skip broken test case
  test/test_rospkg_packages.py | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/test/test_rospkg_packages.py b/test/test_rospkg_packages.py
-index ec2ff6f..c36df93 100644
---- a/test/test_rospkg_packages.py
-+++ b/test/test_rospkg_packages.py
+Index: ros-rospkg.git/test/test_rospkg_packages.py
+===================================================================
+--- ros-rospkg.git.orig/test/test_rospkg_packages.py
++++ ros-rospkg.git/test/test_rospkg_packages.py
 @@ -35,6 +35,7 @@ from __future__ import print_function
  import os
  import subprocess
diff --git a/doc/Makefile b/doc/Makefile
deleted file mode 100644
index a82e37a..0000000
--- a/doc/Makefile
+++ /dev/null
@@ -1,134 +0,0 @@
-# Makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
-PAPER         =
-BUILDDIR      = _build
-
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest
-
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html       to make standalone HTML files"
-	@echo "  dirhtml    to make HTML files named index.html in directories"
-	@echo "  singlehtml to make a single large HTML file"
-	@echo "  pickle     to make pickle files"
-	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
-	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  devhelp    to make HTML files and a Devhelp project"
-	@echo "  epub       to make an epub"
-	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  text       to make text files"
-	@echo "  man        to make manual pages"
-	@echo "  changes    to make an overview of all changed/added/deprecated items"
-	@echo "  linkcheck  to check all external links for integrity"
-	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
-
-clean:
-	-rm -rf $(BUILDDIR)/*
-
-html:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
-dirhtml:
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-singlehtml:
-	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
-	@echo
-	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
-
-pickle:
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-json:
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-qthelp:
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/rospkg.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/rospkg.qhc"
-
-devhelp:
-	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
-	@echo
-	@echo "Build finished."
-	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/rospkg"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/rospkg"
-	@echo "# devhelp"
-
-epub:
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
-	@echo
-	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
-latex:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
-	@echo "Run \`make' in that directory to run these through (pdf)latex" \
-	      "(use \`make latexpdf' here to do that automatically)."
-
-latexpdf:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through pdflatex..."
-	make -C $(BUILDDIR)/latex all-pdf
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-text:
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
-	@echo
-	@echo "Build finished. The text files are in $(BUILDDIR)/text."
-
-man:
-	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
-	@echo
-	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
-
-changes:
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
-
-linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
-
-doctest:
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."
-
-upload: html
-	scp -r _build/html/ rosbot@ros.osuosl.org:/home/rosbot/docs/independent/api/rospkg/
-
diff --git a/doc/_templates/index.html b/doc/_templates/index.html
deleted file mode 100644
index 9f168d4..0000000
--- a/doc/_templates/index.html
+++ /dev/null
@@ -1,41 +0,0 @@
-{% extends "layout.html" %}
-{% set title = 'ROS packages' %}
-{% block body %}
-  <h1>Welcome</h1>
-
-  <p>
-    The ROS packaging system simplifies development and distribution of
-    code libraries.  It enable you to easily specify dependencies between
-    code libraries, easily interact with those libraries from the command-line,
-    and release your code for others to use.  
-  </p>
-  <p>
-    ROS packages are designed to support building and running code in
-    local code trees.  This is useful for developing software on
-    multi-developer systems, such as robots, where there may be
-    multiple versions of a library in use, and code is being
-    contributed from multiple sources.  It is also design to support
-    modular code that is easily shared with other developers.
-  </p>
-  <h2>Documentation</h2>
-
-  <table class="contentstable" align="center" style="margin-left: 30px"><tr>
-    <td width="50%">
-      <p class="biglink"><a class="biglink" href="{{ pathto("overview") }}">Package system overview</a><br/>
-         <span class="linkdescr">Overview of the ROS concepts like packages, stacks, and manifests.</span></p>
-      <p class="biglink"><a class="biglink" href="{{ pathto("command_line") }}">Command-line tools</a><br/>
-         <span class="linkdescr">rospack, rosstack, rosdep, and more</span></p>
-      <p class="biglink"><a class="biglink" href="{{ pathto("environment") }}">Environment variables</a><br/>
-         <span class="linkdescr">Package-system-related environment variables like <tt>ROS_PACKAGE_PATH</tt>.</span></p>
-    </td><td width="50%">
-      <p class="biglink"><a class="biglink" href="{{ pathto("python_api") }}">Python API (rospkg)</a><br/>
-         <span class="linkdescr">Code API documenation for using the rospkg Python library</span></p>
-      <p class="biglink"><a class="biglink" href="{{ pathto("tutorials") }}">Tutorials</a><br/>
-         <span class="linkdescr">TODO</span></p>
-      <p class="biglink"><a class="biglink" href="{{ pathto("file_formats") }}">File formats</a><br/>
-         <span class="linkdescr">Documentation for manifest and other file formats</span></p>
-    </td></tr>
-  </table>
-
-{% endblock %}
-
diff --git a/doc/command_line.rst b/doc/command_line.rst
deleted file mode 100644
index 21f42a1..0000000
--- a/doc/command_line.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-Command-line Tools
-==================
-
-.. toctree::
-   :maxdepth: 2
-
-   rospack
-   rosstack
-
-
-.. seealso::
-
-   :ref:`rosdep2 <rosdep2>`
diff --git a/doc/conf.py b/doc/conf.py
deleted file mode 100644
index 91bd796..0000000
--- a/doc/conf.py
+++ /dev/null
@@ -1,227 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# rospkg documentation build configuration file, created by
-# sphinx-quickstart on Thu Aug  4 20:58:04 2011.
-#
-# This file is execfile()d with the current directory set to its containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-import sys, os
-sys.path.insert(0, os.path.abspath('../src'))
-import rospkg
-import catkin_sphinx
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
-
-# -- General configuration -----------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be extensions
-# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.doctest', 'sphinx.ext.coverage', 'sphinx.ext.viewcode', 'sphinx.ext.autosummary', 'sphinx.ext.intersphinx']
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix of source filenames.
-source_suffix = '.rst'
-
-# The encoding of source files.
-#source_encoding = 'utf-8-sig'
-
-# The master toctree document.
-master_doc = 'contents'
-
-# General information about the project.
-project = u'ROS packages'
-copyright = u'2011, Willow Garage'
-
-intersphinx_mapping = {
-    'vcstools': ('http://docs.ros.org/independent/api/vcstools/html', None),
-    'rosinstall': ('http://docs.ros.org/independent/api/rosinstall/html', None),
-    'rosdep2': ('http://docs.ros.org/independent/api/rosdep/html', None),
-    }
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = rospkg.__version__
-# The full version, including alpha/beta/rc tags.
-release = version
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#language = None
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-exclude_patterns = ['_build']
-
-# The reST default role (used for this markup: `text`) to use for all documents.
-#default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
-
-# -- Options for HTML output ---------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-html_theme_path = [os.path.join(os.path.dirname(catkin_sphinx.__file__), 'theme')]
-html_theme = 'ros-theme'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#html_theme_options = {}
-
-html_logo = 'ros.png'
-
-# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
-
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
-# 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']
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-html_additional_pages = {'index': 'index.html'}
-
-# If false, no module index is generated.
-#html_domain_indices = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'rospkgdoc'
-
-
-# -- Options for LaTeX output --------------------------------------------------
-
-# The paper size ('letter' or 'a4').
-#latex_paper_size = 'letter'
-
-# The font size ('10pt', '11pt' or '12pt').
-#latex_font_size = '10pt'
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
-latex_documents = [
-  ('index', 'rospkg.tex', u'ROS Package Documentation',
-   u'Eric Berger, Ken Conley, Josh Faust, Tully Foote, Brian Gerkey, Jeremy Leibs, Morgan Quigley, Rob Wheeler', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Additional stuff for the LaTeX preamble.
-#latex_preamble = ''
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
-# -- Options for manual page output --------------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    ('man/rosversion', 'rosversion', u'rosverion command', [u'Ken Conley'], 1)
-]
diff --git a/doc/contents.rst b/doc/contents.rst
deleted file mode 100644
index 909488c..0000000
--- a/doc/contents.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-Contents
-========
-
-.. toctree::
-   :maxdepth: 2
-
-   overview
-   file_formats
-   command_line
-   python_api
-   tutorials
diff --git a/doc/developers_guide.rst b/doc/developers_guide.rst
deleted file mode 100644
index f5a7520..0000000
--- a/doc/developers_guide.rst
+++ /dev/null
@@ -1,73 +0,0 @@
-Developer's Guide
-=================
-
-REP 114: rospkg standalone library
-----------------------------------
-
-The rospkg library is being developed using the ROS REP process.  It
-was introduced in `REP 114: rospkg standalone library
-<http://www.ros.org/reps/rep-0114.html>`_.  Please read REP 114 to
-better understand the motivation and goals of the rospkg library.
-
-Bug reports and feature requests
---------------------------------
-
-- `Submit a bug report / a feature request <https://github.com/ros-infrastructure/rospkg/issues>`_
-
-Getting the code
-----------------
-
-rospkg is hosted on GitHub.  To start developing for it, please create a fork:
-
-https://github.com/ros-infrastructure/rospkg
-
-
-Developing new OsDetectors
---------------------------
-
-Developing a new :class:`OsDetector` is fairly straightforward.  There
-are many examples in ``os_detect.py``.
-
-If you contribute a :class:`OsDetector`, you *must* provide complete
-unit test coverage.  For example, if your detector relies on parsing
-``/etc/issue`` files, you must submit example ``/etc/issue`` files
-along with tests that parse them correctly.
-
-Test files for os detection should be placed in ``test/os_detect/os_name``.
-
-If you submit a new detector, the documentation in
-``doc/os_detect.rst`` must be updated as well.
-
-Testing
--------
-
-Setup
-
-::
-
-    pip install pytest
-    pip install mock
-
-
-rospkg uses `pytest <http://docs.pytest.org>`_ 
-for testing, which is a fairly simple and straightfoward test
-framework.  You just have to write a function start with the name
-``test`` and use normal ``assert`` statements for your tests.
-
-rospkg also uses `mock <http://www.voidspace.org.uk/python/mock/>`_ to
-create mocks for testing.
-
-You can run the tests, including coverage, as follows:
-
-::
-
-    cd rospkg
-    pytest test --cov=rospkg
-
-
-Documentation
--------------
-
-Sphinx is used to provide API documentation for rospkg.  The documents
-are stored in the ``doc`` subdirectory.
-
diff --git a/doc/distro_format.rst b/doc/distro_format.rst
deleted file mode 100644
index 94a1c96..0000000
--- a/doc/distro_format.rst
+++ /dev/null
@@ -1,292 +0,0 @@
-.. _distro_format:
-
-rosdistro file format
-=====================
-
-rosdistro is a file format for managing `ROS Distribution release
-<http://www.ros.org/wiki/Distributions>`_ and the ROS stacks they
-contain. This file format is used as input to a variety of tools in
-the ROS build and release toolchain, from stack release tools to
-rosdoc.  The file format itself is a YAML-based description of a
-collection of ROS stacks.
-
-There are two roles of information in the rosdistro file:
-
- - *Building*: What versions of stacks are included in the distribution release
- - *Continuous integration and release*: Source control information of stacks in the release
-
-.. contents:: Table of Contents
-   :depth: 3
-
-
-Examples
---------
-
- - `cturtle.rosdistro <https://code.ros.org/svn/release/trunk/distros/cturtle.rosdistro>`_
- - `electric.rosdistro <https://code.ros.org/svn/release/trunk/distros/electric.rosdistro>`_
-
-Main Sections
--------------
-
-The rosdistro document is a YAML mapping. This mapping has several main sections:
-
- `_rules`
-   Top-level, named rules for stacks. Rules describe the URLs where stacks can be found in source control, ``{rule-name: {source-control-rules}}``.
-
-   Example::
-
-        _rules:
-          alufr-ros-pkg:
-            repo: alufr-ros-pkg
-            svn:
-              dev: https://alufr-ros-pkg.googlecode.com/svn/trunk/$STACK_NAME
-              distro-tag: https://alufr-ros-pkg.googlecode.com/svn/tags/distros/$RELEASE_NAME/stacks/$STACK_NAME
-              release-tag: https://alufr-ros-pkg.googlecode.com/svn/tags/stacks/$STACK_NAME/$STACK_NAME-$STACK_VERSION
-
- `release`
-   Name of this release, ``string``
-
-   Example::
-
-       release: electric
-
- `variants`
-   This section lists the variants (aka debian metapackages) that are described by this file. 
-
-   *Type*: ordered sequence of mappings, ``{distribution-name: [stack-names]}``
-
-   Example::
-
-        variants:
-        - ros-base:
-            stacks: [ros, ros_comm, common_rosdeps]
-        
- `stacks`
-   This section lists release information about the stacks that are included in the distribution. This information ranges from the version number of the release to URLs that are used for source control.   
-
-   NOTE: the `_uri_rules` key can appear at any level in this tree of mappings. 
-   
-   *Type*: unordered list of mappings ``{stack-name: {stack-properties}}``
-
-   Example::
-
-        stacks:
-          _rules: ros-pkg-trunk
-          arbotix: {_rules: vanadium-ros-pkg, version: 0.6.0}
-        
- `version`
-
-   *DEPRECATED*: Version number for this file. Version numbers may be used by tools, such as the debian package builder, to determine whether or not to generate new output. You can use the `$Revision: $` `svn:keyword` to track the SVN revision Id of the file.
-
-   *Type*: ``int`` or special ``$Revision: VERSION $`` string.
-
-_rules
-~~~~~~
-
-`_rules` are URL format strings that are used for determining the location of source code related to a stack.
-
-
-variants
-~~~~~~~~
-
-The `variants` section lists groupings of stacks that you wish to
-install together. They map directly to debian metapackages. In
-addition to providing a list of stack names, variants may also specify
-that they extend another variant.
-
-
-Example::
-
-    variants:
-    - core:
-        stacks: [ros, rx]
-    - extended:
-        extends: core
-        stacks: [common, common_msgs, geometry]
-    
-stacks
-~~~~~~
-
-Each key in the `stacks` section describes information about a particular stack, e.g.::
-
-      mystack: {version: 0.7.3}
-
-In this example, the stack is named ``mystack``. It has a version 0.7.3 release.
-
-A stack may also contain a ``_rules`` key, which overrides any higher-level ``_rules`` values.
-
-
-Version Control _rules
-----------------------
-
-Repo _rule
-~~~~~~~~~~
-
-TODO: reorg this comment.
-
-There should be a rule stating the repo name:
-
- ``repo: ros-pkg``
-
-SVN _rules
-~~~~~~~~~~
-
-*Required keys*
-
- ``dev``
-    URL of your development branch. This often refers to a code branch, like ``trunk``.
-
- ``release-tag``
-    URL for version-specific release tag to create (e.g. ``tags/ros-1.2.1``). Release tags are generally for ''immutable'' references to code. The ``release-tag`` is generally used for building binaries, i.e. debian packages. This allows us to rollback releases in the debian system if there is a problem.
-
- ``distro-tag``
-    URL for the distribution release tag to create. This is a moving tag that allows people to track releases for a specific distribution release (e.g. ``tags/cturtle``). The ``distro-tag`` is generally used for source-based installs. They allow users to ``svn up`` and get newer updates.
-
-
-*Optional keys*
-
- We define three more rules that are necessary if your repository uses separate URLs for anonymous access.
-
- ``anon-dev``
-    *anonymously readable* URL of your development branch
- ``anon-distro-tag``
-    *anonymously readable* URL for the distribution release tag to create. This is a moving tag that allows people to track releases for a specific distribution release (e.g. ``tags/cturtle``).
- ``anon-release-tag``
-    *anonymously readable* URL for version-specific release tag to create (e.g. ``tags/ros-1.2.1``).
-
-You do not have to define these rules your repository provides anonymous access at the ``dev``/``distro-tag``/``release-tag`` URLs.
-
-
-SVN example::
-
-    svn: 
-      anon-dev: http://svn.mech.kuleuven.be/repos/orocos/trunk/kul-ros-pkg/stacks/$STACK_NAME/trunk
-      anon-distro-tag: http://svn.mech.kuleuven.be/repos/orocos/trunk/kul-ros-pkg/stacks/$STACK_NAME/tags/$RELEASE_NAME
-      anon-release-tag: http://svn.mech.kuleuven.be/repos/orocos/trunk/kul-ros-pkg/stacks/$STACK_NAME/tags/$STACK_NAME-$STACK_VERSION
-      dev: https://svn.mech.kuleuven.be/repos/orocos/trunk/kul-ros-pkg/stacks/$STACK_NAME/trunk
-      distro-tag: https://svn.mech.kuleuven.be/repos/orocos/trunk/kul-ros-pkg/stacks/$STACK_NAME/tags/$RELEASE_NAME
-      release-tag: https://svn.mech.kuleuven.be/repos/orocos/trunk/kul-ros-pkg/stacks/$STACK_NAME/tags/$STACK_NAME-$STACK_VERSION
-
-Distributed VCS _rules (hg, git, bzr)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Mercurial, Git, and Bazaar we use a standard set of keys for distributed VCS systems.
-
-*Required keys*
-
- ``uri``
-   The URI for the repo.  For example ``https://stack-nxt-robots.foote-ros-pkg.googlecode.com/hg``
-
- ``dev-branch``
-   The name of the branch in which development is being focused for this distro, for example ``default`` in hg or ``master`` in git are common here. After branching for diamondback it may be ``1.3``
-
- ``distro-tag``
-   The tag to pull which tracks the latest release in this distro often just ``$RELEASE_NAME``
-
- ``release-tag``
-   The rule for how to generated numbered release tags.  Commonly just ``$STACK_NAME-$STACK_VERSION``
-
-
-*Optional key*
-
- ``anon-uri``
-   The URI for the repo that is used for anonymous access to your repo.  Not necessary if ``uri`` is valid for anonymous access.
-
-
-Bazaar example::
-
-      bzr: 
-        anon-uri: lp:sr-ros-interface
-        uri: bzr+ssh://bazaar.launchpad.net/~shadowrobot/sr-ros-interface
-        dev-branch: stable
-        distro-tag: $RELEASE_NAME
-        release-tag: $STACK_NAME-$STACK_VERSION
-
-
-Git example::
-
-      git: 
-        anon-uri: http://git.mech.kuleuven.be/robotics/rtt_ros_integration.git
-        uri: git@git.mech.kuleuven.be:robotics/rtt_ros_integration.git
-        dev-branch: master
-        distro-tag: $RELEASE_NAME
-        release-tag: $STACK_NAME-$STACK_VERSION
-
-
-Mercurial example::
-
-      hg: 
-        uri: https://kforge.ros.org/simplecap/simple_capture
-        dev-branch: default
-        distro-tag: $RELEASE_NAME
-        release-tag: $STACK_NAME-$STACK_VERSION
-
-
-
-_rules Variables
-~~~~~~~~~~~~~~~~
-
-You can use several variables that make writing these rules easier and re-usable:
-
- ``$STACK_NAME``
-   Name of stack.
-
- ``$STACK_VERSION``
-   Version of stack.
-
- ``$DISTRO_NAME``
-   Name of distribution release.
-
-Top-level _rules
-~~~~~~~~~~~~~~~~
-
-Top-level rules are named configuration dictionaries that can be used
-by stacks declarations.  Here is an example SVN rule that defines
-releases for releasing stacks in `ros-pkg` that use `trunk` as the
-development branch::
-
-
-    _rules:
-    
-      [OTHER RULE DEFINITIONS]
-    
-      ros-pkg-trunk:
-        svn: 
-          dev: 'https://code.ros.org/svn/ros-pkg/stacks/$STACK_NAME/trunk'
-          distro-tag: 'https://code.ros.org/svn/ros-pkg/stacks/$STACK_NAME/tags/$RELEASE_NAME'
-          release-tag: 'https://code.ros.org/svn/ros-pkg/stacks/$STACK_NAME/tags/$STACK_NAME-$STACK_VERSION'
-
-
-Stack _rules
-~~~~~~~~~~~~
-
-In most cases, stacks usually refer to named, top-level rules like so::
-
-    stacks:
-    
-      [OTHER STACK DEFINITIONS]
-    
-      pr2_navigation:
-        _rules: wg-ros-pkg-trunk
-        version: 0.1.0
-    
-      [OTHER STACK DEFINITIONS]
-
-In this case, the ``pr2_navigation`` stack will use the rules named ``wg-ros-pkg-trunk``, which must be declared in the top-level ``_rules`` section.
-
-In some cases, individual stacks may wish to provide their own rules. If you are just doing a release off a temporary branch, or otherwise, this can be the easiest way of cleanly specifying new rules.
-
-Example::
-
-    stacks:
-    
-      [OTHER STACK DEFINITIONS]
-    
-      pr2_navigation:
-        _rules: 
-          svn:
-            dev: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/branches/cturtle_branch'
-            distro-tag: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/tags/$RELEASE_NAME'
-            release-tag: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/tags/$STACK_NAME-$STACK_VERSION'
-        version: 0.1.4
-    
diff --git a/doc/environment.rst b/doc/environment.rst
deleted file mode 100644
index e9585d6..0000000
--- a/doc/environment.rst
+++ /dev/null
@@ -1,60 +0,0 @@
-Environment Variables
-=====================
-
-The following are environment variables that are observed by the ROS
-packaging system. This listing does not include environment variables
-for the ROS communication middleware (e.g. :envvar:`ROS_MASTER_URI`,
-:envvar:`ROS_HOSTNAME`).
-
-Essential
----------
-
-.. data:: ROS_PACKAGE_PATH
-
-   Path(s) to ROS packages and stacks to include in the build and
-   runtime environment.  :envvar:`ROS_PACKAGE_PATH` can be composed of
-   one or more paths separated by your standard OS path separator
-   (e.g. ':' on Unix-like systems).  If there are multiple packages or
-   stacks with the same name, ROS will choose the one that appears on
-   :envvar:`ROS_PACKAGE_PATH` first.  
-
-.. data:: ROS_ROOT
-
-   This is a *required* environment variable, but it is only provided
-   for backwards compatibility.  Historically, it is the path to the
-   ROS stack.  For ROS Fuerte and later, it is the path to a
-   backwards-compatibility support directory.
-
-
-Optional
---------
-
-.. data:: ROS_HOME
-
-   Override path to :envvar:`ROS_HOME`, which is where log files and
-   other user-specific assets are stored.  By default this is
-   `~/.ros/`.
-
-.. data:: ROS_LOG_DIR
-
-   Override path to directory where log files are written.  By default this
-   is :envvar:`ROS_HOME`/log. 
-
-.. data:: ROS_TEST_RESULTS_DIR
-
-   Override path to directory where teset results are written.  By default this is
-   is :envvar:`ROS_HOME`/test_results.
-   
-.. data:: ROS_DISTRO
-
-   .. versionadded:: Fuerte
-
-   Override name of the currently active ROS distribution.  By default, this value is
-   read from :envvar:`ROS_ETC_DIR`/distro. 
-
-.. data:: ROS_ETC_DIR
-
-   .. versionadded:: Fuerte
-
-   Override path to `/etc/ros` directory.
-
diff --git a/doc/file_formats.rst b/doc/file_formats.rst
deleted file mode 100644
index 910983f..0000000
--- a/doc/file_formats.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-File formats
-============
-
-.. toctree::
-   :maxdepth: 2
-
-   manifest_xml
-   stack_xml
-   distro_format
diff --git a/doc/man/rosversion.1 b/doc/man/rosversion.1
deleted file mode 100644
index 409a428..0000000
--- a/doc/man/rosversion.1
+++ /dev/null
@@ -1,59 +0,0 @@
-.TH "ROSVERSION" "1" "January 12, 2012" "0.10.1" "ROS packages"
-.SH NAME
-rosversion \- rosverion command
-.
-.nr rst2man-indent-level 0
-.
-.de1 rstReportMargin
-\\$1 \\n[an-margin]
-level \\n[rst2man-indent-level]
-level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
--
-\\n[rst2man-indent0]
-\\n[rst2man-indent1]
-\\n[rst2man-indent2]
-..
-.de1 INDENT
-.\" .rstReportMargin pre:
-. RS \\$1
-. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
-. nr rst2man-indent-level +1
-.\" .rstReportMargin post:
-..
-.de UNINDENT
-. RE
-.\" indent \\n[an-margin]
-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.nr rst2man-indent-level -1
-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
-..
-.\" Man page generated from reStructeredText.
-.
-.SH SYNOPSIS
-.sp
-\fBrosversion\fP <\fIstack\fP> | \fI\-d\fP
-.SH DESCRIPTION
-.sp
-The \fBrosversion\fP command prints version information for ROS stacks
-and can also print the name of the active ROS distribution.
-.sp
-rosversion takes in a single ROS stack name as an argument, or a
-\fB\-d\fP option with no arguments to print the distribution version
-instead.  If the version number for a stack is not known,
-"<unversioned>" will be printed instead.
-.SH OPTIONS
-.sp
-\fB\-d\fP
-.INDENT 0.0
-.INDENT 3.5
-Print codename for current ROS distribution.
-.UNINDENT
-.UNINDENT
-.SH AUTHOR
-Ken Conley
-.SH COPYRIGHT
-2011, Willow Garage
-.\" Generated by docutils manpage writer.
-.\" 
-.
diff --git a/doc/man/rosversion.rst b/doc/man/rosversion.rst
deleted file mode 100644
index 1962469..0000000
--- a/doc/man/rosversion.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-:orphan:
-
-rosversion manual page
-======================
-
-Synopsis
---------
-
-**rosversion** <*stack*> | *-d*
-
-Description
------------
-
-The **rosversion** command prints version information for ROS stacks
-and can also print the name of the active ROS distribution.
-
-rosversion takes in a single ROS stack name as an argument, or a
-**-d** option with no arguments to print the distribution version
-instead.  If the version number for a stack is not known,
-"<unversioned>" will be printed instead.
-
-Options
--------
-
-**-d**
-
-  Print codename for current ROS distribution. 
-
diff --git a/doc/manifest_xml.rst b/doc/manifest_xml.rst
deleted file mode 100644
index f6647e7..0000000
--- a/doc/manifest_xml.rst
+++ /dev/null
@@ -1,388 +0,0 @@
-.. _manifest_xml:
-
-Package manifest XML tags reference
-===================================
-
-Manifests always have the filename ``manifest.xml``.
-
-Manifests must use `valid XML syntax <http://www.w3schools.com/xml/xml_syntax.asp>`_, including escaping special characters such as ``<``, ``>``, and ``&`` when they are used inside strings (use ``&lt;``, ``&gt;``, and ``&amp;``, respectively).
-
-.. contents:: Table of Contents
-   :depth: 2
-
-Required Tags
--------------
-
-The required set of tags in a ``manifest.xml`` file is very minimal and only provides the most basic metadata about your package, including what it is, who wrote it, and who can use it. 
-
- * :ref:`\<package\> <package_tag>`
- * :ref:`\<description\> <manifest_description_tag>`
- * :ref:`\<description|<manifest_description_tag>`
- * :ref:`\<license|<manifest_license_tag>`
- * :ref:`\<author\> <manifest_author_tag>`
-
-Optional Tags
--------------
-
-The most common optional tags are :ref:`\<depend\> <manifest_depend_tag>` and
-:ref:`\<url\> <manifest_url_tag>`. We strongly recommend the use of the
-``<url>`` tag to point users to a website where they can find out
-more information about your stack. This website is most commonly a
-wiki page on ros.org.
-
-
- * :ref:`\<depend\> <manifest_depend_tag>`
- * :ref:`\<rosdep\> <manifest_rosdep_tag>`
- * :ref:`\<url\> <manifest_url_tag>`
- * :ref:`\<review\> <manifest_review_tag>`
- * :ref:`\<export\> <manifest_export_tag>`
- * :ref:`\<versioncontrol\> <versioncontrol_tag>`
-
-.. _package_tag:
-
-<package>
----------
-
-This is the top-level tag in a manifest.
-
-Elements
-''''''''
-
- * :ref:`\<description\> <manifest_description_tag>`
- * :ref:`\<license\> <manifest_license_tag>`
- * :ref:`\<author\> <manifest_author_tag>`
- * :ref:`\<url\> <manifest_url_tag>`
- * :ref:`\<depend\> <manifest_depend_tag>`
- * :ref:`\<rosdep\> <manifest_rosdep_tag>`
- * :ref:`\<export\> <manifest_export_tag>`
- * :ref:`\<review\> <manifest_review_tag>`
- * :ref:`\<versioncontrol\> <versioncontrol_tag>`
-
-.. _manifest_description_tag:
-
-<description>
--------------
-
-Text
-''''
-
-Description of your package. It may be multi-line and include XHTML. 
-
-Attributes
-''''''''''
-
- ``brief="brief text"`` *(optional)*
-   One-line summary of your Package. Useful for UI displays where the package name isn't sufficiently descriptive.
-
-Example
-'''''''
-
-::
-
-    <description brief="ROS for Python">
-       Python implementation of the ROS master/node APIs and client library.
-    </description>
-
-
-.. _manifest_license_tag:
-
-<license>
----------
-
-Text
-''''
-
-Name of license for this package, e.g. BSD, GPL, LGPL. In order to assist machine readability, only include the license name in this tag. For any explanatory text about licensing caveats, please use the ``<description>`` tag. 
-
-Most common open-source licenses are described on the `OSI website <http://www.opensource.org/licenses/alphabetical>`_.
-
-Commonly used license strings:
-
- - Apache 2.0
- - BSD
- - Boost Software License
- - GPLv2
- - GPLv3
- - LGPLv2.1
- - LGPLv3
- - MIT 
- - Mozilla Public License Version 1.1
- - ZLib
- - wxWindows
-
-
-Attributes
-''''''''''
-
- ``url="license url"`` *(optional)*
-  For lesser-known licenses, it is helpful to add this attribute with a link to the text of the license.
-
-Example
-'''''''
-
-::
-
-    <license>BSD</license>
-
-  
-.. _manifest_author_tag:
-
-<author>
---------
-
-Text
-''''
-
-Name and contact information for the package.  If there are multiple authors, use a comma-separated list in a single author tag.
-
-Example
-'''''''
-
-::
-
-    <author>Alyssa P. Hacker/aphacker@willowgarage.com, Norman Contributor/norcon@example.com</author>
-
-
-.. _manifest_depend_tag:
-
-<depend>
---------
-
-Declare a ROS package that this package depends on.
-
-Attributes
-''''''''''
-
- ``package="ros_package_name"``
-  Name of ROS package dependency.
-
-Example
-'''''''
-
-::
-
-    <depend package="pkgname"/>
-
-.. _manifest_rosdep_tag:
-
-<rosdep>
---------
-
-Declare an external dependency that this package requires and can be installed via `rosdep <http://ros.org/wiki/rosdep>`_. These external dependencies are generally libraries that can be installed by OS package managers, like ``apt``.
-
-Attributes
-''''''''''
-
- ``name="rosdep_dependency"``
-  Name of rosdep dependency.
-
-Example
-'''''''
-
-::
-
-    <rosdep name="boost"/>
-
-
-.. _manifest_url_tag:
-
-<url> tag
----------
-
-Text
-''''
-
-Web site for your package. This is important for guiding users to your online documentation.
-
-Example
-'''''''
-
-::
-
-    <url>http://ros.org/wiki/rospy</url>
-
-.. _versioncontrol_tag:
-
-.. _manifest_export_tag:
-
-<export>
---------
-
-The ``<export> ... </export>`` portion of the manifest declares
-various flags and settings that a package wishes to export to support
-tools, such as CMake. This section is extensible by individual tools
-and these properties can be extracted from the command-line using the
-`rospack <http://ros.org/wiki/rospack>`_ tool.
-
-Elements
-''''''''
-
-You are free to add your own XML elements to the ``<export>`` section
-of a manifest. This is used by a variety of packages for functionality
-such as plugins. Tags currently used include:
-
- * :ref:`\<cpp\> <cpp_tag>`
- * :ref:`\<python\> <python_tag>`
- * :ref:`\<rosdoc\> <rosdoc_tag>`
- * :ref:`\<roslang\> <roslang_tag>`
- * :ref:`\<roswtf\> <roswtf_tag>`
-
-
-.. _cpp_tag:
-
-export: <cpp>
--------------
-
-Export flags to the make compiler. These flags are made available to
-*users* of this package, not the package itself.  This is not the
-place to put flags that you'll need in building your package.
-Instead, encode those needs in the [[CMakeLists|CMakeLists.txt]] file,
-using standard CMake macros, such as ``include_directories()`` and
-``target_link_libraries()``.
-
-Attributes
-''''''''''
-
- ``cflags="${prefix}/include"``
-   cflags export value.
- ``lflags="..."``
-   lflags export value.
- ``os="osx"``
-   Restricts settings to a particular OS.
-
-Example
-'''''''
-
-::
-
-    <cpp cflags="-I${prefix}/include" lflags="-L${prefix}/lib -Wl,-rpath,${prefix}/lib -lros"/>
-    <cpp os="osx" cflags="-I${prefix}/include" lflags="-L${prefix}/lib -Wl,-rpath,${prefix}/lib -lrosthread -framework CoreServices"/>
-
-Note the use of ``-Wl,-rpath,${prefix}/lib``.  This tells the linker to look in ``${prefix}/lib`` for shared libraries when running an executable.  This flag is necessary to allow the use of shared libraries that reside in a variety of directories, without requiring the user to modify :envvar:`LD_LIBRARY_PATH`.  Every time you add a ``-Lfoo`` option to your exported lflags, add a matching ``-Wl,-rpath,foo`` option.  The -Wl options can be chained together, e.g.: ``-Wl,-rpath,foo,-rpath,bar``.
-
-.. _python_tag:
-
-export: <python>
-----------------
-
-Export a path other than the default ``${prefix}/src`` to the :envvar:`PYTHONPATH`.
-
-Attributes
-''''''''''
-
- ``path="${prefix}/mydir"``
-  Path to append to :envvar:`PYTHONPATH`.
-
-Example
-'''''''
-
-::
-
-    <python path="${prefix}/different_dir"/>
-
-
-.. _rosdoc_tag:
-
-export: <rosdoc>
-----------------
-
-Override settings in the `rosdoc <http://ros.org/wiki/rosdoc>`_ documentation generator. Currently this is used to disable auto-generated code documentation on the package. This is common for thirdparty packages, which have their own documentation. This tag enables packages to link to this external documentation.
-
-Attributes
-''''''''''
-
- ``external="http://link"`` *(optional)*
-  URL to external documentation. rosdoc will not run a documentation tool (e.g. Doxygen) on this package.
- ``config="rosdoc.yaml"`` *(optional)*
-  Name of rosdoc configuration file.
-
-Examples
-''''''''
-
-External API documentation::
-
-    <rosdoc external="http://external/documentation.html"/>
-
-
-Using an external config file::
-
-    <rosdoc config="rosdoc.yaml"/>
-
-
-Attributes
-''''''''''
-
- ``excludes="build"`` *(optional)*
-   Path to exclude (see Doxygen documentation on `EXCLUDES`).
- ``file-patterns="*.c *.cpp *.dox"`` *(optional)*
-   Patterns for files to include (see Doxygen documentation on `FILE_PATTERNS`).
-
-.. _roslang_tag:
-
-export: <roslang>
------------------
-
-This tag should only be used by ROS client libraries, such as `roscpp <http://ros.org/wiki/roscpp>`_ and `rospy <http://ros.org/wiki/rospy>`_.
-
-The ``<roslang>`` export specifies a CMake file that should be exported to the `rosbuild <http://ros.org/wiki/rosbuild>`_ system. The CMake rules will be exported to *every* ROS package, which is necessary for functionality such as message and service generation.
-
-Attributes
-''''''''''
-
- ``cmake="${prefix}/cmake/file.cmake"``
-   CMake file.
-
-Example
-'''''''
-
-::
-
-
-
-    <roslang cmake="${prefix}/cmake/rospy.cmake"/>
-
-
-.. _roswtf_tag:
-
-export: <roswtf>
-----------------
-
-Declare a `roswtf <http://ros.org/wiki/roswtf>`_ plugin.
-
-Attributes
-''''''''''
-
- ``plugin="python.module"``
-   Python modulename to export as a [[roswtf]] plugin.
-
-Example
-'''''''
-
-::
-
-    <roswtf plugin="tf.tfwtf" />
-
-
-.. _manifest_review_tag:
-
-<review>
---------
-
-Status of the package in the review process (Design, API, and Code review). See `QAProcess <http://ros.org/wiki/QAProcess>`_.  Packages that have not yet been reviewed should be marked as "experimental".
-
-Example
-'''''''
-
-::
-
-    <review status="experimental" notes="reviewed on 3/14/09" />
-
-
-Attributes
-''''''''''
-
- ``status="status"``
-   See `list of valid review statuses <http://ros.org/wiki/Review Status>`_.
- ``notes="notes on review status"`` *(optional)*
-   Notes on review status, such as date of last review.
-
diff --git a/doc/manifests.rst b/doc/manifests.rst
deleted file mode 100644
index b29e04f..0000000
--- a/doc/manifests.rst
+++ /dev/null
@@ -1,131 +0,0 @@
-.. _manifest_file:
-
-Package manifest files
-======================
-
-A ROS *manifest* (``manifest.xml``) is a minimal specification about a
-ROS package and supports a wide variety of tools, from compilation to
-documentation to distribution. In addition to providing a minimal
-specification of metadata about your package, an important role of
-manifests is to declare dependencies in a language-neutral and
-operating-system-neutral manner. The presence of a ``manifest.xml``
-file in a directory is significant: any directory within your ROS
-package path that contains a ``manifest.xml`` file is considered to be
-a package (NOTE: packages cannot contain packages).
-
-The bare minimum manifest file is much like a README file, stating who
-wrote your package and what license it is under. The license is
-important as packages are means by which ROS code is distributed. The
-most common manifest files also include :ref:`\<depend\> <depend_tag>`
-and :ref:`\<export\> <export_tag>` tags, which help manage the
-installation and use of a package.
-
-The :ref:`\<depend\> <depend_tag>` tag points to another ROS package
-that must be installed. It can have a variety of meanings depending on
-the contents of the package is it pointing to. For example, for rospy
-code, a depend declares that the other package should be added to the
-:envvar:`PYTHONPATH`. For roslaunch files, a depend may indicate that
-this package includes roslaunch files from the other package.
-
-The :ref:`\<export\> <export_tag>` tag describes language-specific
-build and runtime flags that should be used by any package that
-depends on your package. For a package containing roscpp code, an
-export tag may declare header files and libraries that should be
-picked by any package that depends on it.
-
-
-.. seealso::
-
-   :ref:`rospack <rospack>`
-
-      ``rospack`` is the main command-line tool for retrieving information about manifests.
-
-Uses
-----
-
-*Indexing*
-
-    If a ``manifest.xml`` is present, the directory is assumed to be a ROS package, and the name of the package is the same as the name of the directory.  Additionally, properties like the author, license, and description provide important metadata for an indexer.
-
-*Documentation*
-
-    As part of the DRY (Don't Repeat Yourself) principle, manifest information is oftena automatically imported into documentation, such as header information on ROS.org wiki pages, as well as in Doxygen documentation.
-
-*Compilation*
-
-    The ``<depend>`` tags of manifests are used to order ROS packages for compilation.  Also, the ``<export>`` section of manifests is frequently used by libraries like roscpp and rosjava to export properties to their respective build systems, as well as by rospy to configure :envvar:`PYTHONPATH`.  
-
-*System dependency specification*
-
-    In addition to declaring dependencies between ROS packages, manifests can declare system dependencies (e.g. on the Boost library).  This information is used to release and deploy code to other machines.
-
-
-XML Reference
--------------
-
-Please see the :ref:`manifest.xml tags reference <manifest_xml>`.
-
-Example
--------
-
-::
-
-    <package>
-      <description brief="ROS Python client library">
-    
-        <p>
-        rospy is a pure Python client library for ROS. The rospy client
-        API enables Python programmers to quickly interface with
-        ROS <a href="http://ros.org/wiki/Topics">Topics</a>, <a href="http://ros.org/wiki/Services">Services</a>,
-        and <a href="http://ros.org/wiki/Parameter Server">Parameters</a>. The
-        design of rospy favors implementation speed (i.e. developer time)
-        over runtime performance so that algorithms can be quickly
-        prototyped and tested within ROS. It is also ideal for
-        non-critical-path code, such as configuration and initialization
-        code. Many of the ROS tools are written in rospy to take advantage
-        of the type introspection capabilities.
-        </p>
-        <p>
-        Many of the ROS tools, such
-        as <a href="http://ros.org/wiki/rostopic">rostopic</a>
-        and <a href="http://ros.org/wiki/rosservice">rosservice</a>, are
-        built on top of rospy.
-        </p>
-    
-      </description>
-      <author>Ken Conley/kwc@willowgarage.com</author>
-      <license>BSD</license>
-      <review status="Doc reviewed" notes="2010/01/18"/>
-      <url>http://ros.org/wiki/rospy</url>
-      <depend package="roslib"/>
-      <depend package="rosgraph_msgs"/>
-      <depend package="std_msgs"/>
-      <depend package="roslang"/>
-      <export>
-        <rosdoc config="rosdoc.yaml"/>
-      </export>
-    </package>
-    
-
-Types of Dependencies
----------------------
-
-The most common type of dependency that is expressed by a manifest is a dependency on another ROS package, which is expressed by the :ref:`\<depend\> <depend_tag>` tag. As explained earlier, the exact meaning of this dependency depends on the code involved and may either mean a compile-time dependency or runtime dependency.
-
-A manifest can also declare dependencies on thirdparty software provided by the operating system, which is expressed by the :ref:`\<rosdep\> <rosdep_tag>`. For example, your package may need boost::
-
-
-    <rosdep name="boost" />
-
-
-By declaring this, users can now use the `rosdep <http://ros.org/wiki/rosdep>`_ tool to install boost. ``rosdep`` will examine their operating system, find the appropriate package manager and package name, and install it.
-
-Tools
------
-
-:ref:`rospack <rospack>` parses and retrieves information from ``manifest.xml`` files. For example, ``rospack depends package-name`` will tell you all of the dependencies of ``package-name`` (use ``depends1`` to retrieve the direct dependencies).
-
-Library Support
----------------
-
-See the :class:`rospkg.RosPack` and :class:`rospkg.RosStack` for Python APIs to retrieve and parse manifest files.
diff --git a/doc/os_detect.rst b/doc/os_detect.rst
deleted file mode 100644
index cc5e4b5..0000000
--- a/doc/os_detect.rst
+++ /dev/null
@@ -1,177 +0,0 @@
-OS detection
-============
-
-.. module:: rospkg.os_detect
-    :synopsis: OS detection for ROS tools.
-
-OS detection is a critical capability of many ROS tools in the ROS
-build toolchain.  The :mod:`rospkg.os_detect` module provides and
-extendable library for detecting various operating systems.  It is
-focused on detecting operating systems used with ROS.
-
-You can test this library on your platform from the command line::
-
-    $ python -m rospkg.os_detect
-    OS Name:     ubuntu
-    OS Version:	 10.04
-    OS Codename: lucid
-
-Currently supported OSes:
-
-- Arch Linux
-- Cygwin
-- Debian
-- Fedora
-- FreeBSD
-- Gentoo
-- Mint
-- OS X
-- Pop! OS
-- Red Hat Linux
-- Slackware 
-- Ubuntu
-
-
-.. autoclass:: OsNotDetected
-
-.. class:: OsDetect(os_list)
-
-   Detects the current operating system.  This class will iterate
-   over registered classes to lookup the active OS and version.  The
-   list of detectors can be overridden in the constructor; otherwise
-   it will default to :class:`OsDetector` classes provided by this
-   library.
-
-
-    .. attribute:: default_os_list
-
-        List of currently registered detectors.  Must not be modified directly.
-    
-    .. staticmethod:: register_default(os_name, os_detector)
-
-        Register detector to be used with all future instances of
-        :class:`OsDetect`.  The new detector will have precedence over
-        any previously registered detectors associated with *os_name*.
-        
-    .. method:: detect_os() -> tuple
-
-        :returns: (os_name, os_version, os_codename), ``(str, str, str)``
-        :raises: :exc:`OsNotDetected` if OS could not be detected
-
-    .. method:: get_detector([name]) -> OsDetector
-
-        Get detector used for specified OS name, or the detector for this OS if name is ``None``.
-
-        :raises: :exc:`KeyError`
-        
-    .. method:: add_detector(name, detector)
-
-        Add detector to list of detectors used by this instance.
-        *detector* will override any previous detectors associated
-        with *name*.
-
-        :param name: OS name that detector matches
-        :param detector: :class:`OsDetector` instance
-
-    .. method:: get_os() -> OsDetector
-
-        Get :class:`OsDetector` for this operating system.
-        
-        :raises: :exc:`OsNotDetected` if OS could not be detected
-
-    .. method:: get_name() -> str
-
-        :returns: Name of current operating system.  See ``OS_*``
-          definitions in this module for possible values.
-        :raises: :exc:`OsNotDetected` if OS could not be detected
-
-    .. method:: get_version() -> str
-
-        :returns: Version of current operating system
-        :raises: :exc:`OsNotDetected` if OS could not be detected
-
-    .. method:: get_codename() -> str
-
-        :returns: Codename of current operating system if available,
-          or empty string if OS does not provide codename.
-        :raises: :exc:`OsNotDetected` if OS could not be detected
-
-
-
-.. autoclass:: OsDetector
-   :members:
-
-
-
-OS name definitions
--------------------
-
-.. data:: OS_ARCH
-
-   Name used for Arch Linux OS.
-
-.. data:: OS_CYGWIN
-
-   Name used for Cygwin OS.
-
-.. data:: OS_DEBIAN
-
-   Name used for Debian OS.
-
-.. data:: OS_FREEBSD
-
-   Name used for FreeBSD OS.
-
-.. data:: OS_GENTOO
-
-   Name used for Gentoo.
-
-.. data:: OS_MINT
-
-   Name used for Mint OS.
-
-.. data:: OS_OPENSUSE
-
-   Name used for OpenSUSE OS.
-
-.. data:: OS_OSX
-
-   Name used for OS X.
-
-.. data:: OS_POP
-
-   Name used for Pop! OS.
-
-.. data:: OS_RHEL
-
-   Name used for Red Hat Enterprise Linux.
-
-.. data:: OS_SLACKWARE
-
-   Name used for Slackware.
-
-.. data:: OS_UBUNTU
-
-   Name used for Ubuntu OS.
-
-
-Linux helper methods
---------------------
-
-.. method:: lsb_get_os() -> str
-
-    Linux: wrapper around lsb_release to get the current OS
-    
-.. method:: lsb_get_codename() -> str
-
-    Linux: wrapper around lsb_release to get the current OS codename
-    
-.. method:: lsb_get_version() -> str
-
-    Linux: wrapper around lsb_release to get the current OS version
-
-.. method:: uname_get_machine() -> str
-
-    Linux: wrapper around uname to determine if OS is 64-bit
-
-
diff --git a/doc/overview.rst b/doc/overview.rst
deleted file mode 100644
index b34e331..0000000
--- a/doc/overview.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-Overview
-========
-
-There are two main concepts in the ROS packaging system: *packages* and *stacks*.  *Packages* are the main unit for organizing and building software in ROS. A package may contain runtime processes (e.g. ROS nodes), a library, datasets, configuration files, or anything else that is usefully organized together. *Stacks* are collections of packages that provide aggregate functionality, such as a "navigation stack." Stacks are also how ROS software is released and have associated version numbers. 
-
-So, packages are the smallest unit in which ROS software is *built*; stacks are the smallest unit in which ROS software is *released*.
-
-Packages and stacks each have associated manifests: ``manifest.xml`` for packages and ``stack.xml`` for stacks.
-
-You can continue reading the sections below to find out more about these concepts and files.
-
-.. toctree::
-   :maxdepth: 2
-
-   packages
-   stacks
-   environment
-   manifests
-   stack_manifests
diff --git a/doc/packages.rst b/doc/packages.rst
deleted file mode 100644
index f0d2169..0000000
--- a/doc/packages.rst
+++ /dev/null
@@ -1,70 +0,0 @@
-.. _packages:
-
-ROS packages
-============
-
-Software in ROS is organized in *packages*. A package might contain a
-library, a dataset, configuration files or anything else that
-logically constitutes a useful module. The goal of these packages it
-to provide this functionality in an easy-to-consume manner so that
-software can be easily reused. In general, ROS packages follow a
-"Goldilocks" principle: *enough functionality to be useful, but not too
-much that the package is heavyweight and difficult to use from other
-software*.
-
-Packages are easy to create by hand or with tools like `roscreate-pkg
-<http://www.ros.org/wiki/roscreate>`_. A ROS package is simply a
-directory descended from :envvar:`ROS_ROOT` or
-:envvar:`ROS_PACKAGE_PATH` that has a :ref:`manifest.xml
-<manifest_file>` file in it. Packages may be organized together into
-ROS [[Stacks|stacks]].
-
-Please see the :ref:`package manifest files <manifest_file>` section
-for documentation on how to read and write ``manifest.xml`` files.
-
-Common Files and Directories
-----------------------------
-
-ROS packages tend to follow a common structure. Here are some of the directories and files you may notice.
-
- - ``bin/``: compiled binaries
- - ``include/package_name``: C++ include headers (make sure to export in the :ref:`package manifest <cpp_tag>`)
- - ``src/package_name/``: Source files, especially Python source that are exported to other packages.
- - ``scripts/``: executable scripts
- - ``CMakeLists.txt``: CMake build file (see `CMakeLists <http://ros.org/wiki/CMakeLists>`_)
- - ``manifest.xml``: :ref:`Package manifest <manifest_file>`
-
-For C++ and Python developers, we strongly recommend that the
-``package_name`` match namespaces/module names in your code so that
-it's easy to locate what package provides your code.
-
-Packages that are used with the ROS communication system may also have:
-
- - ``msg/``: `ROS message (msg) types <http://www.ros.org/wiki/msg>`_
- - ``srv/``: `ROS service (srv) types <http://www.ros.org/wiki/srv>`_
-
-Command-line Tools
-------------------
-
-Packages are a very central concept to how files in ROS are organized,
-so there are quite a few tools in ROS that help you manage them. This
-includes:
-
- * :ref:`rospack`: find and retrieve information about packages. The ROS build system also uses ``rospack`` to locate a package and build its dependencies.
- * `roscreate-pkg <http://www.ros.org/wiki/roscreate>`_: create a new package.
- * `rosmake <http://www.ros.org/wiki/rosmake>`_: build a package and its dependencies.
- * `rosdep <http://www.ros.org/wiki/rosdep>`_: install system dependencies of a package.
-
-There are also extensions to common Unix shells that provide
-additional functionality to help you navigate and use packages. The
-most commonly used of these is `rosbash
-<http://ros.org/wiki/rosbash>`_, which provides ROS-variants of common
-Unix shell commands for Bash and other shells. The most commonly used
-of these is ``roscd``, which performs a ``cd`` to the directory of a
-package or stack, e.g.
-
-::
-
-    roscd roscpp_tutorials
-
-
diff --git a/doc/python_api.rst b/doc/python_api.rst
deleted file mode 100644
index 7fa954f..0000000
--- a/doc/python_api.rst
+++ /dev/null
@@ -1,124 +0,0 @@
-rospkg documentation
-====================
-
-.. module:: rospkg
-.. moduleauthor:: Ken Conley <kwc@willowgarage.com>
-
-The :mod:`rospkg` Python module provides basic utilities for querying
-information about ROS packages, stacks, and distributions.  There are
-several basic APIs: :doc:`ROS environment <environment>`,
-:class:`RosPack`/:class:`RosStack`, :doc:`OS detection
-<os_detect>`, and :doc:`distributions <rospkg_distro>`. 
-
-The environment APIs enable access to environment settings that define
-the ROS package/stack filesystem configuration.  The :class:`RosPack`
-and :class:`RosStack` APIs are similar to the ``rospack`` and
-``rosstack`` command-line tools and provide information about
-dependency, location, and other package/stack metadata.  The
-:class:`Manifest` class provides access to a specific package/stack's
-manifest information. NOTE: the :class:`Manifest` class API is still
-volatile.  Where possible, use the relevant
-:class:`RosPack`/:class:`RosStack` APIs to access manifest-related
-information instead (e.g. dependency relationships).
-
-The :mod:`rospkg.distro` sub-module provides access to ROS
-distribution files, which describe collections of ROS stacks releases.
-This API is module is still unstable and mainly supports internal
-tools.
-
-.. toctree::
-   :maxdepth: 2
-
-   rospkg_packages
-   rospkg_stacks
-   rospkg_environment
-   os_detect
-   rospkg_distro
-   
-Example::
-
-    import rospkg
-
-    ros_root = rospkg.get_ros_root()
-    
-    r = rospkg.RosPack()
-    depends = r.get_depends('roscpp')
-    path = r.get_path('rospy')
-    
-
-Common API
-----------
-
-.. exception:: ResourceNotFound
-
-   Requested resource (e.g. package/stack) could not be found.
-
-.. attribute:: __version__
-
-   Version of this module.
-
-Installation
-------------
-
-Recommended automated installation
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-``rospkg`` is already a dependency of many core packages of ROS, so it should get automatically installed when you follow standard installation steps.
-
-Automated installation is realized by adding a dependency like this:
-
-In ``package.xml`` `format 1 <http://www.ros.org/reps/rep-0127.html>`_:
-
-::
-
-    <run_depend>python-rospkg</run_depend>
-
-In ``package.xml`` `format 2 <http://www.ros.org/reps/rep-0140.html>`_, `format 3 <http://www.ros.org/reps/rep-0149.html#exec-depend-multiple>`_:
-
-::
-
-    <exec_depend>python-rospkg</exec_depend>
-
-Manual installation
-~~~~~~~~~~~~~~~~~~~
-
-rospkg is available on pypi and can be installed via ``pip``
-::
-
-    pip install -U rospkg
-
-or ``easy_install``:
-
-::
-
-    easy_install -U rospkg
-
-For debian-based OSes it's available via apt.
-::
-
-    apt-get install python-rospkg
-
-Using rospkg
-------------
-
-The :mod:`rospkg` module is meant to be used as a normal Python
-module.  After it has been installed, you can ``import`` it normally
-and do not need to declare as a ROS package dependency.
-
-
-Advanced: rospkg developers/contributors
-----------------------------------------
-
-.. toctree::
-   :maxdepth: 2
-
-   developers_guide
-
-
-Indices and tables
-------------------
-
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
-
diff --git a/doc/ros.png b/doc/ros.png
deleted file mode 100644
index dca8000..0000000
Binary files a/doc/ros.png and /dev/null differ
diff --git a/doc/rospack.rst b/doc/rospack.rst
deleted file mode 100644
index 60cf97b..0000000
--- a/doc/rospack.rst
+++ /dev/null
@@ -1,456 +0,0 @@
-.. _rospack:
-
-rospack
-^^^^^^^
-
-rospack overview
-================
-
-*rospack* is the ROS package management tool. rospack is part
-``dpkg``, part ``pkg-config``.  
-
-The main function of ``rospack`` is to crawl through the packages in
-:envvar:`ROS_ROOT` and :envvar:`ROS_PACKAGE_PATH`, read and parse the
-:ref:`manifest.xml <manifest_file>` for each package, and assemble a
-complete dependency tree for all packages.
-
-
-Using this tree, ``rospack`` can answer a number of queries about
-packages and their dependencies.  Common queries include:
-
- - :ref:`rospack find <rospack_find>` : return the absolute path to a package
- - :ref:`rospack depends <rospack_depends>` : return a list of all of a package's dependencies
- - :ref:`rospack depends-on <rospack_depends-on>` : return a list of packages that depend on the given package
- - :ref:`rospack export <rospack_export>` : return flags necessary for building and linking against a package
-
-rospack is intended to be cross-platform.
-
-.. seealso::
-
-   :ref:`Package manifests <manifest_file>`
-      Documentation on ``manifest.xml`` files, which ``rospack`` crawls and extracts information from.
-
-   `rosbuild <http://ros.org/wiki/rosbuild>`_
-      Documentation for the rosbuild system, which makes heavy use of the rospack commands
-
-   `rosmake <http://ros.org/wiki/rosmake>`_
-      Documentation for the rosmake command, which makes heavy use of the rospack commands
-
-
-
-.. contents:: Table of Contents
-   :depth: 2
-
-
-Crawling algorithm
-------------------
-
-``rospack`` crawls the directory specified by the environment variable
-:envvar:`ROS_ROOT`.  It then crawls the colon-separated directories in
-:envvar:`ROS_PACKAGE_PATH`, in the ordered they are listd, determining
-a directory to be package if it contains a file called
-:ref:`manifest.xml <manifest_file>`.
-
-If such a file is found, the directory containing it is considered to
-be a ROS package, with the package name equal to the directory name.
-The crawl does not descend further once a manifest is found (i.e.
-packages cannot be nested inside one another).
-
-If a ``manifest.xml`` file is not found in a given directory, each
-subdirectory is searched.  This subdirectory search is prevented if a
-file called ``rospack_nosubdirs`` is found.  The directory itself is
-still searched for a manifest, but its subdirectories are not crawled.
-
-If multiple packages by the same name exist within the search path, the
-first one found wins.  It is strongly recommended that you keep packages by
-the same name in separate trees, each having its own element within
-:envvar:`ROS_PACKAGE_PATH`.  That way, you can deterministically control the search
-order by the way that you specify :envvar:`ROS_PACKAGE_PATH`.  The search order
-within a given element of :envvar:`ROS_PACKAGE_PATH` can be unpredictably affected by
-the details of how files are laid out on disk.
-
-Efficiency considerations
-'''''''''''''''''''''''''
-
-rospack re-parses the ``manifest.xml`` files and rebuilds the
-dependency tree on each execution.  However, it maintains a cache of
-package directories in ``ROS_ROOT/.rospack_cache``.  This cache is
-updated whenever there is a cache miss, or when the cache is 60
-seconds old.  You can change this timeout by setting the environment
-variable :envvar:`ROS_CACHE_TIMEOUT`, in seconds.  Set it to 0.0 to force a
-cache rebuild on every invocation of rospack.
-
-rospack's performance can be adversely affected by the presence of
-very broad and/or deep directory structures that don't contain
-manifest files.  If such directories are in rospack's search path, it
-can spend a lot of time crawling them only to discover that there are
-no packages to be found.  You can prevent this latency by creating a
-``rospack_nosubdirs`` file in such directories. If rospack seems to be
-running annoyingly slowly, you can use the :ref:`profile command <cmd_rospack_profile>`, which will print out the 20 slowest trees to crawl
-(or use ``profile --length=N`` to print the slowest N trees).
-
-rospack_nosubdirs
------------------
-
-You can prevent rospack from descending into a directory by simply
-adding an empty ``rospack_nosubdirs`` file.  This is useful when you
-want to block off part of your package tree, either for performance
-reasons, or to hide another version of your code. 
-
-We recommend creating a ``rospack_nosubdirs`` file in packages that
-checkout code from other code repositories, as those often create big
-directory trees that don't get cleaned up if a package is moved or
-deleted.
-
-NOTE: the ``rospack_nosubdirs`` directive only affects the ``rospack`` tool.
-It is not observed by tools like ``roslaunch`` or ``rosrun``.
-
-
-rospack usage
-=============
-
-The ``rospack`` tool implements many commands that print information
-about ROS packages. All of these commands print their results to
-stdout.  Any errors or warnings go to stderr.  This separation ensures
-that error output does not confuse programs that execute ``rospack``
-as a subprocess to, for example, recover build flags for a package.
-
-::
-
-    USAGE: rospack <command> [options] [package]
-      Allowed commands:
-        help [subcommand]
-        cflags-only-I     [--deps-only] [package]
-        cflags-only-other [--deps-only] [package]
-        depends           [package] (alias: deps)
-        depends-indent    [package] (alias: deps-indent)
-        depends-manifests [package] (alias: deps-manifests)
-        depends-msgsrv    [package] (alias: deps-msgsrv)
-        depends-on        [package]
-        depends-on1       [package]
-        depends-why --target=<target> [package] (alias: deps-why)
-        depends1          [package] (alias: deps1)
-        export [--deps-only] --lang=<lang> --attrib=<attrib> [package]
-        find [package]
-        langs
-        libs-only-L     [--deps-only] [package]
-        libs-only-l     [--deps-only] [package]
-        libs-only-other [--deps-only] [package]
-        list
-        list-duplicates
-        list-names
-        plugins --attrib=<attrib> [--top=<toppkg>] [package]
-        profile [--length=<length>] [--zombie-only]
-        rosdep  [package] (alias: rosdeps)
-        rosdep0 [package] (alias: rosdeps0)
-        vcs  [package]
-        vcs0 [package]
-      Extra options:
-        -q     Quiets error reports.
-
-     If [package] is omitted, the current working directory
-     is used (if it contains a manifest.xml).
-
-.. program:: rospack
-
-General options
----------------
-
-.. cmdoption:: -q
-
-  The `-q` option can be given after any subcommand.  It will suppress most error messages that usually go to stderr.  The return code will still be non-zero, to indicate the error.  E.g., to search for a package, but suppress the error message if it's not found::
-
-    $ rospack find -q foo
-    $ echo $?
-    255
-
-NOTE: for all commands, if ``[package]`` is omitted, the current
-working directory is used.
-
-
-.. program:: rospack help
-
-rospack help [subcommand]
--------------------------
-
-Print help message.  Since 2.0.9, you can give a subcommand as an argument
-to get more specific help.
-
-.. _rospack_find:
-.. program:: rospack find
-
-rospack find [package]
-----------------------
-
-Print absolute path to the package, empty string if package is not found. This is used within many tools, including rosbuild.
-
-Example::
-
-    $ rospack find roscpp
-    /Users/homer/code/ros/core/roscpp
-  
-
-.. program:: rospack list
-
-rospack list
-------------
-
-Print newline-separated list, ``<package-name> <package-dir>``, for all packages. 
-
-Example::
-
-    $ rospack list | grep visualization
-    wxpropgrid /home/kwc/ros-pkg/visualization/wxpropgrid
-    rviz /home/kwc/ros-pkg/visualization/rviz
-    visualization_msgs /home/kwc/ros-pkg/visualization_common/visualization_msgs
-    ogre /home/kwc/ros-pkg/visualization_common/ogre
-    ogre_tools /home/kwc/ros-pkg/visualization_common/ogre_tools
- 
-
-.. program:: rospack list-names
-
-rospack list-names
-------------------
-
-Print newline-separated list of packages names for all packages.
-
-.. program:: rospack list-duplicates
-
-rospack list-duplicates
------------------------
-
-Print newline-separated list of names of packages that appear more than
-once during the search.
-
-.. program:: rospack langs
-
-rospack langs
--------------
-
-Print space-separated list of available language-specific client
-libraries. The client library list is calculated as the list of
-packages that depend directly on the placeholder package "roslang",
-minus any packages that are listed in the environment variable
-:envvar:`ROS_LANG_DISABLE`.
-
-
-Example::
-
-    $ rospack langs
-    roscpp rospy
-
-
-.. _rospack_depends:
-
-.. program:: rospack depends
-
-rospack depends [package]
--------------------------
-
-Print newline-separated, ordered list of all dependencies of the package. This is used within ``rosmake``. 
-
-Example::
-
-    $ rospack depends map_server
-    gtest
-    genmsg_cpp
-    roslib
-    xmlrpc++
-    rosthread
-    roscpp
-    std_msgs
-    std_srvs
-    sdl
-    ijg_libjpeg
-    sdl_image
-
-
-.. program:: rospack depends1
-
-rospack depends1 [package]
---------------------------
-
-Print newline-separated, ordered list of immediate dependencies of the package.
-   
-.. program:: rospack depends-manifests
-
-rospack depends-manifests [package]
------------------------------------
-
-Print space-separated, ordered list of manifest files for all dependencies of the package. This is used by rosbuild to create explicit dependencies from source files to other packages' manifests.
-
-.. program:: rospack depends-indent
-
-rospack depends-indent [package]
---------------------------------
-
-Print newline-separated list of the entire dependency chain for the package, indented to indicate where in the chain each dependency arises.  This may contain duplicates.
-
-.. program:: rospack depends-why
-
-
-rospack depends-why --target=<target> [package]
------------------------------------------------
-
-Print newline-separated presentation of all dependency chains from the package to ``<target>``.
-
-
-.. _rospack_depends-on:
-.. program:: rospack depends-on
-
-rospack depends-on [package]
-----------------------------
-
-Print newline-separated list of all packages that depend on the package.
-
-.. program:: rospack depends-on1
-
-rospack depends-on1 [package]
------------------------------
-
-Print newline-separated list of all packages that directly depend on the package. 
-
-Example::
-
-    $ rospack depends-on1 roslang
-    roscpp
-    rospy
-    rosoct
-    roslisp
-
-.. program:: rospack rosdep
-
-rospack rosdep [package]
-------------------------
-
-Print newline-separated list of all `rosdep` tags from the manifest.xml
-of the package and all of its dependencies. 
-
-.. program:: rospack rosdep0
-
-rospack rosdep0 [package]
--------------------------
-
-Print newline-separated list of all `rosdep` tags from the manifest.xml
-of just the package itself.
-
-.. program:: rospack vcs
-
-rospack vcs [package]
----------------------
-
-Print newline-separated list of all `versioncontrol` tags from the
-manifest.xml of the package and all of its dependencies. This is useful for
-pre-caching SSL certificates for https SVN servers that will be contacted
-during the build, to avoid having to manually accept the certificates
-during the build.
-
-.. program:: rospack vcs0
-
-rospack vcs0 [package]
-----------------------
-
-Print newline-separated list of all `versioncontrol` tags from the
-manifest.xml of just the package itself. This is useful for
-pre-caching SSL certificates for https SVN servers that will be contacted
-during the build, to avoid having to manually accept the certificates
-during the build.
- 
-.. _rospack_export:
-.. program:: rospack export
-
-rospack export --lang=LANGUAGE --attrib=ATTRIBUTE [package]
------------------------------------------------------------
-
-Print space-separated list of [export][LANGUAGE ATTRIBUTE=""/][/export] values from the manifest of the package and its dependencies.  
-
-This is useful for getting language-specific build flags, e.g,. export/cpp/cflags.
-
-.. cmdoption:: --deps-only
-
- If `--deps-only` is provided, then the package itself is excluded.  
-
- 
-.. program:: rospack cflag-only-I, cflags-only-other
-
-rospack cflag-only-I, cflags-only-other
----------------------------------------
-
-NOTE: the ``cflags-only-*`` commands are simply variants of the :ref:`rospack export <rospack_export>` command with additional processing.
-
-.. cmdoption:: cflags-only-I [package]
-
- Print space-separated list of export/cpp/cflags that start with ``-I``.  This is used by rosbuild to assemble include paths for compiling.
-
-.. cmdoption:: cflags-only-other [package]
-
- Print space-separated list of export/cpp/cflags that don't start with ``-I``. This is used by rosbuild to assemble non-include compile flags.
-
-.. cmdoption:: --deps-only
-
- If :option:`--deps-only` is provided, then the package itself is excluded.  This can be used with all ``cflags-only-*`` variants.
-
-rospack libs-only-L, libs-only-l, libs-only-other
--------------------------------------------------
-
-.. program:: rospack libs-only-L, libs-only-l, libs-only-other
-
-NOTE: the ``libs-only-*`` commands are simply variants of the :ref:`rospack export <rospack_export>` command with additional processing.
-
-.. cmdoption:: libs-only-L [package]
-
- Print space-separated list of export/cpp/libs that start with ``-L``.  If --deps-only is provided, then the package itself is excluded. This is used by rosbuild to assemble library search paths for linking.
-
-.. cmdoption:: libs-only-l [package]
-
- Print space-separated list of export/cpp/libs that start with ``-l``.  If --deps-only is provided, then the package itself is excluded. This is used by rosbuild to assemble libraries for linking.
-
-.. cmdoption:: libs-only-other [package]
-
- Print space-separated list of export/cpp/libs that don't start with ``-l`` or ``-L``. Used by rosbuild to assemble non-library link flags.
-
-.. cmdoption:: --deps-only
-
- If :option:`--deps-only` is provided, then the package itself is excluded. This can be used with all ``libs-only-*`` variants.
- 
-
-.. _cmd_rospack_profile:
-
-.. program:: rospack profile
-
-rospack profile
----------------
-
-.. cmdoption:: --length=N
-
- Force a full crawl of package directories (i.e., don't use cache, and report to console on the N (default 20) directories that took the longest time to crawl.  Useful for finding stray directories that are adversely affecting ``rospack``'s performance.  
-
-.. cmdoption:: --zombie-only
-
- Only print directories that do not have any manifests.  In this case, the output can be fed directly into ``rm`` to clean up your tree, e.g.::
-
-     rospack profile --zombie-only | xargs rm -rf
-
-
- NOTE: be sure to check the output before deleting any files!
-
-.. program:: rospack plugins
-
-rospack plugins --attrib=<attrib> [package]
--------------------------------------------
-
-Examine packages that depend directly on the given package, extracting from each the name of the package followed by the value of an exported attribute with the name ``<attrib>``.  All matching exports are returned, newline-separated, e.g., if the manifest for a package "foo," located at ``/tmp/foo``, contains::
-
-      <depend package="rosbuild"/>
-      <export>
-        <rosbuild cmake="${prefix}/cmake/foo.cmake/>
-      </export>
-      
-then ``rospack plugins --attrib=cmake rosbuild`` will return (at least)::
-
-      foo /tmp/foo/cmake/foo.cmake
-
-
-.. cmdoption:: --top=<toppkg>
-
-  If :option:`--top` is given, then in addition to depending directly on the given package, to be scanned for exports, a package must also be a dependency of ``<toppkg>``, or be ``<toppkg>`` itself.
diff --git a/doc/rospkg_distro.rst b/doc/rospkg_distro.rst
deleted file mode 100644
index 60c94b8..0000000
--- a/doc/rospkg_distro.rst
+++ /dev/null
@@ -1,190 +0,0 @@
-rospkg.distro Python library
-============================
-
-.. currentmodule:: rospkg.distro
-
-This submodule provides the :class:`Distro` class, which provides an
-API for processing :ref:`rosdistro files <distro_format>`.
-
-.. contents:: Table of Contents
-   :depth: 2
-
-
-Data model
-----------
-
-The top level representation is a :class:`Distro` instance, which contains :class:`Variant` and :class:`DistroStack` instances.  :class:`DistroStack` instances have a :class:`VcsConfig` (:class:`SvnConfig`, :class:`GitConfig`, :class:`BzrConfig`, :class:`HgConfig`), which represents the source control information for the stack.::
-
-    Distro
-      - Variant
-      - DistroStack
-         - VcsConfig 
-    
-
-Exceptions
-----------
-
-.. autoclass:: InvalidDistro
-
-
-Utility functions
------------------
-
-.. method:: distro_uri(distro_name)
-
-    Get distro URI of main ROS distribution files.
-    
-    :param distro_name: name of distro, e.g. 'diamondback'
-    :returns: the SVN/HTTP URL of the specified distro.  This function should only be used
-      with the main distros.
-
-.. method:: load_distro(source_uri) -> Distro
-
-    Load :class:`Distro` instance from *source_uri*.
-
-    Example::
-
-        from rospkg.distro import load_distro, distro_uri
-        d = load_distro(distro_uri('electric'))
-
-    :param source_uri: source URI of distro file, or path to distro
-      file.  Filename has precedence in resolution.
-
-    :raises: :exc:`InvalidDistro` if distro file is invalid
-    :raises: :exc:`rospkg.ResourceNotFound` if file at *source_uri* is not found
-
-
-.. method:: expand_rule(rule, stack_name, stack_ver, release_name) -> str
-
-    Replace variables in VCS config rule value with specified values
-
-.. method:: distro_to_rosinstall(distro, branch, [variant_name=None, [implicit=True, [released_only=True, [anonymous=True]]]])
-
-    :param branch: branch to convert for
-    :param variant_name: if not None, only include stacks in the specified variant.
-    :param implicit: if variant_name is provided, include full (recursive) dependencies of variant, default True
-    :param released_only: only included released stacks, default True.
-    :param anonymous: create for anonymous access rules
-
-    :raises: :exc:`KeyError` if branch is invalid or if distro is mis-configured
-
-.. method:: current_distro_codename([env=None]) -> str
-
-    Get the currently active ROS distribution codename, e.g. 'fuerte'
-
-    :param env: override os.environ, ``dict``
-
-
-Model
------
-
-.. class:: DistroStack(stack_name, stack_version, release_name, rules)
-
-    Stores information about a stack release
-
-    :param stack_name: Name of stack
-    :param stack_version: Version number of stack.
-    :param release_name: name of distribution release.  Necessary for rule expansion.
-    :param rules: raw ``_rules`` data.  Will be converted into appropriate vcs config instance.
-
-    .. attribute:: name
-
-      Name of stack.
-
-    .. attribute:: version
-
-      Version number of stack.
-
-    .. attribute:: release_name
-
-      Name of distribution release.  Necessary for rule expansion.
-
-    .. attribute:: vcs_config
-
-      :class:`VcsConfig` instance representing the ``_rules`` for this stack.
-
-.. class:: Variant(variant_name, extends, stack_names, stack_names_implicit)
-
-    A variant defines a specific set of stacks ("metapackage", in Debian
-    parlance). For example, "base", "pr2". These variants can extend
-    another variant.
-
-    :param variant_name: name of variant to load from distro file, ``str``
-    :param stack_names_implicit: full list of stacks implicitly included in this variant, ``[str]``
-    :param raw_data: raw rosdistro data for this variant
-
-    .. method:: get_stack_names([implicit=True]) -> [str]
-
-       Get list of all stack names in this variant.
-
-       :param implicit: If ``True``, includes names of stacks in
-         parent variants.  Otherwise, include only stacks explicitly
-         named in this variant. (default ``True``).
-       
-    .. attribute:: stack_names
-    
-       List of all stack names in this variant, including implicit stacks.   
-    
-
-.. class:: Distro(stacks, variants, release_name, version, raw_data)
-
-    Store information in a rosdistro file.
-
-    :param stacks: dictionary mapping stack names to :class:`DistroStack` instances
-    :param variants: dictionary mapping variant names to :class:`Variant` instances
-    :param release_name: name of release, e.g. 'diamondback'
-    :param version: version number of release
-    :param raw_data: raw dictionary representation of a distro
-
-    .. method:: get_stacks([released=False]) -> {str: DistroStack}
-
-        :param released: only included released stacks
-        :returns: dictionary of stack names to :class:`DistroStack` instances in this distro.
-
-
-    .. attribute:: stacks
-
-        Dictionary of stack names mapped to :class:`DistroStack` instances in this distro.
-
-    .. attribute:: released_stacks
-
-        Dictionary of released stack names mapped to :class:`DistroStack` instances in this distro.
-
-    .. attribute:: variants
-
-        Dictionary of variant names mapped to :class:`Variant` instances in this distro.
-
-
-Source control information
---------------------------
-
-.. autoclass:: VcsConfig
-   :members:
-
-
-.. autoclass:: DvcsConfig
-   :members:
-    
-.. autoclass:: GitConfig
-
-.. autoclass:: HgConfig
-
-.. autoclass:: BzrConfig
-
-.. autoclass:: SvnConfig()
-
-.. method:: get_vcs_configs() -> {str: VcsConfig}
-
-    :returns: Dictionary of supported :class:`VcsConfig` instances.
-      Key is the VCS type name, e.g. 'svn'. 
-
-
-.. method:: load_vcs_config(rules, rule_eval) -> VcsConfig
-
-    Factory for creating :class:`VcsConfig` subclass based on
-    rosdistro _rules data.
-
-    :param rules: rosdistro rules data
-    :param rules_eval: Function to apply to rule values, e.g. to
-      convert variables.  ``fn(str)->str``
-    :returns: :class:`VcsConfig` subclass instance with interpreted rules data.
diff --git a/doc/rospkg_environment.rst b/doc/rospkg_environment.rst
deleted file mode 100644
index 32b704e..0000000
--- a/doc/rospkg_environment.rst
+++ /dev/null
@@ -1,104 +0,0 @@
-ROS environment variable access
-===============================
-
-The environment APIs of :mod:`rospkg` provide convenient access to ROS
-package-related environment variables, including methods that provide
-default values when environment variable overrides are not active.
-
-.. data:: rospkg.environment.ROS_PACKAGE_PATH
-
-   Name of :envvar:`ROS_PACKAGE_PATH` environment variable.
-
-.. data:: rospkg.environment.ROS_ROOT
-
-   Name of :envvar:`ROS_ROOT` environment variable.
-
-.. data:: rospkg.environment.ROS_HOME
-
-   Name of :envvar:`ROS_HOME` environment variable.   
-
-.. data:: rospkg.environment.ROS_LOG_DIR
-
-   Name of :envvar:`ROS_LOG_DIR` environment variable.
-
-.. data:: rospkg.environment.ROS_TEST_RESULTS_DIR
-
-   Name of :envvar:`ROS_TEST_RESULTS_DIR` environment variable.
-
-.. data:: rospkg.environment.ROS_ETC_DIR
-
-   Name of :envvar:`ROS_ETC_DIR` environment variable.
-
-.. method:: get_ros_paths([env=None]) -> [str]
-
-   Get an ordered list of ROS paths to search for ROS packages,
-   stacks, and other resources.  This is generally computed from
-   :envvar:`ROS_ROOT` and :envvar:`ROS_PACKAGE_PATH`.
-
-   :param env: override environment dictionary
-
-.. method:: get_ros_root([env=None]) -> str
-
-   Get the current :envvar:`ROS_ROOT`.  NOTE: it is preferable to call
-   :meth:`get_ros_paths()` instead of directly querying ROS
-   environment variable values.
-
-   :param env: override environment dictionary
-
-.. method:: get_ros_package_path([env=None])
-
-   Get the current :envvar:`ROS_PACKAGE_PATH`. NOTE: it is preferable to call
-   :meth:`get_ros_paths()` instead of directly querying ROS
-   environment variable values.
-
-   :param env: (optional) environment override.
-
-.. method:: get_ros_home([env=None]) -> str
-
-   Get directory location of ``.ros`` directory (aka ``ROS_HOME``).
-   possible locations for this. The :envvar:`ROS_HOME` environment
-   variable has priority. If :envvar:`ROS_HOME` is not set,
-   ``$HOME/.ros/log`` is used.
-
-   :param env: override environment dictionary
-   :return: path to use use for log file directory
-    
-.. method:: get_log_dir([env=None]) -> str
-
-   Get directory to use for writing log files. There are multiple
-   possible locations for this. The :envvar:`ROS_LOG_DIR` environment
-   variable has priority. If that is not set, then
-   :envvar:`ROS_HOME`/log is used. If :envvar:`ROS_HOME` is not set,
-   ``$HOME/.ros/log`` is used.
-
-   :param env: override environment dictionary
-   :return: path to use use for log file directory
-
-.. method:: get_test_results_dir(env=None) -> str
-
-   Get directory to use for writing test result files. There are multiple
-   possible locations for this. The :envvar:`ROS_TEST_RESULTS_DIR` environment variable
-   has priority. If that is set, :envvar:`ROS_TEST_RESULTS_DIR` is returned.
-   If :envvar:`ROS_TEST_RESULTS_DIR` is not set, then :envvar:`ROS_HOME`/test_results is used. If
-   :envvar:`ROS_HOME` is not set, ``$HOME/.ros/test_results`` is used.
-
-   :param env: override environment dictionary
-   :return: path to use use for log file directory
-
-.. method:: on_ros_path(p, [env=None]) -> bool
-
-   Check to see if filesystem path is on paths specified in ROS
-   environment (:envvar:`ROS_ROOT`, :envvar:`ROS_PACKAGE_PATH`).
-
-   :param p: path, ``str``
-   :return: True if p is on the ROS path (ROS_ROOT, ROS_PACKAGE_PATH)
-
-.. method:: get_etc_ros_dir([env=None]) -> str
-
-   Get directory location of ``/etc/ros`` directory.  The
-   :envvar:`ROS_ETC_DIR` environment variable has priority. If
-   :envvar:`ROS_ETC_DIR` is not set, ``/etc/ros`` is used.
-
-   :param env: override environment dictionary
-   :return: path to use use for log file directory
-    
diff --git a/doc/rospkg_packages.rst b/doc/rospkg_packages.rst
deleted file mode 100644
index ad92297..0000000
--- a/doc/rospkg_packages.rst
+++ /dev/null
@@ -1,115 +0,0 @@
-ROS package access
-==================
-
-.. currentmodule:: rospkg
-
-The :class:`RosPack` class provides APIs similar to the ``rospack``
-command-line tool distributed with ROS.  Like ``rospack``, its
-provides information about package and stack dependency information,
-filesystem locations, and manifest access. The Python API is more
-efficient than shelling out to ``rospack`` as provides caching and
-other optimizations for repeated querying.
-
-.. data:: MANIFEST_FILE
-
-   Name of package manifest file, i.e. 'manifest.xml'.
-
-.. method:: get_package_name(path) -> str
-
-   Get the name of the ROS package that contains *path*. This is
-   determined by finding the nearest parent ``manifest.xml`` file.
-   This routine may not traverse package setups that rely on internal
-   symlinks within the package itself.
-    
-   :param path: filesystem path
-   :return: Package name or ``None`` if package cannot be found, ``str``
-
-.. class:: RosPack([ros_paths=None])
-
-   Query information about ROS packages on the local filesystem. This
-   includes information about dependencies, retrieving stack
-   :class:`Manifest` instances, and determining the parent stack of a
-   package.  
-
-   ``RosPack`` can be initialized with the default environment, or
-   its environment configuration can be overridden with alternate
-   ROS path settings.
-
-   NOTE 1: for performance reasons, ``RosPack`` caches information about
-   packages
-
-   NOTE 2: ``RosPack`` is not thread-safe.
-
-   Example::
-
-        from rospkg import RosPack
-        rp = RosPack()
-        packages = rp.list()
-        path = rp.get_path('rospy')
-        depends = rp.get_depends('roscpp')
-        depends1 = rp.get_depends('roscpp', implicit=False)
-    
-   :param ros_paths: Ordered list of paths to search for
-     resources. If `None` (default), use environment ROS path.
-
-   .. method:: get_ros_paths() -> [str]
-
-      Get ROS paths of this instance
-
-   .. attribute:: ros_paths
-
-      Get ROS paths of this instance
-
-   .. method:: get_manifest(name) -> Manifest
-
-      Get the :class:`Manifest` of the specified package.
-
-      :param name: package name, ``str``
-      :raises: :exc:`InvalidManifest`
-    
-   .. method:: list() -> [str]
-
-      List packages.
-
-      :returns: complete list of package names in ROS environment
-
-   .. method:: get_path(name) -> str
-
-      :param name: package name, ``str``
-      :returns: filesystem path of package
-      :raises: :exc:`ResourceNotFound`
-        
-   .. method::  get_depends(name, [implicit=True]) -> [str]
-
-      Get explicit and implicit dependencies of a package.
-
-      :param name: package name, ``str``
-      :param implicit: include implicit (recursive) dependencies, ``bool``
-      :returns: list of names of dependencies.
-      :raises: :exc:`InvalidManifest`        
-
-   .. method::  get_depends_on(name, [implicit=True]) -> [str]
-
-      Get list of packages that depend on a package.  If implicit is
-      ``True``, this includes implicit (recursive) dependency
-      relationships.
-
-      :param name: package name, ``str``
-      :param implicit: include implicit (recursive) dependencies, ``bool``
-
-      :returns: list of names of dependencies, ``[str]``
-      :raises: :exc:`InvalidManifest`
-
-   .. method:: get_rosdeps(package, [implicit=True]) -> [str]
-
-      Collect rosdeps of specified package into a dictionary.
-        
-      :param package: package name, ``str``
-      :param implicit: include implicit (recursive) rosdeps, ``bool``
-      :returns: list of rosdep names.
-        
-   .. method:: stack_of(package) -> str
-   
-      :param package: package name, ``str``
-      :returns: name of stack that *package* is in, or ``None`` if *package* is not part of a stack
-      :raises: :exc:`ResourceNotFound`: if *package* cannot be located
diff --git a/doc/rospkg_stacks.rst b/doc/rospkg_stacks.rst
deleted file mode 100644
index 523335a..0000000
--- a/doc/rospkg_stacks.rst
+++ /dev/null
@@ -1,111 +0,0 @@
-ROS stack access
-================
-
-.. currentmodule:: rospkg
-
-The :class:`RosStack` classes provides APIs similar to the
-``rosstack`` command-line tool distributed with ROS.  Like
-``rosstack``, it provides information about stack dependency
-information, filesystem locations, and manifest access. The Python API
-is more efficient than shelling out to ``rosstack`` as it provides
-caching and other optimizations for repeated querying.
-
-.. data:: STACK_FILE
-
-   Name of stack manifest file, i.e. 'stack.xml'.
-
-.. class:: RosStack([ros_paths=None])
-
-   Query information about ROS stacks on the local filesystem. This
-   includes information about dependencies, retrieving stack
-   :class:`Manifest` instances, and determining the contents of
-   stacks.  
-
-   ``RosStack`` can be initialized with the default environment, or
-   its environment configuration can be overridden with alternate
-   ROS path settings.
-
-   NOTE: for performance reasons, ``RosStack`` caches information about
-   stacks.
-
-   NOTE 2: ``RosStack`` is not thread-safe.
-
-   :param ros_paths: Ordered list of paths to search for
-     resources. If `None` (default), use environment ROS path.
-            
-   .. method:: get_ros_paths() -> [str]
-
-      Get ROS paths of this instance
-
-   .. attribute:: ros_paths
-
-      Get ROS paths of this instance
-
-   .. method:: get_manifest(name) -> Manifest
-
-      Get the :class:`Manifest` of the specified package.
-
-      :param name: package name, ``str``
-      :raises: :exc:`InvalidManifest`
-    
-   .. method:: list() -> [str]
-
-      List stacks.
-
-      :returns: complete list of package names in ROS environment
-
-   .. method:: get_path(name) -> str
-
-      :param name: stack name, ``str``
-      :returns: filesystem path of stack
-      :raises: :exc:`ResourceNotFound`
-        
-   .. method::  get_depends(name, [implicit=True]) -> [str]
-
-      Get explicit and implicit dependencies of a stack.
-
-      :param name: stack name, ``str``
-      :param implicit: include implicit (recursive) dependencies, ``bool``
-      :returns: list of names of dependencies.
-      :raises: :exc:`InvalidManifest`        
-
-   .. method::  get_depends_on(name, [implicit=True]) -> [str]
-
-      Get list of stacks that depend on a stack.  If implicit is
-      ``True``, this includes implicit (recursive) dependency
-      relationships.
-
-      :param name: stack name, ``str``
-      :param implicit: include implicit (recursive) dependencies, ``bool``
-
-      :returns: list of names of dependencies, ``[str]``
-      :raises: :exc:`InvalidManifest`
-
-   .. method:: packages_of(stack) -> [str]
-
-      :returns: name of packages that are part of stack
-      :raises: :exc:`ResourceNotFound` if stack cannot be located
-
-   .. method:: get_stack_version(stack) -> str
-
-      :param env: override environment variable dictionary
-      :returns: version number of stack, or None if stack is unversioned.
-
-.. function:: expand_to_packages(names, rospack, rosstack) -> ([str], [str])
-
-    Expand names into a list of packages. Names can either be of packages or stacks.
-
-    :param names: list of names of stacks or packages, ``[str]``
-    :param rospack: :class:`RosPack` instance
-    :param rosstack: :class:`RosStack` instance
-    :returns: ([packages], [not_found]). ``expand_packages()`` returns
-      two lists. The first is of packages names. The second is a list
-      of names for which no matching stack or package was found. Lists
-      may have duplicates.
-
-.. function:: get_stack_version_by_dir(stack_dir) -> str
-
-    Get stack version where stack_dir points to root directory of stack.
-    
-    :param env: override environment variable dictionary
-    :returns: version number of stack, or None if stack is unversioned.
diff --git a/doc/rosstack.rst b/doc/rosstack.rst
deleted file mode 100644
index 436894d..0000000
--- a/doc/rosstack.rst
+++ /dev/null
@@ -1,235 +0,0 @@
-.. _rosstack:
-
-rosstack
-^^^^^^^^
-
-rosstack overview
-=================
-
-*rosstack* is a command-line tool for retrieving information about ROS stacks
-available on the filesystem. It implements a wide variety of commands
-ranging from locating ROS stacks in the filesystem, to listing available
-stacks, to calculating the dependency tree of stacks. It is also used in
-the ROS build system for calculating build information for stacks.
-
-For an equivalent tool for packages, see :ref:`rospack <rospack>`.
-
-.. contents:: Table of Contents
-   :depth: 2
-
-rosstack usage
-==============
-
-The rosstack tool implements many commands that print information about ROS
-stacks. All of these commands print their results to stdout. Any errors or
-warnings go to stderr. This separation ensures that error output does not
-confuse programs that execute rosstack as a subprocess to, for example,
-recover build flags for a stack.
-
-NOTE: for all commands, if `stack` is omitted, the current working
-directory is used. 
-
-::
-
-    $ rosstack [options] <command> [stack]
-    [rosstack] USAGE: rosstack [options] <command> [stack]
-      Allowed commands:
-        help
-        find [stack]
-        contents [stack]
-        list
-        list-names
-        depends [stack] (alias: deps)
-        depends-manifests [stack] (alias: deps-manifests)
-        depends1 [stack] (alias: deps1)
-        depends-indent [stack] (alias: deps-indent)
-        depends-on [stack]
-        depends-on1 [stack]
-        depends-why --target=<target> [package] (alias: deps-why)
-        contains [package]
-        contains-path [package]
-        profile [--length=<length>] 
-    
-     If [stack] is omitted, the current working directory
-     is used (if it contains a stack.xml).
-
-
-.. program:: rosstack
-
-.. program:: rosstack help
-
-rosstack help [subcommand]
---------------------------
-
-Print help message.  Since 2.0.9, you can give a subcommand as an argument
-to get more specific help.
-
-.. _rosstack_find:
-.. program:: rosstack find
-
-rosstack find [stack]
----------------------
-
-Print absolute path to the stack, empty string if stack is not found.
-
-Example::
-
-    $ rosstack find common
-    /Users/homer/ros-pkg/common
-
-.. program:: rosstack list
-
-rosstack list
--------------
-
-Print newline-separated list, ``<stack-name> <stack-dir>``, for all stacks. 
-
-Example::
-
-    $ rosstack list | grep common
-    common /Users/kwc/ros-pkg/common
-    common_msgs /Users/kwc/ros-pkg/common_msgs
-    driver_common /Users/kwc/ros-pkg/driver_common
-    image_common /Users/kwc/ros-pkg/image_common
-    pr2_common /Users/kwc/ros-pkg/pr2_common
-    visualization_common /Users/kwc/ros-pkg/visualization_common
-
-.. program:: rosstack list-names
-
-rosstack list-names
--------------------
-
-Print newline-separated list of stack names for all stacks.
-
-Example::
-
-    $ rosstack list-names | grep common
-    common
-    common_msgs
-    driver_common
-    image_common
-    pr2_common
-    visualization_common
-
-.. program:: rosstack list-duplicates
-
-rosstack list-duplicates
-------------------------
-
-Print newline-separated list of names of stacks that appear more than
-once during the search.
-
-.. _rosstack_depends:
-
-.. program:: rosstack depends
-
-rosstack depends [stack]
-------------------------
-
-Print newline-separated, ordered list of all dependencies of the stack.
-
-Example::
-
-    $ rosstack depends driver_common
-    ros
-    common_msgs
-    common
-    diagnostics
-
-.. program:: rosstack depends1
-
-rosstack depends1 [stack]
--------------------------
-
-Print newline-separated, ordered list of immediate dependencies of the
-stack. 
-   
-.. program:: rosstack depends-manifests
-
-rosstack depends-manifests [stack]
-----------------------------------
-
-Print space-separated, ordered list of stack.xml files for all
-dependencies of the stack. 
-
-.. program:: rosstack depends-indent
-
-rosstack depends-indent [stack]
--------------------------------
-
-Print newline-separated list of the entire dependency chain for the stack,
-indented to indicate where in the chain each dependency arises. This may
-contain duplicates.
-
-.. program:: rosstack depends-why
-
-
-rosstack depends-why --target=<target> [stack]
-----------------------------------------------
-
-Print newline-separated presentation of all dependency chains from the stack to ``<target>``.
-
-.. _rosstack_depends-on:
-.. program:: rosstack depends-on
-
-rosstack depends-on [stack]
----------------------------
-
-Print newline-separated list of all stacks that depend on the stack.
-
-.. program:: rosstack depends-on1
-
-rosstack depends-on1 [stack]
-----------------------------
-
-Print newline-separated list of all stacks that directly depend on the
-stack. 
-
-Example::
-
-    $ rosstack depends-on1 driver_common
-    camera_drivers
-    image_pipeline
-    laser_drivers
-    pr2_robot
-
-.. program:: rosstack contains
-
-rosstack contains [package]
----------------------------
-
-Print the name of the stack that contains the package.  If the containing stack cannot be found, returns non-zero.
-
-Example::
-
-    $ rosstack contains roscpp
-    ros_comm
-
-rosstack contains-path [package]
---------------------------------
-
-Print the path to the stack that contains the package.  If the containing stack cannot be found, returns non-zero.
-
-Example::
-
-    $ rosstack contains-path roscpp
-    /home/gerkey/code/ros_comm
-
-.. _cmd_rosstack_profile:
-
-.. program:: rosstack profile
-
-rosstack profile
-----------------
-
-.. cmdoption:: --length=N
-
- Force a full crawl of stack directories (i.e., don't use cache, and report to console on the N (default 20) directories that took the longest time to crawl.  Useful for finding stray directories that are adversely affecting ``rosstack``'s performance.  
-
-.. cmdoption:: --zombie-only
-
- Only print directories that do not have any manifests.  In this case, the output can be fed directly into ``rm`` to clean up your tree, e.g.::
-
-     rosstack profile --zombie-only | xargs rm -rf
-
- NOTE: be sure to check the output before deleting any files!
diff --git a/doc/stack_manifests.rst b/doc/stack_manifests.rst
deleted file mode 100644
index 43a98a7..0000000
--- a/doc/stack_manifests.rst
+++ /dev/null
@@ -1,74 +0,0 @@
-.. _stack_manifest_file:
-
-Stack manifest files
-====================
-
-A ROS *stack manifest* (``stack.xml``) is a minimal specification for
-ROS stacks.  Whereas a :ref:`package manifest.xml <manifests>`
-provides information for building software, a stack manifest mainly
-deals with distributing and installing software.
-
-In addition to providing a metadata about a stack, an important role
-of a ``stack.xml`` is to declare dependencies on other stacks. The
-presence of a `stack.xml` file in a directory is significant: a
-directory that contains a `stack.xml` file is considered to be a
-stack, and any packages within it are considered to be part of that
-stack (NOTE: stacks cannot contain stacks).
-
-A bare minimum ``stack.xml`` file is much like a readme file, stating
-who is responsible for the stack and what license it is under. The
-license is important as it indicates who can use your
-code. `stack.xml` files usually include `<depend>` tags, which declare
-stacks that must be installed as pre-requisites.
-
-
-Uses
-----
-
-*Indexing*
-
-    If a ``stack.xml`` is present, the directory is assumed to be a ROS stack, and the name of the package is the same as the name of the directory.  Additionally, properties like the author, license, and description provide important metadata for an indexer.
-
-*Documentation*
-
-    As part of the DRY (Don't Repeat Yourself) principle, manifest information is oftena automatically imported into documentation, such as header information on ROS.org wiki pages, as well as in Doxygen documentation.
-
-*Deployment and Release*
-
-    Dependencies between ROS stacks are used to generate installation packages.
-
-XML Reference
--------------
-
-Please see the :ref:`stack.xml tags reference <stack_xml>`.
-
-
-Example
--------
-
-::
-
-    <stack>
-      <description brief="common code for personal robots">
-        A set of code and messages that are widely useful to all robots. Things
-        like generic robot messages (i.e., kinematics, transforms), a generic 
-        transform library (tf), laser-scan utilities, etc.
-      </description>
-      <author>Maintained by Tully Foote</author>
-      <license>BSD</license>
-      <review status="unreviewed" notes=""/>
-      <url>http://ros.org/wiki/common</url>
-      <depend stack="ros"/>
-    </stack>
-
-
-Tools
------
-
-`rosstack <http://ros.org/wiki/rosstack>`_ parses and retrieves information from ``manifest.xml`` files. For example, ``rosstack depends stack-name`` will tell you all of the dependencies of ``stack-name`` (use ``depends1`` to retrieve the direct dependencies).
-
-Library Support
----------------
-
-See the :class:`rospkg.RosPack` and :class:`rospkg.RosStack` for Python APIs to retrieve and parse manifest files.
-
diff --git a/doc/stack_xml.rst b/doc/stack_xml.rst
deleted file mode 100644
index dee2470..0000000
--- a/doc/stack_xml.rst
+++ /dev/null
@@ -1,255 +0,0 @@
-.. _stack_xml:
-
-Stack manifest XML tags reference
-=================================
-
-NOTE: Stack manifests always have the filename ``stack.xml``. 
-
-Required Tags
--------------
-
-The required set of tags in a ``stack.xml`` file is very minimal and
-only provides the most basic metadata about your stack, including what
-it is, who wrote it, and who can use it.
-
- * :ref:`\<stack\> <stack_tag>`
- * :ref:`\<description\> <stack_description_tag>`
- * :ref:`\<license\> <stack_license_tag>`
- * :ref:`\<author\> <stack_author_tag>`
-
-Optional Tags
--------------
-
-The most common optional tags are ``<depend>`` and ``<url>``. We strongly
-recommend the use of the ``<url>`` tag to point users to a website where
-they can find out more information about your stack. The website is
-most commonly a wiki page on ROS.org so that users can easily edit and
-update information about your stack.
-
-
- * :ref:`\<depend\> <stack_depend_tag>`
- * :ref:`\<url\> <stack_url_tag>`
- * :ref:`\<review\> <stack_review_tag>`
- * :ref:`\<version\> <stack_version_tag>` 
-
-Example
--------
-
-::
-
-    <stack>
-      <description brief="Common code for working with images">
-        Common code for working with images in ROS.
-      </description>
-      <author>Maintained by Patrick Mihelich</author>
-      <license>BSD</license>
-      <review status="Doc reviewed" notes="2009/6/10"/>
-      <url>http://ros.org/wiki/image_common</url>
-      <depend stack="common_msgs" />
-      <depend stack="common_rosdeps" />
-      <depend stack="pluginlib" /> 
-      <depend stack="ros" /> 
-      <depend stack="ros_comm" /> 
-    
-    </stack>
-    
-
-.. _stack_tag:
-
-<stack>
--------
-
-The ``<stack>`` tag is the top-level tag in a stack manifest.
-
-Elements
-''''''''
-
- * :ref:`\<description\> <stack_description_tag>`
- * :ref:`\<license\> <stack_license_tag>`
- * :ref:`\<author\> <stack_author_tag>`
- * :ref:`\<url\> <stack_url_tag>`
- * :ref:`\<depend\> <stack_depend_tag>`
- * :ref:`\<review\> <stack_review_tag>`
-
-
-.. _stack_description_tag:
-
-<description>
--------------
-
-
-Text
-''''
-
-Description of the stack. It may be multi-line and include XHTML. 
-
-Example
-'''''''
-
-::
-
-     <description brief="ROS for Python">
-        Python implementation of the ROS master/node APIs and client library.
-     </description>
-    
-
-Attributes
-''''''''''
-
- ``brief="brief text"`` *(optional)*
-  One-line summary of your stack. Useful for UI displays where the stack name isn't sufficiently descriptive.
-
-.. _stack_license_tag:
-
-<license>
----------
-
-Text
-''''
-
-Name of license for this package, e.g. BSD, GPL, LGPL. In order to
-assist machine readability, only include the license name in this
-tag. For any explanatory text about licensing caveats, please use the
-``<description>`` tag.
-
-Most common open-source licenses are described on the `OSI website <http://www.opensource.org/licenses/alphabetical>`_.
-
-Commonly used license strings:
-
- - Apache 2.0
- - BSD
- - Boost Software License
- - GPLv2
- - GPLv3
- - LGPLv2.1
- - LGPLv3
- - MIT 
- - Mozilla Public License Version 1.1
- - ZLib
- - wxWindows
-
-
-Attributes
-''''''''''
-
-
- ``url="license url"`` *(optional)*
-   For lesser-known licenses, it is helpful to add this attribute with a link to the text of the license.
-
-Example
-'''''''
-
-::
-
-    <license>BSD</license>
-
-
-.. _stack_author_tag:
-
-<author>
---------
-
-Text
-''''
-
-
-Name and contact information for the person maintaining the stack.
-
-Example
-'''''''
-
-::
-
-    <author>Alyssa P. Hacker/aphacker@willowgarage.com</author>
-
-
-.. _stack_depend_tag:
-
-<depend>
---------
-
-Declares a stack that this stack depends on.
-
-Example
-'''''''
-
-::
-
-    <depend stack="ros"/>
-
-
-Attributes
-''''''''''
-
- ``stack="stack_name"``
-   Name of ROS stack dependency.
-
-.. _stack_url_tag:
-
-<url>
------
-
-Text
-''''
-
-Website for the stack. This is important for guiding users to online documentation.
-
-Example
-'''''''
-
-::
-
-    <url>http://ros.org/wiki/navigation</url>
-
-
-.. _stack_review_tag:
-
-<review>
---------
-
-Status of the stack in the review process (Design, API, and Code
-review). `QAProcess <http://ros.org/wiki/QAProcess>`_.  Stack that
-have not yet been reviewed should be marked as "experimental".
-
-Attributes
-''''''''''
-
-
- ``status="status"``
-   See `list of valid review statuses <http://ros.org/wiki/Review Status>`_.
- ``notes="notes on review status"`` *(optional)*
-   Notes on review status, such as date of last review.
-
-
-Example
-'''''''
-
-::
-
-    <review status="experimental" notes="reviewed on 3/14/09" />
-
-
-.. _stack_version_tag:
-
-<version>
----------
-
-.. versionadded: Electric
-
-Text
-''''
-
-The version number of the stack.  
-
-*IMPORTANT*:
-
- - This should only be used with stacks that follow the `release <http://ros.org/wiki/release>`_ process
- - Do *not* combine this with the ``rosbuild_make_distribution()`` CMake macro.  Use the ``<version>`` tag *or* the CMake macro, but not both.
-
-Example
-'''''''
-
-::
-
-    <version>1.2.7</version>
-
diff --git a/doc/stacks.rst b/doc/stacks.rst
deleted file mode 100644
index 13398cc..0000000
--- a/doc/stacks.rst
+++ /dev/null
@@ -1,56 +0,0 @@
-.. _stacks:
-
-ROS stacks
-============
-
-:ref:`Packages <packages>` can be organized into ROS *stacks*. Whereas
-the goal of packages is to create and compile minimal collections of
-code for easy *reuse*, the goal of stacks is to simplify the process
-of code *sharing*. Stacks are the primary mechanism in ROS for
-distributing software. Each stack has an associated version and can
-declare dependencies on other stacks. These dependencies also declare
-a version number, which provides greater stability in development.
-
-Stacks collect packages that collectively provide functionality, such
-as a navigation stack or a manipulation stack. 
-
-Stacks are easy to create by hand. A stack is simply a directory
-descended from :envvar:`ROS_ROOT` or :envvar:`ROS_PACKAGE_PATH` that
-has a :ref:`stack.xml <stack_manifest_file>` file in it. Any packages
-in this directory are considered to be part of the stack.
-
-For release purposes, a ``CMakeLists.txt`` should also be put into the
-root of the stack.  The `roscreate-stack
-<http://ros.org/wiki/roscreate>`_ tool can generate this file
-automatically.
-
-Please see the :ref:`stack manifest <stack_manifest_file>` section for
-documentation on how to write `stack.xml` files.
-
-Unary stacks
-------------
-
-A *unary stack* is simply a stack that is also a package.  
-
-*Advanced*: This is described in greater detail in `REP 109
-<http://www.ros.org/reps/rep-0109.html>`_.
-
-Command-line Tools
-------------------
-
-:ref:`rosstack <rosstack>` is the primary ROS tool for interacting
-with ROS stacks. It is the stack-level analogue of the :ref:`rospack <rospack>`
-tool for packages.
-
-There are also extensions to common Unix shells that provide
-additional functionality to help you navigate and use packages. The
-most commonly used of these is `rosbash
-<http://ros.org/wiki/rosbash>`_, which provides ROS-variants of common
-Unix shell commands for Bash and other shells. The most commonly used
-of these is ``roscd``, which performs a ``cd`` to the directory of a
-package or stack, e.g.
-
-::
-
-    roscd navigation
-
diff --git a/doc/tutorials.rst b/doc/tutorials.rst
deleted file mode 100644
index 7e46832..0000000
--- a/doc/tutorials.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Tutorials
-=========
-
-TODO
diff --git a/rosdoc.yaml b/rosdoc.yaml
deleted file mode 100644
index d21d73a..0000000
--- a/rosdoc.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
- - builder: sphinx
-   sphinx_root_dir: doc
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..cc4e513
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,10 @@
+[tool:pytest]
+junit_suite_name = rospkg
+
+[coverage:run]
+source = rospkg
+
+[egg_info]
+tag_build = 
+tag_date = 0
+
diff --git a/setup.py b/setup.py
index 9b8bb11..239530c 100755
--- a/setup.py
+++ b/setup.py
@@ -24,8 +24,20 @@ kwargs = {
         'console_scripts': ['rosversion=rospkg.rosversion:main'],
     },
     'install_requires': install_requires,
+    'extras_require': {
+        'test': [
+            "mock; python_version < '3.3'",
+            'pytest',
+        ]},
     'author': 'Ken Conley',
     'author_email': 'kwc@willowgarage.com',
+    'maintainer': 'ROS Infrastructure Team',
+    'project_urls': {
+        'Source code':
+        'https://github.com/ros-infrastructure/rospkg',
+        'Issue tracker':
+        'https://github.com/ros-infrastructure/rospkg/issues',
+    },
     'url': 'http://wiki.ros.org/rospkg',
     'keywords': ['ROS'],
     'classifiers': [
diff --git a/src/rospkg.egg-info/PKG-INFO b/src/rospkg.egg-info/PKG-INFO
new file mode 100644
index 0000000..d46fed0
--- /dev/null
+++ b/src/rospkg.egg-info/PKG-INFO
@@ -0,0 +1,18 @@
+Metadata-Version: 2.1
+Name: rospkg
+Version: 1.4.0
+Summary: ROS package library
+Home-page: http://wiki.ros.org/rospkg
+Author: Ken Conley
+Author-email: kwc@willowgarage.com
+Maintainer: ROS Infrastructure Team
+License: BSD
+Project-URL: Source code, https://github.com/ros-infrastructure/rospkg
+Project-URL: Issue tracker, https://github.com/ros-infrastructure/rospkg/issues
+Keywords: ROS
+Classifier: Programming Language :: Python
+Classifier: License :: OSI Approved :: BSD License
+Provides-Extra: test
+
+        Library for retrieving information about ROS packages and stacks.
+        
diff --git a/src/rospkg.egg-info/SOURCES.txt b/src/rospkg.egg-info/SOURCES.txt
new file mode 100644
index 0000000..e6caaee
--- /dev/null
+++ b/src/rospkg.egg-info/SOURCES.txt
@@ -0,0 +1,27 @@
+README.md
+setup.cfg
+setup.py
+src/rospkg/__init__.py
+src/rospkg/common.py
+src/rospkg/distro.py
+src/rospkg/environment.py
+src/rospkg/manifest.py
+src/rospkg/os_detect.py
+src/rospkg/rospack.py
+src/rospkg/rosversion.py
+src/rospkg/stack.py
+src/rospkg.egg-info/PKG-INFO
+src/rospkg.egg-info/SOURCES.txt
+src/rospkg.egg-info/dependency_links.txt
+src/rospkg.egg-info/entry_points.txt
+src/rospkg.egg-info/requires.txt
+src/rospkg.egg-info/top_level.txt
+test/test_rospkg_catkin_packages.py
+test/test_rospkg_common.py
+test/test_rospkg_distro.py
+test/test_rospkg_distro_vcs_config.py
+test/test_rospkg_environment.py
+test/test_rospkg_manifest.py
+test/test_rospkg_os_detect.py
+test/test_rospkg_packages.py
+test/test_rospkg_stacks.py
\ No newline at end of file
diff --git a/src/rospkg.egg-info/dependency_links.txt b/src/rospkg.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/src/rospkg.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/src/rospkg.egg-info/entry_points.txt b/src/rospkg.egg-info/entry_points.txt
new file mode 100644
index 0000000..6897e71
--- /dev/null
+++ b/src/rospkg.egg-info/entry_points.txt
@@ -0,0 +1,2 @@
+[console_scripts]
+rosversion = rospkg.rosversion:main
diff --git a/src/rospkg.egg-info/requires.txt b/src/rospkg.egg-info/requires.txt
new file mode 100644
index 0000000..97f6908
--- /dev/null
+++ b/src/rospkg.egg-info/requires.txt
@@ -0,0 +1,11 @@
+PyYAML
+catkin_pkg
+
+[:python_version >= "3.8"]
+distro>=1.4.0
+
+[test]
+pytest
+
+[test:python_version < "3.3"]
+mock
diff --git a/src/rospkg.egg-info/top_level.txt b/src/rospkg.egg-info/top_level.txt
new file mode 100644
index 0000000..eeae947
--- /dev/null
+++ b/src/rospkg.egg-info/top_level.txt
@@ -0,0 +1 @@
+rospkg
diff --git a/stdeb.cfg b/stdeb.cfg
deleted file mode 100644
index 8f52c4c..0000000
--- a/stdeb.cfg
+++ /dev/null
@@ -1,30 +0,0 @@
-[rospkg]
-Debian-Version: 100
-; rospkg-modules same version as in:
-; - setup.py
-; - src/rospkg/__init__.py
-Depends: python-rospkg-modules (>= 1.4.0)
-; rospkg-modules same version as in:
-; - setup.py
-; - src/rospkg/__init__.py
-Depends3: python3-rospkg-modules (>= 1.4.0)
-Conflicts: python3-rospkg
-Conflicts3: python-rospkg
-Suite: bionic buster
-Suite3: bionic focal jammy buster bullseye
-Python2-Depends-Name: python
-X-Python3-Version: >= 3.4
-Setup-Env-Vars: SKIP_PYTHON_MODULES=1
-
-[rospkg_modules]
-Depends: python-catkin-pkg-modules, python-yaml, lsb-release
-Depends3: python3-catkin-pkg-modules, python3-distro (>= 1.4.0) | python3 (<< 3.8), python3-yaml, lsb-release
-Conflicts: python-rospkg (<< 1.1.0)
-Conflicts3: python3-rospkg (<< 1.1.0)
-Replaces: python-rospkg (<< 1.1.0)
-Replaces3: python3-rospkg (<< 1.1.0)
-Suite: bionic buster
-Suite3: bionic focal jammy buster bullseye
-Python2-Depends-Name: python
-X-Python3-Version: >= 3.4
-Setup-Env-Vars: SKIP_PYTHON_SCRIPTS=1
diff --git a/test/__init__.py b/test/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/test/catkin_package_tests/p1/foo/package.xml b/test/catkin_package_tests/p1/foo/package.xml
deleted file mode 100644
index f6aa0ee..0000000
--- a/test/catkin_package_tests/p1/foo/package.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<package>
-  <name>foo</name>
-  <version>1.2.3</version>
-  <description>
-    I AM THE VERY MODEL OF A MODERN MAJOR GENERAL
-  </description>
-  <maintainer email="someone@example.com">Someone</maintainer>
-
-  <license>BSD</license>
-  <license>LGPL</license>
-
-  <url type="website">http://wiki.ros.org/my_package</url>
-  <url type="bugtracker">http://www.github.com/my_org/my_package/issues</url>
-  <author>John Doe</author>
-  <author email="jane.doe@example.com">Jane Doe</author>
-
-  <build_depend>catkin</build_depend>
-  <build_depend version_gte="1.1" version_lt="2.0">genmsg</build_depend>
-
-  <build_depend>libboost-thread-dev</build_depend>
-  <run_depend>libboost-thread</run_depend>
-
-  <test_depend>gtest</test_depend>
-
-  <conflict>my_old_package</conflict>
-
-  <export>
-  </export>
-</package>
diff --git a/test/fakeetcros/distro b/test/fakeetcros/distro
deleted file mode 100644
index 24bbd85..0000000
--- a/test/fakeetcros/distro
+++ /dev/null
@@ -1 +0,0 @@
-rosawesome
diff --git a/test/manifest/bad1.xml b/test/manifest/bad1.xml
deleted file mode 100644
index 7dd21eb..0000000
--- a/test/manifest/bad1.xml
+++ /dev/null
@@ -1 +0,0 @@
-not xml
diff --git a/test/manifest/bad2.xml b/test/manifest/bad2.xml
deleted file mode 100644
index 9a8acc8..0000000
--- a/test/manifest/bad2.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<notpackage>
-  <description brief="a brief description">Line 1
-Line 2
-  </description>
-  <author>The authors
-go here</author>
-  <license>Public Domain
-with other stuff</license>
-  <url>http://pr.willowgarage.com/package/</url>
-  <logo>http://www.willowgarage.com/files/willowgarage/robot10.jpg</logo>
-  <depend package="pkgname" />
-  <depend package="common"/>
-  <export>
-    <cpp cflags="-I${prefix}/include" lflags="-L${prefix}/lib -lros"/>
-    <cpp os="osx" cflags="-I${prefix}/include" lflags="-L${prefix}/lib -lrosthread -framework CoreServices"/>
-  </export>
-  <rosdep name="python" />
-  <rosdep name="bar" />
-  <rosdep name="baz" />
-</notpackage>
diff --git a/test/manifest/bad3.xml b/test/manifest/bad3.xml
deleted file mode 100644
index 40f6ae9..0000000
--- a/test/manifest/bad3.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<package>
-  <description brief="a brief description">Line 1
-  </description>
-  <description brief="a brief second description">Second description
-  </description>
-
-  <author>The authors
-go here</author>
-  <license>Public Domain
-with other stuff</license>
-</package>
diff --git a/test/manifest/catkin/manifest.xml b/test/manifest/catkin/manifest.xml
deleted file mode 100644
index 883452e..0000000
--- a/test/manifest/catkin/manifest.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<package>
-  <catkin />
-  <description brief="a brief description">Line 1
-Line 2
-  </description>
-  <author>The authors
-go here</author>
-  <license>Public Domain
-with other stuff</license>
-  <url>http://pr.willowgarage.com/package/</url>
-  <logo>http://www.willowgarage.com/files/willowgarage/robot10.jpg</logo>
-  <depend package="pkgname" />
-  <depend package="common"/>
-  <export>
-    <cpp cflags="-I${prefix}/include" lflags="-L${prefix}/lib -lros"/>
-    <cpp os="osx" cflags="-I${prefix}/include" lflags="-L${prefix}/lib -lrosthread -framework CoreServices"/>
-  </export>
-  <rosdep name="python" />
-  <rosdep name="bar" />
-  <rosdep name="baz" />
-</package>
diff --git a/test/manifest/example1/manifest.xml b/test/manifest/example1/manifest.xml
deleted file mode 100644
index a4c2bcd..0000000
--- a/test/manifest/example1/manifest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<package>
-  <description brief="a brief description">Line 1
-Line 2
-  </description>
-  <author>The authors go here.
-utf-8 test: ÄÖÜ</author>
-  <license>Public Domain
-with other stuff</license>
-  <url>http://pr.willowgarage.com/package/</url>
-  <logo>http://www.willowgarage.com/files/willowgarage/robot10.jpg</logo>
-  <depend package="pkgname" />
-  <depend package="common"/>
-  <export>
-    <cpp cflags="-I${prefix}/include" lflags="-L${prefix}/lib -lros"/>
-    <cpp os="osx" cflags="-I${prefix}/include" lflags="-L${prefix}/lib -lrosthread -framework CoreServices"/>
-  </export>
-  <rosdep name="python" />
-  <rosdep name="bar" />
-  <rosdep name="baz" />
-</package>
diff --git a/test/manifest/stack_example1/stack.xml b/test/manifest/stack_example1/stack.xml
deleted file mode 100644
index e83156e..0000000
--- a/test/manifest/stack_example1/stack.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<stack>
-  <description brief="a brief description">Line 1
-Line 2
-  </description>
-  <author>The authors
-go here</author>
-  <license>Public Domain
-with other stuff</license>
-  <url>http://ros.org/stack/</url>
-  <logo>http://www.willowgarage.com/files/willowgarage/robot10.jpg</logo>
-  <depend stack="stackname" />
-  <depend stack="common"/>
-</stack>
diff --git a/test/manifest/stack_version/stack.xml b/test/manifest/stack_version/stack.xml
deleted file mode 100644
index 0ca48d9..0000000
--- a/test/manifest/stack_version/stack.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<stack>
-  <description brief="a brief description">Line 1
-Line 2
-  </description>
-  <author>The authors
-go here</author>
-  <license>Public Domain
-with other stuff</license>
-  <url>http://ros.org/stack/</url>
-  <version>1.2.3</version>
-  <logo>http://www.willowgarage.com/files/willowgarage/robot10.jpg</logo>
-  <depend stack="stackname" />
-  <depend stack="common"/>
-</stack>
diff --git a/test/os_detect/arch/arch-release b/test/os_detect/arch/arch-release
deleted file mode 100644
index e69de29..0000000
diff --git a/test/os_detect/gentoo/gentoo-release b/test/os_detect/gentoo/gentoo-release
deleted file mode 100644
index 98b716f..0000000
--- a/test/os_detect/gentoo/gentoo-release
+++ /dev/null
@@ -1 +0,0 @@
-Gentoo Base System release 2.0.1 
diff --git a/test/os_detect/manjaro/manjaro-release b/test/os_detect/manjaro/manjaro-release
deleted file mode 100644
index e0d81db..0000000
--- a/test/os_detect/manjaro/manjaro-release
+++ /dev/null
@@ -1 +0,0 @@
-Manjaro Linux
diff --git a/test/os_detect/opensuse/SuSE-brand b/test/os_detect/opensuse/SuSE-brand
deleted file mode 100644
index 1bc43d4..0000000
--- a/test/os_detect/opensuse/SuSE-brand
+++ /dev/null
@@ -1,2 +0,0 @@
-openSUSE
-VERSION = 11.2
diff --git a/test/os_detect/opensuse/SuSE-release b/test/os_detect/opensuse/SuSE-release
deleted file mode 100644
index 4e2270b..0000000
--- a/test/os_detect/opensuse/SuSE-release
+++ /dev/null
@@ -1,2 +0,0 @@
-openSUSE 11.2 (x86_64)
-VERSION = 11.2
diff --git a/test/os_detect/opensuse13/SUSE-brand b/test/os_detect/opensuse13/SUSE-brand
deleted file mode 100644
index 23ada6e..0000000
--- a/test/os_detect/opensuse13/SUSE-brand
+++ /dev/null
@@ -1,2 +0,0 @@
-openSUSE
-VERSION = 13.1
diff --git a/test/os_detect/opensuse13/SuSE-release b/test/os_detect/opensuse13/SuSE-release
deleted file mode 100644
index 98504d2..0000000
--- a/test/os_detect/opensuse13/SuSE-release
+++ /dev/null
@@ -1,3 +0,0 @@
-openSUSE 13.1 (x86_64)
-VERSION = 13.1
-CODENAME = Bottle
diff --git a/test/os_detect/osx/sw_vers b/test/os_detect/osx/sw_vers
deleted file mode 100755
index 21aa1f1..0000000
--- a/test/os_detect/osx/sw_vers
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-echo "10.6.5"
diff --git a/test/os_detect/osx/sw_vers_bad b/test/os_detect/osx/sw_vers_bad
deleted file mode 100755
index 78bef9f..0000000
--- a/test/os_detect/osx/sw_vers_bad
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-echo "10"
diff --git a/test/os_detect/rhel/issue b/test/os_detect/rhel/issue
deleted file mode 100644
index dccdc7a..0000000
--- a/test/os_detect/rhel/issue
+++ /dev/null
@@ -1 +0,0 @@
-Red Hat Enterprise Linux AS release 3 (Taroon)
diff --git a/test/os_detect/slackware/slackware-version b/test/os_detect/slackware/slackware-version
deleted file mode 100644
index 7921e74..0000000
--- a/test/os_detect/slackware/slackware-version
+++ /dev/null
@@ -1 +0,0 @@
-Slackware 14.2
diff --git a/test/os_detect/ubuntu/lsb_release b/test/os_detect/ubuntu/lsb_release
deleted file mode 100755
index e120716..0000000
--- a/test/os_detect/ubuntu/lsb_release
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env python
-import sys
-if '-sr' in sys.argv:
-    sys.stdout.write("10.04\n")
-elif '-sc' in sys.argv:
-    sys.stdout.write("lucid\n")
-elif '-si' in sys.argv:
-    sys.stdout.write("Ubuntu\n")
-
diff --git a/test/package_tests/p1/bar/manifest.xml b/test/package_tests/p1/bar/manifest.xml
deleted file mode 100644
index 42c9650..0000000
--- a/test/package_tests/p1/bar/manifest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<package>
-  <description brief="bar">
-
-     bar
-
-  </description>
-  <author>Ken Conley</author>
-  <license>BSD</license>
-  <review status="unreviewed" notes=""/>
-  <url>http://ros.org/wiki/bar</url>
-  <depend package="foo" />
-  <rosdep name="bar_rosdep1" />
-  <rosdep name="bar_rosdep2" />
-
-</package>
-
-
diff --git a/test/package_tests/p1/foo/baz/.gitkeep b/test/package_tests/p1/foo/baz/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/test/package_tests/p1/foo/manifest.xml b/test/package_tests/p1/foo/manifest.xml
deleted file mode 100644
index d2a8be8..0000000
--- a/test/package_tests/p1/foo/manifest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<package>
-  <description brief="foo">
-
-     foo
-
-  </description>
-  <author>Ken Conley</author>
-  <license>BSD</license>
-  <review status="unreviewed" notes=""/>
-  <url>http://ros.org/wiki/foo</url>
-
-  <rosdep name="foo_rosdep1"/>
-  <rosdep name="foo_rosdep2"/>
-  <rosdep name="foo_rosdep3"/>
-</package>
-
-
diff --git a/test/package_tests/p1/invalid/manifest.xml b/test/package_tests/p1/invalid/manifest.xml
deleted file mode 100644
index 5468597..0000000
--- a/test/package_tests/p1/invalid/manifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<invalid>
diff --git a/test/package_tests/p2/baz/manifest.xml b/test/package_tests/p2/baz/manifest.xml
deleted file mode 100644
index 3e4af58..0000000
--- a/test/package_tests/p2/baz/manifest.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<package>
-  <description brief="foo">
-
-     foo
-
-  </description>
-  <author>Ken Conley</author>
-  <license>BSD</license>
-  <review status="unreviewed" notes=""/>
-  <url>http://ros.org/wiki/foo</url>
-  <depend package="foo" />
-  <depend package="bar" />
-
-  <rosdep name="baz_rosdep1" />
-
-</package>
-
-
diff --git a/test/package_tests/p2/foo/manifest.xml b/test/package_tests/p2/foo/manifest.xml
deleted file mode 100644
index 9ae3220..0000000
--- a/test/package_tests/p2/foo/manifest.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<package>
-  <description brief="foo">
-
-     foo
-
-  </description>
-  <author>Ken Conley</author>
-  <license>BSD</license>
-  <review status="unreviewed" notes=""/>
-  <url>http://ros.org/wiki/foo</url>
-
-</package>
-
-
diff --git a/test/package_tests/rospack_cache b/test/package_tests/rospack_cache
deleted file mode 100644
index bd2b9e5..0000000
--- a/test/package_tests/rospack_cache
+++ /dev/null
@@ -1,126 +0,0 @@
-#ROS_ROOT=/home/kwc/ros
-#ROS_PACKAGE_PATH=/home/kwc/workspace:/u/kwc/workspace
-
-# added empty lines to this file to stress reader
-
-/home/kwc/ros/test/test_rosmake
-/home/kwc/ros/test/test_roscreate
-/home/kwc/ros/test/test_rospack
-/home/kwc/ros/test/test_roslib
-/home/kwc/ros/test/test_rosdep
-/home/kwc/ros/tools/rosunit
-/home/kwc/ros/tools/rosmake
-/home/kwc/ros/tools/rosclean
-/home/kwc/ros/tools/rosemacs
-/home/kwc/ros/tools/roscreate
-/home/kwc/ros/tools/rospack
-/home/kwc/ros/tools/rosbash
-/home/kwc/ros/tools/rosdep
-/home/kwc/ros/tools/rosboost_cfg
-/home/kwc/ros/core/mk
-/home/kwc/ros/core/roslib
-/home/kwc/ros/core/rosbuild
-/home/kwc/ros/core/roslang
-/home/kwc/workspace/rosci
-/home/kwc/workspace/rosinstall
-/home/kwc/workspace/test_msgs
-/home/kwc/workspace/rospkg
-/home/kwc/workspace/genpy
-/home/kwc/workspace/genmsg
-/home/kwc/workspace/vcstools
-/home/kwc/workspace/common_rosdeps
-/home/kwc/workspace/gencpp
-/home/kwc/workspace/rep
-/home/kwc/workspace/release/release_resources
-/home/kwc/workspace/release/distros
-/home/kwc/workspace/rx/rxtools
-/home/kwc/workspace/rx/test_rxplot
-/home/kwc/workspace/rx/test_rxdeps
-/home/kwc/workspace/rx/wxswig
-/home/kwc/workspace/rx/rxbag
-/home/kwc/workspace/rx/xdot
-/home/kwc/workspace/rx/rxgraph
-/home/kwc/workspace/rx/rxdeps
-/home/kwc/workspace/rx/wxPython_swig_interface
-/home/kwc/workspace/common_msgs/actionlib_msgs
-/home/kwc/workspace/common_msgs/geometry_msgs
-/home/kwc/workspace/common_msgs/visualization_msgs
-/home/kwc/workspace/common_msgs/sensor_msgs
-/home/kwc/workspace/common_msgs/test_common_msgs
-/home/kwc/workspace/common_msgs/trajectory_msgs
-/home/kwc/workspace/common_msgs/stereo_msgs
-/home/kwc/workspace/common_msgs/nav_msgs
-/home/kwc/workspace/common_msgs/diagnostic_msgs
-/home/kwc/workspace/documentation/rosdoc
-/home/kwc/workspace/rosh_core/rosh
-/home/kwc/workspace/rosh_core/roshlaunch
-/home/kwc/workspace/ros_release/job_generation
-/home/kwc/workspace/ros_release/isogenerator
-/home/kwc/workspace/ros_release/hudson
-/home/kwc/workspace/ros_release/rosdistro
-/home/kwc/workspace/ros_release/rosdeb
-/home/kwc/workspace/ros_release/release
-/home/kwc/workspace/rosjava_core/rosjava_tutorial_pubsub
-/home/kwc/workspace/rosjava_core/rosjava
-/home/kwc/workspace/rosjava_core/apache_commons_util
-/home/kwc/workspace/rosjava_core/apache_xmlrpc
-/home/kwc/workspace/rosjava_core/actionlib_java
-/home/kwc/workspace/rosjava_core/test_rosjava
-/home/kwc/workspace/rosjava_core/rosjava_bootstrap
-/home/kwc/workspace/rosorg/rosbrowse
-/home/kwc/workspace/rosorg/roswiki
-/home/kwc/workspace/rosorg/rosdoc_rosorg
-/home/kwc/workspace/roshpit/rosh_experimental
-/home/kwc/workspace/roshpit/rosh_base
-/home/kwc/workspace/ros_comm/roscore_migration_rules
-/home/kwc/workspace/ros_comm/test/test_rosnode
-/home/kwc/workspace/ros_comm/test/perf_roscpp
-/home/kwc/workspace/ros_comm/test/test_ros
-/home/kwc/workspace/ros_comm/test/test_roslaunch
-/home/kwc/workspace/ros_comm/test/test_rosmsg
-/home/kwc/workspace/ros_comm/test/test_rostopic
-/home/kwc/workspace/ros_comm/test/test_rostime
-/home/kwc/workspace/ros_comm/test/test_rosgraph
-/home/kwc/workspace/ros_comm/test/test_rosservice
-/home/kwc/workspace/ros_comm/test/test_rosmaster
-/home/kwc/workspace/ros_comm/test/test_rosbag
-/home/kwc/workspace/ros_comm/test/test_crosspackage
-/home/kwc/workspace/ros_comm/test/test_roswtf
-/home/kwc/workspace/ros_comm/test/test_roslib_comm
-/home/kwc/workspace/ros_comm/test/test_roscpp_serialization_perf
-/home/kwc/workspace/ros_comm/test/test_topic_tools
-/home/kwc/workspace/ros_comm/test/test_roscpp
-/home/kwc/workspace/ros_comm/test/test_rospy
-/home/kwc/workspace/ros_comm/test/test_rosparam
-/home/kwc/workspace/ros_comm/test/test_roscpp_serialization
-/home/kwc/workspace/ros_comm/test/test_rostest
-/home/kwc/workspace/ros_comm/utilities/rostime
-/home/kwc/workspace/ros_comm/utilities/xmlrpcpp
-/home/kwc/workspace/ros_comm/utilities/message_filters
-/home/kwc/workspace/ros_comm/utilities/cpp_common
-/home/kwc/workspace/ros_comm/utilities/roswtf
-/home/kwc/workspace/ros_comm/clients/roslisp
-/home/kwc/workspace/ros_comm/clients/rospy
-/home/kwc/workspace/ros_comm/clients/cpp/roscpp
-/home/kwc/workspace/ros_comm/clients/cpp/roscpp_serialization
-/home/kwc/workspace/ros_comm/clients/cpp/roscpp_traits
-/home/kwc/workspace/ros_comm/tools/rosconsole
-/home/kwc/workspace/ros_comm/tools/rosparam
-/home/kwc/workspace/ros_comm/tools/topic_tools
-/home/kwc/workspace/ros_comm/tools/roslaunch
-/home/kwc/workspace/ros_comm/tools/rosmsg
-/home/kwc/workspace/ros_comm/tools/rostopic
-/home/kwc/workspace/ros_comm/tools/rosgraph
-/home/kwc/workspace/ros_comm/tools/rosout
-/home/kwc/workspace/ros_comm/tools/rosnode
-/home/kwc/workspace/ros_comm/tools/rosmaster
-/home/kwc/workspace/ros_comm/tools/rosbag
-/home/kwc/workspace/ros_comm/tools/rostest
-/home/kwc/workspace/ros_comm/tools/rosbagmigration
-/home/kwc/workspace/ros_comm/tools/rosservice
-/home/kwc/workspace/ros_comm/messages/std_srvs
-/home/kwc/workspace/ros_comm/messages/std_msgs
-/home/kwc/workspace/ros_comm/messages/rosgraph_msgs
-/home/kwc/workspace/executive_smach/smach
-/home/kwc/workspace/executive_smach/smach_ros
-/home/kwc/workspace/executive_smach/smach_msgs
diff --git a/test/rosdistro/bad1.rosdistro b/test/rosdistro/bad1.rosdistro
deleted file mode 100644
index 67be85f..0000000
--- a/test/rosdistro/bad1.rosdistro
+++ /dev/null
@@ -1 +0,0 @@
-bad
diff --git a/test/rosdistro/bad2.rosdistro b/test/rosdistro/bad2.rosdistro
deleted file mode 100644
index 34091a7..0000000
--- a/test/rosdistro/bad2.rosdistro
+++ /dev/null
@@ -1,9 +0,0 @@
-_rules:
-  rules1:
-    svn: {dev: 'https://alufr-ros-pkg.googlecode.com/svn/trunk/$STACK_NAME', distro-tag: 'https://alufr-ros-pkg.googlecode.com/svn/tags/distros/$RELEASE_NAME/stacks/$STACK_NAME',
-      release-tag: 'https://alufr-ros-pkg.googlecode.com/svn/tags/stacks/$STACK_NAME/$STACK_NAME-$STACK_VERSION'}
-release: diamondback
-stacks:
-  stack1: {_rules: rules1, version: 0.3.0}
-variants: string
-version: 1
diff --git a/test/rosdistro/bad3.rosdistro b/test/rosdistro/bad3.rosdistro
deleted file mode 100644
index 39b50f7..0000000
--- a/test/rosdistro/bad3.rosdistro
+++ /dev/null
@@ -1,9 +0,0 @@
-_rules:
-  rules1:
-    svn: {dev: 'https://alufr-ros-pkg.googlecode.com/svn/trunk/$STACK_NAME', distro-tag: 'https://alufr-ros-pkg.googlecode.com/svn/tags/distros/$RELEASE_NAME/stacks/$STACK_NAME',
-      release-tag: 'https://alufr-ros-pkg.googlecode.com/svn/tags/stacks/$STACK_NAME/$STACK_NAME-$STACK_VERSION'}
-release: diamondback
-variants:
-- base:
-    stacks: [stack1]
-version: 1
diff --git a/test/rosdistro/bad4.rosdistro b/test/rosdistro/bad4.rosdistro
deleted file mode 100644
index bf2d6cf..0000000
--- a/test/rosdistro/bad4.rosdistro
+++ /dev/null
@@ -1,11 +0,0 @@
-_rules:
-  rules1:
-    svn: {dev: 'https://alufr-ros-pkg.googlecode.com/svn/trunk/$STACK_NAME', distro-tag: 'https://alufr-ros-pkg.googlecode.com/svn/tags/distros/$RELEASE_NAME/stacks/$STACK_NAME',
-      release-tag: 'https://alufr-ros-pkg.googlecode.com/svn/tags/stacks/$STACK_NAME/$STACK_NAME-$STACK_VERSION'}
-release: diamondback
-stacks:
-  stack1: {_rules: rules1, version: 0.3.0}
-variants:
-- base:
-    stacks: [nonexistent]
-version: 1
diff --git a/test/rosdistro/bad5.rosdistro b/test/rosdistro/bad5.rosdistro
deleted file mode 100644
index 39836f3..0000000
--- a/test/rosdistro/bad5.rosdistro
+++ /dev/null
@@ -1,11 +0,0 @@
-_rules:
-  rules1:
-    svn: 
-      bad-key: 'https://alufr-ros-pkg.googlecode.com/svn/trunk/$STACK_NAME'
-release: diamondback
-stacks:
-  stack1: {_rules: rules1, version: 0.3.0}
-variants:
-- base:
-    stacks: [stack1]
-version: 1
diff --git a/test/rosdistro/bad6.rosdistro b/test/rosdistro/bad6.rosdistro
deleted file mode 100644
index ca3d0d5..0000000
--- a/test/rosdistro/bad6.rosdistro
+++ /dev/null
@@ -1,6 +0,0 @@
-;ljkasdf l
-cv'l asdfp 
-asdfl'j: ; asdfij
-q;lerj: paevm 
-zpcv;akldjf[oq er l;kfna
-a;dlfja
\ No newline at end of file
diff --git a/test/rosdistro/bad7.rosdistro b/test/rosdistro/bad7.rosdistro
deleted file mode 100644
index f4353a1..0000000
--- a/test/rosdistro/bad7.rosdistro
+++ /dev/null
@@ -1,11 +0,0 @@
-_rules:
-  rules1:
-    svn: {dev: 'https://simple.com/svn/trunk/$STACK_NAME', distro-tag: 'https://simple.com/svn/tags/distros/$RELEASE_NAME/stacks/$STACK_NAME',
-      release-tag: 'https://simple.com/svn/tags/stacks/$STACK_NAME/$STACK_NAME-$STACK_VERSION'}
-release: simple
-stacks:
-  stack1: {version: 0.3.0}
-variants:
-- base:
-    stacks: [stack1]
-version: 1
diff --git a/test/rosdistro/bad8.rosdistro b/test/rosdistro/bad8.rosdistro
deleted file mode 100644
index ee74ef5..0000000
--- a/test/rosdistro/bad8.rosdistro
+++ /dev/null
@@ -1,11 +0,0 @@
-_rules:
-  rules1:
-    svn: {dev: 'https://simple.com/svn/trunk/$STACK_NAME', distro-tag: 'https://simple.com/svn/tags/distros/$RELEASE_NAME/stacks/$STACK_NAME',
-      release-tag: 'https://simple.com/svn/tags/stacks/$STACK_NAME/$STACK_NAME-$STACK_VERSION'}
-release: simple
-stacks:
-  stack1: {_rules: nonexistent, version: 0.3.0}
-variants:
-- base:
-    stacks: [stack1]
-version: 1
diff --git a/test/rosdistro/bad9.rosdistro b/test/rosdistro/bad9.rosdistro
deleted file mode 100644
index d85160a..0000000
--- a/test/rosdistro/bad9.rosdistro
+++ /dev/null
@@ -1,11 +0,0 @@
-_rules:
-  rules1:
-    svn: {dev: 'https://simple.com/svn/trunk/$STACK_NAME', distro-tag: 'https://simple.com/svn/tags/distros/$RELEASE_NAME/stacks/$STACK_NAME',
-      release-tag: 'https://simple.com/svn/tags/stacks/$STACK_NAME/$STACK_NAME-$STACK_VERSION'}
-release: simple
-stacks:
-  stack1: {_rules: 1, version: 0.3.0}
-variants:
-- base:
-    stacks: [stack1]
-version: 1
diff --git a/test/rosdistro/diamondback.rosdistro b/test/rosdistro/diamondback.rosdistro
deleted file mode 100644
index b2f95d8..0000000
--- a/test/rosdistro/diamondback.rosdistro
+++ /dev/null
@@ -1,397 +0,0 @@
-_rules:
-  alufr-ros-pkg:
-    svn: {dev: 'https://alufr-ros-pkg.googlecode.com/svn/trunk/$STACK_NAME', distro-tag: 'https://alufr-ros-pkg.googlecode.com/svn/tags/distros/$RELEASE_NAME/stacks/$STACK_NAME',
-      release-tag: 'https://alufr-ros-pkg.googlecode.com/svn/tags/stacks/$STACK_NAME/$STACK_NAME-$STACK_VERSION'}
-  arm_navigation_0_3:
-    repo: wg-ros-pkg
-    svn: {dev: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/branches/arm_navigation_0_3',
-      distro-tag: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/tags/$RELEASE_NAME',
-      release-tag: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/tags/$STACK_NAME-$STACK_VERSION'}
-  bosch-ros-pkg:
-    repo: bosch-ros-pkg
-    svn: {dev: 'https://bosch-ros-pkg.svn.sourceforge.net/svnroot/bosch-ros-pkg/trunk/stacks/$STACK_NAME',
-      distro-tag: 'https://bosch-ros-pkg.svn.sourceforge.net/svnroot/bosch-ros-pkg/tags/distros/$RELEASE_NAME/stacks/$STACK_NAME',
-      release-tag: 'https://bosch-ros-pkg.svn.sourceforge.net/svnroot/bosch-ros-pkg/tags/stacks/$STACK_NAME/$STACK_NAME-$STACK_VERSION'}
-  cart_pushing:
-    repo: wg-ros-pkg
-    svn: {dev: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/branches/cart_branch',
-      distro-tag: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/tags/$RELEASE_NAME',
-      release-tag: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/tags/$STACK_NAME-$STACK_VERSION'}
-  cob:
-    git: {anon-uri: 'https://github.com/ipa320/$STACK_NAME.git', dev-branch: release,
-      distro-tag: $RELEASE_NAME, release-tag: $STACK_NAME-$STACK_VERSION, uri: 'git@github.com:ipa320/$STACK_NAME.git'}
-    repo: care-o-bot
-  kul-ros-pkg:
-    repo: kul-ros-pkg
-    svn: {anon-dev: 'http://svn.mech.kuleuven.be/repos/orocos/trunk/kul-ros-pkg/stacks/$STACK_NAME/trunk',
-      anon-distro-tag: 'http://svn.mech.kuleuven.be/repos/orocos/trunk/kul-ros-pkg/stacks/$STACK_NAME/tags/$RELEASE_NAME',
-      anon-release-tag: 'http://svn.mech.kuleuven.be/repos/orocos/trunk/kul-ros-pkg/stacks/$STACK_NAME/tags/$STACK_NAME-$STACK_VERSION',
-      dev: 'https://svn.mech.kuleuven.be/repos/orocos/trunk/kul-ros-pkg/stacks/$STACK_NAME/trunk',
-      distro-tag: 'https://svn.mech.kuleuven.be/repos/orocos/trunk/kul-ros-pkg/stacks/$STACK_NAME/tags/$RELEASE_NAME',
-      release-tag: 'https://svn.mech.kuleuven.be/repos/orocos/trunk/kul-ros-pkg/stacks/$STACK_NAME/tags/$STACK_NAME-$STACK_VERSION'}
-  linux_networking:
-    repo: ros-pkg
-    svn: {dev: 'https://code.ros.org/svn/ros-pkg/stacks/$STACK_NAME/trunk', distro-tag: 'https://code.ros.org/svn/ros-pkg/stacks/$STACK_NAME/tags/$RELEASE_NAME',
-      release-tag: 'https://code.ros.org/svn/ros-pkg/stacks/$STACK_NAME/tags/$STACK_NAME-$STACK_VERSION'}
-  manipulation-0.2:
-    repo: wg-ros-pkg
-    svn: {dev: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/branches/$STACK_NAME-0.2.0-branch',
-      distro-tag: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/tags/$RELEASE_NAME',
-      release-tag: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/tags/$STACK_NAME-$STACK_VERSION'}
-  manipulation-0.3:
-    repo: wg-ros-pkg
-    svn: {dev: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/branches/$STACK_NAME-0.3.0-branch',
-      distro-tag: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/tags/$RELEASE_NAME',
-      release-tag: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/tags/$STACK_NAME-$STACK_VERSION'}
-  motion_planners_unstable_prerelease:
-    repo: wg-ros-pkg
-    svn: {dev: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/branches/into_unstable',
-      distro-tag: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/tags/$RELEASE_NAME',
-      release-tag: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/tags/$STACK_NAME-$STACK_VERSION'}
-  orocos_toolchain_ros:
-    git: {anon-uri: 'http://git.mech.kuleuven.be/robotics/orocos_toolchain_ros.git',
-      dev-branch: unstable_next, distro-tag: $RELEASE_NAME, release-tag: $STACK_NAME-$STACK_VERSION,
-      uri: 'git@git.mech.kuleuven.be:robotics/orocos_toolchain_ros.git'}
-    repo: kul-ros-pkg
-  ros-1.2:
-    repo: ros
-    svn: {dev: 'https://code.ros.org/svn/ros/stacks/$STACK_NAME/branches/$STACK_NAME-1.2',
-      distro-tag: 'https://code.ros.org/svn/ros/stacks/$STACK_NAME/tags/$RELEASE_NAME',
-      release-tag: 'https://code.ros.org/svn/ros/stacks/$STACK_NAME/tags/$STACK_NAME-$STACK_VERSION'}
-  ros-pkg-1.2:
-    repo: ros-pkg
-    svn: {dev: 'https://code.ros.org/svn/ros-pkg/stacks/$STACK_NAME/branches/$STACK_NAME-1.2',
-      distro-tag: 'https://code.ros.org/svn/ros-pkg/stacks/$STACK_NAME/tags/$RELEASE_NAME',
-      release-tag: 'https://code.ros.org/svn/ros-pkg/stacks/$STACK_NAME/tags/$STACK_NAME-$STACK_VERSION'}
-  ros-pkg-1.4:
-    repo: ros-pkg
-    svn: {dev: 'https://code.ros.org/svn/ros-pkg/stacks/$STACK_NAME/branches/$STACK_NAME-1.4',
-      distro-tag: 'https://code.ros.org/svn/ros-pkg/stacks/$STACK_NAME/tags/$RELEASE_NAME',
-      release-tag: 'https://code.ros.org/svn/ros-pkg/stacks/$STACK_NAME/tags/$STACK_NAME-$STACK_VERSION'}
-  ros-pkg-trunk:
-    repo: ros-pkg
-    svn: {dev: 'https://code.ros.org/svn/ros-pkg/stacks/$STACK_NAME/trunk', distro-tag: 'https://code.ros.org/svn/ros-pkg/stacks/$STACK_NAME/tags/$RELEASE_NAME',
-      release-tag: 'https://code.ros.org/svn/ros-pkg/stacks/$STACK_NAME/tags/$STACK_NAME-$STACK_VERSION'}
-  ros-pkg-unstable:
-    repo: ros-pkg
-    svn: {dev: 'https://code.ros.org/svn/ros-pkg/stacks/$STACK_NAME/branches/unstable-branch',
-      distro-tag: 'https://code.ros.org/svn/ros-pkg/stacks/$STACK_NAME/tags/$RELEASE_NAME',
-      release-tag: 'https://code.ros.org/svn/ros-pkg/stacks/$STACK_NAME/tags/$STACK_NAME-$STACK_VERSION'}
-  ros-trunk:
-    repo: ros
-    svn: {dev: 'https://code.ros.org/svn/ros/stacks/$STACK_NAME/trunk', distro-tag: 'https://code.ros.org/svn/ros/stacks/$STACK_NAME/tags/$RELEASE_NAME',
-      release-tag: 'https://code.ros.org/svn/ros/stacks/$STACK_NAME/tags/$STACK_NAME-$STACK_VERSION'}
-  ros_lib_fix:
-    repo: wg-ros-pkg
-    svn: {dev: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/branches/ros_lib_fix',
-      distro-tag: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/tags/$RELEASE_NAME',
-      release-tag: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/tags/$STACK_NAME-$STACK_VERSION'}
-  ua-ros-pkg:
-    repo: ua-ros-pkg
-    svn: {dev: 'https://ua-ros-pkg.googlecode.com/svn/stacks/$STACK_NAME/trunk', distro-tag: 'https://ua-ros-pkg.googlecode.com/svn/stacks/$STACK_NAME/tags/$RELEASE_NAME',
-      release-tag: 'https://ua-ros-pkg.googlecode.com/svn/stacks/$STACK_NAME/tags/$STACK_NAME-$STACK_VERSION'}
-  utexas-art-ros-pkg:
-    repo: utexax-ros-pkg
-    svn: {dev: 'https://utexas-art-ros-pkg.googlecode.com/svn/trunk/stacks/$STACK_NAME',
-      distro-tag: 'https://utexas-art-ros-pkg.googlecode.com/svn/tags/distros/$RELEASE_NAME/stacks/$STACK_NAME',
-      release-tag: 'https://utexas-art-ros-pkg.googlecode.com/svn/tags/stacks/$STACK_NAME/$STACK_NAME-$STACK_VERSION'}
-  wg-ros-pkg-1.2:
-    repo: wg-ros-pkg
-    svn: {dev: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/branches/$STACK_NAME-1.2',
-      distro-tag: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/tags/$RELEASE_NAME',
-      release-tag: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/tags/$STACK_NAME-$STACK_VERSION'}
-  wg-ros-pkg-1.3:
-    repo: wg-ros-pkg
-    svn: {dev: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/branches/$STACK_NAME-1.3',
-      distro-tag: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/tags/$RELEASE_NAME',
-      release-tag: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/tags/$STACK_NAME-$STACK_VERSION'}
-  wg-ros-pkg-trunk:
-    repo: wg-ros-pkg
-    svn: {dev: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/trunk', distro-tag: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/tags/$RELEASE_NAME',
-      release-tag: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/tags/$STACK_NAME-$STACK_VERSION'}
-release: diamondback
-stacks:
-  _rules: ros-pkg-trunk
-  arm_navigation: {_rules: wg-ros-pkg-trunk, version: 0.3.0}
-  art_vehicle: {_rules: utexas-art-ros-pkg, version: 0.3.2}
-  articulation: {_rules: alufr-ros-pkg, version: 0.1.1}
-  bosch_drivers: {_rules: bosch-ros-pkg, version: 0.1.1}
-  bosch_skin: {_rules: bosch-ros-pkg, version: null}
-  camera_drivers: {version: 1.3.2}
-  cart_pushing: {_rules: wg-ros-pkg-trunk, version: 0.1.1}
-  client_rosjava:
-    _rules:
-      git: {anon-uri: 'git://code.in.tum.de/git/client-rosjava.git', dev-branch: master,
-        distro-tag: $RELEASE_NAME_released, release-tag: $STACK_NAME-$STACK_VERSION,
-        uri: 'indefero@code.in.tum.de:client-rosjava'}
-      repo: ros-pkg
-    version: 0.1.2
-  cob_apps: {_rules: cob, version: 0.1.0}
-  cob_common: {_rules: cob, version: 0.1.0}
-  cob_driver: {_rules: cob, version: null}
-  cob_extern: {_rules: cob, version: 0.1.0}
-  cob_simulation: {_rules: cob, version: null}
-  collision_environment: {_rules: motion_planners_unstable_prerelease, version: 0.3.1}
-  common: {version: 1.3.3}
-  common_msgs: {version: 1.3.5}
-  common_tutorials: {_rules: ros-pkg-trunk, version: 0.1.2}
-  continuous_ops:
-    _rules:
-      hg: {dev-branch: default, distro-tag: $RELEASE_NAME, release-tag: $STACK_NAME-$STACK_VERSION,
-        uri: 'https://continuous-ops.hg-ros-pkg.googlecode.com/hg/'}
-      repo: wg-ros-pkg
-    version: 0.1.0
-  control:
-    _rules:
-      hg: {anon-uri: 'https://bitbucket.org/sglaser/control', dev-branch: default,
-        distro-tag: $RELEASE_NAME, release-tag: $STACK_NAME-$STACK_VERSION, uri: 'ssh://hg@bitbucket.org/sglaser/control'}
-      repo: ros-pkg
-      version: null
-    version: 0.1.0
-  cram_pl:
-    _rules:
-      git: {anon-uri: 'git://code.in.tum.de/git/cram-pl', dev-branch: master, distro-tag: $RELEASE_NAME_released,
-        release-tag: $STACK_NAME-$STACK_VERSION, uri: 'indefero@code.in.tum.de:cram-pl'}
-      repo: tum-ros-pkg
-    version: 0.1.1
-  diagnostics: {version: 1.2.5}
-  documentation: {_rules: ros-trunk, version: 1.3.0}
-  driver_common: {version: 1.2.3}
-  erratic_robot: {_rules: ua-ros-pkg, version: 0.1.0}
-  ethzasl_aseba:
-    _rules:
-      git: {anon-uri: 'https://github.com/ethz-asl/ros-aseba.git', dev-branch: master,
-        distro-tag: $RELEASE_NAME_released, release-tag: $STACK_NAME-$STACK_VERSION,
-        uri: 'git@github.com:ethz-asl/ros-aseba.git'}
-    version: 0.8.0
-  ethzasl_message_transport:
-    _rules:
-      git: {anon-uri: 'https://github.com/ethz-asl/ros-message-transport.git', dev-branch: master,
-        distro-tag: $RELEASE_NAME_released, release-tag: $STACK_NAME-$STACK_VERSION,
-        uri: 'git@github.com:ethz-asl/ros-message-transport.git'}
-    version: 0.7.0
-  executive_smach: {version: 1.0.0}
-  exploration: {_rules: bosch-ros-pkg, version: 0.2.0}
-  freiburg_tools: {_rules: alufr-ros-pkg, version: 0.1.2}
-  geometry:
-    _rules:
-      hg: {dev-branch: tf_rework, distro-tag: $RELEASE_NAME, release-tag: $STACK_NAME-$STACK_VERSION,
-        uri: 'https://ros-geometry.googlecode.com/hg/'}
-      repo: ros-pkg
-    version: 1.3.1
-  geometry_experimental:
-    _rules:
-      hg: {dev-branch: non_optimized, distro-tag: $RELEASE_NAME, release-tag: $STACK_NAME-$STACK_VERSION,
-        uri: 'https://ros-geometry-experimental.googlecode.com/hg/'}
-      repo: ros-pkg
-    version: 0.1.0
-  geometry_tutorials: {_rules: ros-pkg-trunk, version: 0.1.1}
-  graph_mapping: {_rules: ros-pkg-unstable, version: null}
-  ias_common:
-    _rules:
-      git: {anon-uri: 'git://code.in.tum.de/git/ias-common.git', dev-branch: master,
-        distro-tag: $RELEASE_NAME_released, release-tag: $STACK_NAME-$STACK_VERSION,
-        uri: 'indefero@code.in.tum.de:ias-common.git'}
-      repo: tum-ros-pkg
-    version: 0.1.0
-  image_common: {version: 1.3.1}
-  image_pipeline: {version: 1.3.0}
-  image_transport_plugins: {version: 1.3.1}
-  imu_drivers: {version: 1.2.1}
-  joystick_drivers: {version: 1.2.2}
-  joystick_drivers_tutorials: {version: 1.2.2}
-  kinect:
-    _rules:
-      git: {anon-uri: 'https://github.com/ros-pkg-git/kinect.git', dev-branch: master,
-        distro-tag: $RELEASE_NAME_released, release-tag: $STACK_NAME-$STACK_VERSION,
-        uri: 'git@github.com:ros-pkg-git/kinect.git'}
-      repo: ros-pkg
-    version: 0.1.6
-  kinematics: {_rules: wg-ros-pkg-trunk, version: 0.3.0}
-  knowrob:
-    _rules:
-      repo: tum-ros-pkg
-      svn: {anon-dev: 'http://code.in.tum.de/pubsvn/knowrob/branches/release', anon-distro-tag: 'http://code.in.tum.de/pubsvn/knowrob/tags/$RELEASE_NAME',
-        anon-release-tag: 'http://code.in.tum.de/pubsvn/knowrob/tags/$STACK_NAME-$STACK_VERSION',
-        dev: 'http://code.in.tum.de/svn/knowrob/branches/release', distro-tag: 'http://code.in.tum.de/svn/knowrob/tags/$RELEASE_NAME',
-        release-tag: 'http://code.in.tum.de/svn/knowrob/tags/$STACK_NAME-$STACK_VERSION'}
-    version: null
-  laser_drivers: {version: 1.2.2}
-  laser_pipeline: {version: 1.0.2}
-  linux_networking: {_rules: linux_networking, version: 0.1.6}
-  mapping:
-    _rules:
-      git: {anon-uri: 'git://code.in.tum.de/git/mapping.git', dev-branch: master,
-        distro-tag: $RELEASE_NAME_released, release-tag: $STACK_NAME-$STACK_VERSION,
-        uri: 'indefero@code.in.tum.de:mapping.git'}
-      repo: tum-ros-pkg
-    version: null
-  motion_planners: {_rules: wg-ros-pkg-trunk, version: 0.3.1}
-  motion_planning_common: {_rules: motion_planners_unstable_prerelease, version: 0.3.1}
-  motion_planning_environment: {_rules: motion_planners_unstable_prerelease, version: 0.3.1}
-  motion_planning_visualization: {_rules: motion_planners_unstable_prerelease, version: 0.3.1}
-  mpi: {_rules: wg-ros-pkg-trunk, version: null}
-  multimaster_experimental: {_rules: ros-trunk, version: 0.1.0}
-  navigation: {_rules: ros-pkg-trunk, version: 1.3.1}
-  navigation_experimental: {version: 0.1.4}
-  nxt:
-    _rules:
-      hg: {dev-branch: default, distro-tag: $RELEASE_NAME, release-tag: $STACK_NAME-$STACK_VERSION,
-        uri: 'https://stack-nxt.foote-ros-pkg.googlecode.com/hg'}
-      repo: foote-ros-pkg
-    version: 0.1.1
-  nxt_apps:
-    _rules:
-      hg: {dev-branch: default, distro-tag: $RELEASE_NAME, release-tag: $STACK_NAME-$STACK_VERSION,
-        uri: 'https://stack-nxt-apps.foote-ros-pkg.googlecode.com/hg'}
-      repo: foote-ros-pkg
-      version: 0.1.0
-    version: 0.1.1
-  nxt_robots:
-    _rules:
-      hg: {dev-branch: default, distro-tag: $RELEASE_NAME, release-tag: $STACK_NAME-$STACK_VERSION,
-        uri: 'https://stack-nxt-robots.foote-ros-pkg.googlecode.com/hg'}
-      repo: foote-ros-pkg
-      version: 0.1.0
-    version: 0.1.2
-  object_manipulation: {_rules: arm_navigation_0_3, version: 0.3.0}
-  ocr: {_rules: bosch-ros-pkg, version: null}
-  octomap_mapping: {_rules: alufr-ros-pkg, version: 0.1.2}
-  orocos_toolchain_ros: {_rules: orocos_toolchain_ros, version: 0.1.9}
-  pano: {_rules: ros-pkg-trunk, version: null}
-  people: {_rules: wg-ros-pkg-trunk, version: null}
-  perception_pcl: {version: 0.7.1}
-  perception_pcl_addons: {version: 0.2.0}
-  physics_ode: {version: 1.2.8}
-  point_cloud_perception: {version: 0.5.2}
-  pr2_apps: {_rules: wg-ros-pkg-trunk, version: 0.3.0}
-  pr2_arm_navigation: {_rules: motion_planners_unstable_prerelease, version: 0.3.1}
-  pr2_arm_navigation_apps: {_rules: motion_planners_unstable_prerelease, version: 0.3.1}
-  pr2_arm_navigation_tests: {_rules: wg-ros-pkg-trunk, version: 0.3.0}
-  pr2_calibration: {_rules: wg-ros-pkg-trunk, version: 0.5.0}
-  pr2_cockpit: {_rules: wg-ros-pkg-trunk, version: 0.2.3}
-  pr2_common: {_rules: wg-ros-pkg-trunk, version: 1.3.1}
-  pr2_common_actions: {_rules: wg-ros-pkg-trunk, version: 0.3.2}
-  pr2_common_alpha: {_rules: wg-ros-pkg-trunk, version: 0.1.2}
-  pr2_controllers: {_rules: wg-ros-pkg-trunk, version: 1.3.1}
-  pr2_doors: {_rules: wg-ros-pkg-trunk, version: 0.3.9}
-  pr2_ethercat_drivers: {_rules: wg-ros-pkg-1.3, version: 1.3.2}
-  pr2_exploration: {_rules: bosch-ros-pkg, version: 0.1.0}
-  pr2_gui: {_rules: wg-ros-pkg-trunk, version: 1.0.2}
-  pr2_kinematics: {_rules: motion_planners_unstable_prerelease, version: 0.3.1}
-  pr2_kinematics_with_constraints: {_rules: motion_planners_unstable_prerelease, version: 0.3.1}
-  pr2_mechanism: {_rules: wg-ros-pkg-trunk, version: 1.4.0}
-  pr2_navigation:
-    _rules:
-      repo: wg-ros-pkg
-      svn: {dev: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/branches/cturtle_branch',
-        distro-tag: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/tags/$RELEASE_NAME',
-        release-tag: 'https://code.ros.org/svn/wg-ros-pkg/stacks/$STACK_NAME/tags/$STACK_NAME-$STACK_VERSION'}
-    version: 0.1.5
-  pr2_navigation_apps: {_rules: wg-ros-pkg-trunk, version: 0.1.1}
-  pr2_object_manipulation: {_rules: arm_navigation_0_3, version: 0.3.0}
-  pr2_plugs: {_rules: wg-ros-pkg-trunk, version: 0.3.11}
-  pr2_power_drivers: {_rules: wg-ros-pkg-trunk, version: 1.0.8}
-  pr2_robot: {_rules: wg-ros-pkg-trunk, version: 1.1.0}
-  pr2_self_test: {_rules: wg-ros-pkg-trunk, version: 0.3.1}
-  pr2_simulator: {_rules: wg-ros-pkg-trunk, version: 1.3.2}
-  pr2_tabletop_manipulation_apps: {_rules: arm_navigation_0_3, version: 0.3.0}
-  pr2_web_apps: {_rules: wg-ros-pkg-trunk, version: 0.3.11}
-  robot_calibration: {version: 0.3.2}
-  robot_model: {_rules: ros-pkg-1.4, version: 1.4.0}
-  ros: {_rules: ros-trunk, version: 1.4.0}
-  ros_applications:
-    _rules:
-      hg: {dev-branch: default, distro-tag: $RELEASE_NAME, release-tag: $STACK_NAME-$STACK_VERSION,
-        uri: 'https://ros-applications.hg-ros-pkg.googlecode.com/hg/'}
-      repo: wg-ros-pkg
-    version: 0.1.0
-  ros_comm: {_rules: ros-trunk, version: 1.3.4}
-  ros_realtime: {_rules: ros-trunk, version: 0.5.1}
-  ros_release: {_rules: ros-trunk, version: 0.1.7}
-  ros_tutorials: {_rules: ros-trunk, version: 0.2.3}
-  roshpit: {_rules: ros-trunk, version: 0.2.3}
-  roslisp_common: {_rules: ros-pkg-trunk, version: 0.1.2}
-  roslisp_support: {_rules: ros-trunk, version: 0.2.11}
-  rx: {_rules: ros-trunk, version: 1.4.0}
-  simulator_gazebo: {version: 1.2.8}
-  simulator_stage: {version: 1.2.2}
-  slam_gmapping: {version: 1.2.2}
-  slam_karto: {_rules: ros-pkg-trunk, version: null}
-  sound_drivers: {version: 1.2.1}
-  sql_database: {_rules: manipulation-0.2, version: 0.2.2}
-  tabletop_object_perception: {_rules: manipulation-0.3, version: 0.3.1}
-  topological_navigation: {_rules: wg-ros-pkg-trunk, version: null}
-  trajectory_filters: {_rules: wg-ros-pkg-trunk, version: 0.3.0}
-  velodyne: {_rules: utexas-art-ros-pkg, version: 0.2.5}
-  vision_opencv: {version: 1.3.6}
-  visualization: {_rules: ros-pkg-1.4, version: 1.3.2}
-  visualization_common: {version: 1.3.2}
-  visualization_tutorials: {version: 0.2.2}
-  vslam: {version: 0.2.2}
-  web_interface: {_rules: wg-ros-pkg-trunk, version: 0.4.3}
-  wg_common: {_rules: wg-ros-pkg-trunk, version: 0.1.3}
-  wg_hardware_test: {_rules: wg-ros-pkg-trunk, version: null}
-  wg_pr2_apps: {_rules: wg-ros-pkg-trunk, version: 0.1.2}
-  wg_robots_gazebo: {_rules: wg-ros-pkg-trunk, version: 0.1.0}
-  wifi_drivers: {_rules: wg-ros-pkg-trunk, version: 0.1.3}
-variants:
-- ros-base:
-    stacks: [ros, ros_comm]
-- ros-full:
-    extends: ros-base
-    stacks: [rx, documentation]
-- viz:
-    stacks: [visualization_common, visualization]
-- robot:
-    extends: ros-base
-    stacks: [common_msgs, common, diagnostics, driver_common, geometry, 
-      robot_model, executive_smach]
-- simulators:
-    extends: [robot]
-    stacks: [simulator_stage, simulator_gazebo, physics_ode]
-- mobile:
-    extends: [robot]
-    stacks: [navigation, slam_gmapping]
-- perception:
-    extends: [ros-base]
-    stacks: [image_common, image_transport_plugins, image_pipeline, laser_pipeline, perception_pcl, vision_opencv]
-- desktop:
-    extends: [robot, viz]
-    stacks: [ros_tutorials, common_tutorials, geometry_tutorials, visualization_tutorials]
-- desktop-full:
-    extends: [desktop, mobile, perception, simulators]
-- move-arm:
-    stacks: [arm_navigation, kinematics, motion_planners, motion_planning_common,
-      object_manipulation, trajectory_filters]
-- pr2-base:
-    extends: [mobile, perception, move-arm]
-    stacks: [pr2_common, pr2_controllers, pr2_mechanism, pr2_robot, web_interface, pr2_calibration, pr2_navigation, pr2_kinematics, pr2_arm_navigation, pr2_arm_navigation_tests, pr2_object_manipulation, pr2_tabletop_manipulation_apps, tabletop_object_perception, sql_database]
-- pr2:
-    extends: [pr2-base]
-    stacks: [pr2_ethercat_drivers, 
-      pr2_power_drivers, camera_drivers, laser_drivers, sound_drivers, wifi_drivers]
-- pr2-desktop:
-    extends: [desktop-full, pr2-base]
-    stacks: [pr2_gui, pr2_simulator]
-- pr2-applications:
-    extends: pr2
-    stacks: [pr2_apps, pr2_common_actions, pr2_doors, pr2_navigation_apps,
-      pr2_plugs, pr2_self_test, pr2_web_apps]
-- wg-pr2:
-    extends: [pr2, pr2-applications]
-    stacks: [wg_common, wg_pr2_apps]
-- care-o-bot:
-    stacks: [cob_extern, cob_common, cob_driver, cob_simulation, cob_apps]
-- bosch:
-    stacks: [bosch_drivers, bosch_skin, exploration, ocr, pr2_exploration]
-- nxtall:
-    stacks: [nxt, nxt_apps, nxt_robots]
-- alufr:
-    stacks: [freiburg_tools, articulation, octomap_mapping]
-- utexas-art:
-    extends: [ros-base]
-    stacks: [art_vehicle, velodyne]
-- tum:
-    stacks: [cram_pl, mapping]
-version: '$Revision: 8596 $'
diff --git a/test/rosdistro/empty_variants.rosdistro b/test/rosdistro/empty_variants.rosdistro
deleted file mode 100644
index bd52097..0000000
--- a/test/rosdistro/empty_variants.rosdistro
+++ /dev/null
@@ -1,9 +0,0 @@
-_rules:
-  rules1:
-    svn: {dev: 'https://simple.com/svn/trunk/$STACK_NAME', distro-tag: 'https://simple.com/svn/tags/distros/$RELEASE_NAME/stacks/$STACK_NAME',
-      release-tag: 'https://simple.com/svn/tags/stacks/$STACK_NAME/$STACK_NAME-$STACK_VERSION'}
-release: simple
-stacks:
-  stack1: {_rules: rules1, version: 0.3.0}
-variants:
-version: 1
diff --git a/test/rosdistro/no_variants.rosdistro b/test/rosdistro/no_variants.rosdistro
deleted file mode 100644
index d133a24..0000000
--- a/test/rosdistro/no_variants.rosdistro
+++ /dev/null
@@ -1,8 +0,0 @@
-_rules:
-  rules1:
-    svn: {dev: 'https://simple.com/svn/trunk/$STACK_NAME', distro-tag: 'https://simple.com/svn/tags/distros/$RELEASE_NAME/stacks/$STACK_NAME',
-      release-tag: 'https://simple.com/svn/tags/stacks/$STACK_NAME/$STACK_NAME-$STACK_VERSION'}
-release: simple
-stacks:
-  stack1: {_rules: rules1, version: 0.3.0}
-version: 1
diff --git a/test/rosdistro/roscore-bad.xml b/test/rosdistro/roscore-bad.xml
deleted file mode 100644
index 753ba36..0000000
--- a/test/rosdistro/roscore-bad.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- 
-  ROS Core Stack definition
-
-  Before making any modifications to this file, please read:
-  http://ros.org/wiki/roscore
-  -->
-<launch
diff --git a/test/rosdistro/roscore-electric.xml b/test/rosdistro/roscore-electric.xml
deleted file mode 100644
index 1687c9d..0000000
--- a/test/rosdistro/roscore-electric.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- 
-  ROS Core Stack definition
-
-  Before making any modifications to this file, please read:
-  http://ros.org/wiki/roscore
-  -->
-<launch>
-  <param name="rosversion" value="1.6.6" />
-  <param name="rosdistro" value="electric" />
-  <node pkg="rosout" type="rosout" name="rosout" respawn="true"/>
-</launch>
diff --git a/test/rosdistro/simple.rosdistro b/test/rosdistro/simple.rosdistro
deleted file mode 100644
index 5e36b2f..0000000
--- a/test/rosdistro/simple.rosdistro
+++ /dev/null
@@ -1,11 +0,0 @@
-_rules:
-  rules1:
-    svn: {dev: 'https://simple.com/svn/trunk/$STACK_NAME', distro-tag: 'https://simple.com/svn/tags/distros/$RELEASE_NAME/stacks/$STACK_NAME',
-      release-tag: 'https://simple.com/svn/tags/stacks/$STACK_NAME/$STACK_NAME-$STACK_VERSION'}
-release: simple
-stacks:
-  stack1: {_rules: rules1, version: 0.3.0}
-variants:
-- base:
-    stacks: [stack1]
-version: 1
diff --git a/test/stack_tests/s1/bar/CMakeLists.txt b/test/stack_tests/s1/bar/CMakeLists.txt
deleted file mode 100644
index de39b01..0000000
--- a/test/stack_tests/s1/bar/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-cmake_minimum_required(VERSION 2.4.6)
-include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
-set(ROSPACK_MAKEDIST true)
-rosbuild_make_distribution(1.5.0-cmake)
diff --git a/test/stack_tests/s1/bar/bar_pkg/manifest.xml b/test/stack_tests/s1/bar/bar_pkg/manifest.xml
deleted file mode 100644
index e06ac24..0000000
--- a/test/stack_tests/s1/bar/bar_pkg/manifest.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<package>
-  <description brief="bar_pkg">
-
-     bar_pkg
-
-  </description>
-  <author>Ken Conley</author>
-  <license>BSD</license>
-  <review status="unreviewed" notes=""/>
-  <url>http://ros.org/wiki/bar_pkg</url>
-
-</package>
-
-
diff --git a/test/stack_tests/s1/bar/stack.xml b/test/stack_tests/s1/bar/stack.xml
deleted file mode 100644
index 2b45ba4..0000000
--- a/test/stack_tests/s1/bar/stack.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<stack>
-  <name>bar</name>
-  <description brief="bar">
-     bar
-  </description>
-  <author>Ken Conley</author>
-  <license>BSD</license>
-  <copyright>Willow Garage</copyright>
-  <depend stack="foo" />
-</stack>
-
-
diff --git a/test/stack_tests/s1/foo/CMakeLists.txt b/test/stack_tests/s1/foo/CMakeLists.txt
deleted file mode 100644
index de39b01..0000000
--- a/test/stack_tests/s1/foo/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-cmake_minimum_required(VERSION 2.4.6)
-include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
-set(ROSPACK_MAKEDIST true)
-rosbuild_make_distribution(1.5.0-cmake)
diff --git a/test/stack_tests/s1/foo/foo_pkg/manifest.xml b/test/stack_tests/s1/foo/foo_pkg/manifest.xml
deleted file mode 100644
index 19be6cc..0000000
--- a/test/stack_tests/s1/foo/foo_pkg/manifest.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<package>
-  <description brief="foo_pkg">
-
-     foo_pkg
-
-  </description>
-  <author>Ken Conley</author>
-  <license>BSD</license>
-  <review status="unreviewed" notes=""/>
-  <url>http://ros.org/wiki/foo_pkg</url>
-
-</package>
-
-
diff --git a/test/stack_tests/s1/foo/foo_pkg_2/manifest.xml b/test/stack_tests/s1/foo/foo_pkg_2/manifest.xml
deleted file mode 100644
index 05648d8..0000000
--- a/test/stack_tests/s1/foo/foo_pkg_2/manifest.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<package>
-  <description brief="foo_pkg_2">
-
-     foo_pkg_2
-
-  </description>
-  <author>Ken Conley</author>
-  <license>BSD</license>
-  <review status="unreviewed" notes=""/>
-  <url>http://ros.org/wiki/foo_pkg_2</url>
-
-</package>
-
-
diff --git a/test/stack_tests/s1/foo/stack.xml b/test/stack_tests/s1/foo/stack.xml
deleted file mode 100644
index d75a4ff..0000000
--- a/test/stack_tests/s1/foo/stack.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<stack>
-  <name>foo</name>
-  <description brief="foo">
-     foo
-  </description>
-  <author>Ken Conley</author>
-  <version>
-     1.6.0-manifest
-  </version>
-  <license>BSD</license>
-  <copyright>Willow Garage</copyright>
-</stack>
-
-
diff --git a/test/stack_tests/s2/baz/stack.xml b/test/stack_tests/s2/baz/stack.xml
deleted file mode 100644
index a381d02..0000000
--- a/test/stack_tests/s2/baz/stack.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<stack>
-  <name>baz</name>
-  <description brief="foo">
-     foo
-  </description>
-  <version>1-manifest</version>
-  <author>Ken Conley</author>
-  <license>BSD</license>
-  <copyright>Willow Garage</copyright>
-</stack>
-
-
diff --git a/test/stack_tests/s2/baz/stack.yaml b/test/stack_tests/s2/baz/stack.yaml
deleted file mode 100644
index 1f18bd9..0000000
--- a/test/stack_tests/s2/baz/stack.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-Catkin-ProjectName: baz
-Version: 1.7.3-yaml
-Depends: catkin, rospack
-Description: baz
-Author: No One 
-Maintainer: No One <kwc@willowgarage.com>
-Homepage: http://www.ros.org
-
-Catkin-CopyrightType: willowgarage
-Catkin-DebRulesType: cmake
diff --git a/test/stack_tests/s2/foo/CMakeLists.txt b/test/stack_tests/s2/foo/CMakeLists.txt
deleted file mode 100644
index b490d38..0000000
--- a/test/stack_tests/s2/foo/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-#bad value on purpose
-rosbuild_make_distribution(
diff --git a/test/stack_tests/s2/foo/stack.xml b/test/stack_tests/s2/foo/stack.xml
deleted file mode 100644
index 8485426..0000000
--- a/test/stack_tests/s2/foo/stack.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<stack>
-  <description brief="foo">
-     foo
-  </description>
-  <author>Ken Conley</author>
-  <license>BSD</license>
-</stack>
-
-
diff --git a/test/stack_tests/s3/baz/stack.xml b/test/stack_tests/s3/baz/stack.xml
deleted file mode 100644
index e167e98..0000000
--- a/test/stack_tests/s3/baz/stack.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<stack>
-  <description brief="bar">
-     bar
-  </description>
-  <author>Ken Conley</author>
-  <license>BSD</license>
-  <depend stack="foo" />
-  <depend stack="bar" />
-</stack>
-
-
diff --git a/test/unary_tests/unary/manifest.xml b/test/unary_tests/unary/manifest.xml
deleted file mode 100644
index 67a0652..0000000
--- a/test/unary_tests/unary/manifest.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<package>
-  <description brief="unary">
-
-     unary
-
-  </description>
-  <author>Ken Conley</author>
-  <license>BSD</license>
-  <review status="unreviewed" notes=""/>
-  <url>http://ros.org/wiki/unary</url>
-
-</package>
-
-
diff --git a/test/unary_tests/unary/stack.xml b/test/unary_tests/unary/stack.xml
deleted file mode 100644
index 4e55c55..0000000
--- a/test/unary_tests/unary/stack.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<stack>
-  <description brief="unary">
-     unary
-  </description>
-  <author>Ken Conley</author>
-  <license>BSD</license>
-</stack>
-
-

More details

Full run details

Historical runs