[catkin] 02/03: Merge tag 'upstream/0.6.9'

[Jochen Sprickerhof]

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

jspricke-guest pushed a commit to branch master
in repository catkin.

commit 452fa28a660533c01af18c93095f67425eb3746d
Merge: a46008c 44907ec
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Tue Dec 9 11:44:27 2014 +0100

    Merge tag 'upstream/0.6.9'
    
    Upstream version 0.6.9

 .travis.yml                                    |   3 +
 CHANGELOG.rst                                  |  85 +++++++++------
 CMakeLists.txt                                 |  11 +-
 bin/catkin_make                                |   2 +-
 bin/catkin_prepare_release                     |  73 ++++++++++---
 cmake/Modules/eigen-config-version.cmake       |  15 ---
 cmake/Modules/eigen-config.cmake               |  41 --------
 cmake/all.cmake                                |   2 -
 cmake/catkin_generate_environment.cmake        |  28 ++++-
 cmake/em_expand.cmake                          |   6 +-
 cmake/empy.cmake                               |  25 +++--
 cmake/parse_arguments.cmake                    |  43 --------
 cmake/python.cmake                             |  18 ----
 cmake/templates/_setup_util.py                 | 140 -------------------------
 cmake/templates/_setup_util.py.in              |  35 ++++---
 cmake/test/download_test_data.cmake            |  11 --
 cmake/test/gtest.cmake                         |   5 -
 cmake/test/nosetests.cmake                     |  26 ++---
 cmake/tools/doxygen.cmake                      |   7 +-
 doc/adv_user_guide/adv_user_guide.rst          |   1 +
 doc/adv_user_guide/catkin_migration_indigo.rst |  24 +++++
 doc/conf.py                                    |   2 +-
 doc/dev_guide/generated_cmake_api.rst          |  35 -------
 doc/howto/format1/installing_python.rst        |  17 +--
 doc/index.rst                                  |  13 +--
 doc/user_guide/setup_dot_py.rst                |   2 +-
 package.xml                                    |  27 ++---
 python/catkin/builder.py                       |  64 ++++++++---
 test/local_tests/test_with_mock_workspace.py   |   2 +-
 test/unit_tests/test_builder.py                |  32 +++++-
 test/unit_tests/test_parse_package_xml.py      |  28 ++---
 test/unit_tests/test_setup_util.py             |   9 +-
 32 files changed, 347 insertions(+), 485 deletions(-)

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