[catkin] 03/07: Merge from master

[Leopold Palomo-Avellaneda]

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

lepalom-guest pushed a commit to branch debian-robotics
in repository catkin.

commit 137cf384253107ec45d6b7ec579991ed16bb7472
Merge: 9e50fac 3100f16
Author: Leopold Palomo-Avellaneda <leopold.palomo at upc.edu>
Date:   Tue Jan 13 12:36:46 2015 +0100

    Merge from master

 .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 +-
 debian/changelog                                   |   7 +-
 debian/control                                     |  16 ++-
 debian/copyright                                   |   1 +
 .../0002-Add-usr-as-default-workspace-path.patch   |  55 ++++++++
 ...on-t-add-default-paths-to-pkg-config-file.patch |  21 ++++
 .../0004-Export-ROS_PACKAGE_PATH-in-setup.sh.patch |  20 +++
 debian/patches/series                              |   3 +
 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 +-
 39 files changed, 462 insertions(+), 493 deletions(-)

diff --cc debian/changelog
index 7d28873,1b2656c..6d23ba3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,9 +1,22 @@@
- catkin (0.5.89-1) wheezy-robotics; urgency=low
+ catkin (0.6.9-1) UNRELEASED; urgency=low
  
 -  [ Thomas Moulard ]
 -  * Initial release. (Closes: #729048)
 +  [ Jochen Sprickerhof ]
-   * Imported Upstream version 0.5.89
++  * Update clean target
++  * Add lintian-overrides
++  * Add patch to let find_package search in default pathes
++  * Imported Upstream version 0.6.9
 +
 +  [ Leopold Palomo-Avellaneda ]
 +  * Rebuild for drp.
 +
 + -- Leopold Palomo-Avellaneda <leo at alaxarxa.net>  Tue, 09 Dec 2014 08:55:44 +0100
  
 -  [ Leopold Palomo ]
 +catkin (0.5.77-1+drp70+1) wheezy-robotics; urgency=low
 +
 +  [ Leopold Palomo-Avellaneda ]
 +  * Rebuild for drp.
 +
 +  [ Leopold Palomo-Avellaneda ]
    * Imported Upstream version 0.5.77
    * Modified the build-depends field
    * Changed Vcs fields

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