[catkin-pkg] branch master updated (d38f47d -> 082ff35)

[Jochen Sprickerhof]

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

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

      from  d38f47d   Merging
       new  dfc4b95   Revert upstream changes done while merging
       new  a40b15d   Fix mering errors (using new debrob version)
       new  6c452f1   Fix typos
       new  082ff35   update changelog

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .travis.yml      | 12 ++++++------
 debian/changelog | 13 +++++++++++++
 debian/compat    |  4 ----
 debian/control   |  4 ++--
 debian/rules     |  7 -------
 debian/watch     |  7 -------
 6 files changed, 21 insertions(+), 26 deletions(-)

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