[ros-bloom] 02/03: Merge tag 'upstream/0.5.21'

[Jochen Sprickerhof]

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

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

commit 75c0a63e4ee8371e0b3407bfaf683ee5c1c59c68
Merge: bc40bdc 8f3b319
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sat Jun 18 10:34:31 2016 +0200

    Merge tag 'upstream/0.5.21'
    
    Upstream version 0.5.21

 CHANGELOG.rst                                      |  9 ++++++
 bloom/commands/release.py                          | 16 ++++++-----
 bloom/config.py                                    | 10 +++++--
 bloom/generators/debian/generate_cmd.py            |  4 ++-
 bloom/generators/debian/generator.py               | 33 +++++++++++++++++++++-
 bloom/generators/debian/templates/control.em       |  4 +--
 bloom/generators/rosdebian.py                      |  4 ++-
 bloom/generators/rosrelease.py                     |  3 +-
 bloom/generators/rosrpm.py                         |  4 ++-
 bloom/generators/rpm/generate_cmd.py               |  4 ++-
 bloom/generators/rpm/templates/template.spec.em    |  1 +
 bloom/util.py                                      | 10 +++++++
 setup.py                                           |  2 +-
 stdeb.cfg                                          |  2 +-
 .../test_generators/test_debian/test_generator.py  | 19 +++++++++++++
 15 files changed, 105 insertions(+), 20 deletions(-)

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