[catkin] 06/07: New upstream version merged 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 552753effc9cc213ebec323dcd7ebdfebad0e329
Merge: 137cf38 3881285
Author: Leopold Palomo-Avellaneda <leopold.palomo at upc.edu>
Date:   Fri Jan 16 10:14:21 2015 +0100

    New upstream version merged from master

 CHANGELOG.rst                                | 14 +++++
 bin/catkin_make                              | 35 ++++++++---
 bin/catkin_make_isolated                     |  4 +-
 cmake/catkin_workspace.cmake                 |  2 +-
 cmake/env-hooks/05.catkin_make.bash          |  3 +
 cmake/env-hooks/05.catkin_make_isolated.bash |  3 +
 cmake/templates/setup.zsh.in                 |  6 +-
 cmake/test/download_checkmd5.py              | 54 ++++++++++-------
 cmake/test/run_tests.py                      | 52 ++--------------
 debian/changelog                             | 19 +++++-
 package.xml                                  |  2 +-
 python/catkin/builder.py                     | 90 +++++++++++++++++++++-------
 python/catkin/test_results.py                | 62 ++++++++++++++++++-
 test/unit_tests/test_download_md5.py         |  2 +-
 14 files changed, 235 insertions(+), 113 deletions(-)

diff --cc debian/changelog
index 6d23ba3,47bf1c1..69b7e58
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,27 +1,41 @@@
- catkin (0.6.9-1) UNRELEASED; urgency=low
 -catkin (0.6.11-1) UNRELEASED; urgency=low
++catkin (0.6.11-1.drp80+1) jessie-robotics ; urgency=low
  
 -  [ Thomas Moulard ]
 -  * Initial release. (Closes: #729048)
 +  [ Jochen Sprickerhof ]
 +  * 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
 +
 +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
    * Error in the dependencies about catking-pkg
  
 +  [ 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
+   * Update packing copyright
+   * Add patch for default workspace path
+   * Add patch for generated pkg-config files
+   * Fix copyright year
+   * Add patch for ROS_PACKAGE_PATH
+   * Add python-empy as run dependency
+   * Add cmake as runtime dependency
+   * Imported Upstream version 0.6.11
+ 
   -- Thomas Moulard <thomas.moulard at gmail.com>  Wed, 19 Jun 2013 11:28:40 +0900

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