[catkin-pkg] 01/02: Merge tag 'upstream/0.2.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-pkg.

commit b0d20cdd36a72c5e5e3b741cf05289aa2e6b7284
Merge: dbfc13a 9aa8656
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Wed Jun 3 10:13:58 2015 +0200

    Merge tag 'upstream/0.2.9'
    
    Upstream version 0.2.9

 .gitignore                                 |  1 +
 doc/Makefile                               | 14 ++++++++++
 src/catkin_pkg/__init__.py                 |  2 +-
 src/catkin_pkg/changelog_generator.py      | 10 ++++++++
 src/catkin_pkg/metapackage.py              |  4 +--
 src/catkin_pkg/package.py                  |  2 +-
 src/catkin_pkg/packages.py                 | 24 ++++++++---------
 src/catkin_pkg/python_setup.py             |  8 +++---
 src/catkin_pkg/templates/CMakeLists.txt.in | 41 ++++++++++++++++++++++++------
 9 files changed, 77 insertions(+), 29 deletions(-)

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