[ros-catkin] 01/03: New upstream version 0.7.4

[Jochen Sprickerhof]

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

jspricke pushed a commit to annotated tag debian/0.7.4-1
in repository ros-catkin.

commit 07c3a68b883c486c0b1da8128ea4ffb1eef624ca
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Thu Sep 29 08:41:50 2016 +0200

    New upstream version 0.7.4
---
 CHANGELOG.rst            | 8 ++++++--
 package.xml              | 2 +-
 python/catkin/builder.py | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 01b01b8..7279517 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,10 @@
 Changelog for package catkin
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.7.4 (2016-09-25)
+------------------
+* fix regression in logic to select make / ninja for CMake packages from 0.7.2 (`#826 <https://github.com/ros/catkin/issues/826>`_)
+
 0.7.3 (2016-09-19)
 ------------------
 * relax fixed DEPENDS check from last release (`#825 <https://github.com/ros/catkin/issues/825>`_)
@@ -251,7 +255,7 @@ Changelog for package catkin
 -------------------
 * support multiple package names for catkin_make --pkg (`#504 <https://github.com/ros/catkin/issues/504>`_)
 * improve help message on catkin_make_isolated --from-pkg
-* fix include path in generated .pc files to be absolute (fix `#506 <https://github.com/ros/catkin/issues/506>`_, regression of 0.5.72)
+* fix include path in generated .pc files to be absolute (`#506 <https://github.com/ros/catkin/issues/506>`_, regression of 0.5.72)
 * fix handling DESTDIR in catkin_make_isolated for plain cmake packages (`#499 <https://github.com/ros/catkin/issues/499>`_)
 * fix catkin_python_setup to consider actual package names inside setup.py when signaling that an __init__.py file is installed to genmsg/dynamic_reconfigure (`ros/genmsg#34 <https://github.com/ros/genmsg/issues/34>`_)
 * fix unsetting temporary variables - especially CATKIN_SETUP_DIR - to not influence next environment (`#505 <https://github.com/ros/catkin/issues/505>`_)
@@ -330,7 +334,7 @@ Changelog for package catkin
 * fixes:
 
   * update check in generated pkgConfig.cmake files to work independent of cmake policy CMD0012 (`#452 <https://github.com/ros/catkin/issues/452>`_)
-  * fix generating pkg-config files with empty -I directives (fix `#445 <https://github.com/ros/catkin/issues/445>`_)
+  * fix generating pkg-config files with empty -I directives (`#445 <https://github.com/ros/catkin/issues/445>`_)
 
 * update documentation, especially about testing
 * for a complete list of changes see the `commit log for 0.5.68 <https://github.com/ros/catkin/compare/0.5.67...0.5.68>`_
diff --git a/package.xml b/package.xml
index f9fe4cb..377ca47 100644
--- a/package.xml
+++ b/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>catkin</name>
-  <version>0.7.3</version>
+  <version>0.7.4</version>
   <description>Low-level build system macros and infrastructure for ROS.</description>
   <maintainer email="dthomas at osrfoundation.org">Dirk Thomas</maintainer>
   <license>BSD</license>
diff --git a/python/catkin/builder.py b/python/catkin/builder.py
index 9c49c2a..d46349c 100644
--- a/python/catkin/builder.py
+++ b/python/catkin/builder.py
@@ -529,7 +529,7 @@ def build_cmake_package(
         )
 
     # Run make
-    if not use_ninja:
+    if use_ninja:
         make_executable = 'ninja'
     elif use_nmake:
         make_executable = 'nmake'

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