Merge remote-tracking branch 'origin/release-6.1' into external_libra…

…ries

CHANGELOG.md

@@ -164,18 +164,17 @@
   * Removed OpenGL dependency from `dart` library: [#667](https://github.com/dartsim/dart/pull/667)
   * Removed version check for Bullet: [#636](https://github.com/dartsim/dart/pull/636), [#625](https://github.com/dartsim/dart/issues/625)
 
-
 ## DART 5
 
-### Version 5.1.3 (201X-XX-XX)
+### Version 5.1.3 (2016-10-07)
 
-1. Added support for Bullet built with double precision (backport [#660](https://github.com/dartsim/dart/pull/660))
+1. Updated to support Bullet built with double precision (backport of [#660](https://github.com/dartsim/dart/pull/660))
     * [Pull request #777](https://github.com/dartsim/dart/pull/777)
 
-1. Switched to use btGImpactMeshShape instead of btConvexTriangleMeshShape for mesh
+1. Modified to use btGImpactMeshShape instead of btConvexTriangleMeshShape for mesh
     * [Pull request #764](https://github.com/dartsim/dart/pull/764)
 
-1. Backported [#749](https://github.com/dartsim/dart/pull/749) to DART 5.1
+1. Updated to support FCL 0.5 and tinyxml 4.0 (backport of [#749](https://github.com/dartsim/dart/pull/749))
     * [Pull request #759](https://github.com/dartsim/dart/pull/759)
 
 ### Version 5.1.2 (2016-04-25)

README.md

@@ -1,4 +1,8 @@
-[![Build Status](https://travis-ci.org/dartsim/dart.png?branch=master)](https://travis-ci.org/dartsim/dart)
-[![Build status](https://ci.appveyor.com/api/projects/status/6rta8olo95bpu84r/branch/master?svg=true)](https://ci.appveyor.com/project/jslee02/dart/branch/master)
-[![Coverage Status](https://coveralls.io/repos/github/dartsim/dart/badge.svg?branch=master)](https://coveralls.io/github/dartsim/dart?branch=master)
-[![Documentation Status](https://readthedocs.org/projects/dart/badge/?version=latest)](https://readthedocs.org/projects/dart/?badge=latest)
+# DART: Dynamic Animation and Robotics Toolkit
+[![Build Status](https://travis-ci.org/dartsim/dart.png?branch=master)](https://travis-ci.org/dartsim/dart) [![Build status](https://ci.appveyor.com/api/projects/status/6rta8olo95bpu84r/branch/master?svg=true)](https://ci.appveyor.com/project/jslee02/dart/branch/master) [![Coverage Status](https://coveralls.io/repos/github/dartsim/dart/badge.svg?branch=master)](https://coveralls.io/github/dartsim/dart?branch=master)
+
+Visit the [DART website](http://dartsim.github.io/) for more information
+* [Gallery](http://dartsim.github.io/mydoc_gallery.html)
+* Installation: [Ubuntu](http://dartsim.github.io/mydoc_install_dart_on_ubuntu.html) | [macOS](http://dartsim.github.io/mydoc_install_dart_on_mac.html) | [Windows](http://dartsim.github.io/mydoc_install_dart_on_windows.html)
+* [Tutorials](http://dartsim.github.io/tutorials_introduction.html)
+* [API Documentation](http://dartsim.github.io/dart/)

cmake/DARTFindDependencies.cmake

@@ -298,4 +298,4 @@ endif()
 
 # Doxygen
 find_package(Doxygen QUIET)
-dart_check_optional_package(Doxygen "generating API documentation" "doxygen")
+dart_check_optional_package(DOXYGEN "generating API documentation" "doxygen")

debian/changelog

@@ -105,6 +105,14 @@ dart6 (6.0.0) unstable; urgency=medium
 
  -- Jeongseok Lee <jslee02@gmail.com>  Tue, 10 May 2016 12:00:00 -0500
 
+dart5 (5.1.3) unstable; urgency=medium
+
+  * Updated to support Bullet built with double precision (backport of #660)
+  * Modified to use btGImpactMeshShape instead of btConvexTriangleMeshShape for mesh
+  * Updated to support FCL 0.5 and tinyxml 4.0 (backport of #749)
+
+ -- Jeongseok Lee <jslee02@gmail.com>  Mon, 25 Apr 2016 00:00:00 -0500
+
 dart5 (5.1.2) unstable; urgency=medium
 
   * Fixed inverse kinematics (backporting)

debian/libdart6-dev.install

@@ -1,6 +1,8 @@
 usr/include/dart/dart.hpp
 usr/include/dart/config.hpp
-usr/include/dart/collision/*
+usr/include/dart/collision/*.*
+usr/include/dart/collision/dart/*
+usr/include/dart/collision/fcl/*
 usr/include/dart/common/*
 usr/include/dart/constraint/*
 usr/include/dart/dynamics/*