[kido] 01/02: Fix git URL

[Jose Luis Rivero]

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

jrivero-guest pushed a commit to branch master
in repository kido.

commit fe47049ce4f140f4a6cde3ed2f73aef814c35c94
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Mon Sep 5 22:52:31 2016 +0000

    Fix git URL
---
 debian/control                                    |  2 +-
 debian/patches/0003-use-std-shared-pointers.patch | 38 ++++++++++++++++-------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/debian/control b/debian/control
index 584b5e4..5488999 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Build-Depends: debhelper (>= 9.20151219),
                libopenscenegraph-dev
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/kido.git
-Vcs-Git: https://anonscm.debian.org/debian-science/packages/kido.git
+Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/kido.git
 Homepage: http://dartsim.github.io/
 
 Package: libkido-dev
diff --git a/debian/patches/0003-use-std-shared-pointers.patch b/debian/patches/0003-use-std-shared-pointers.patch
index c5ca63c..df63fb5 100644
--- a/debian/patches/0003-use-std-shared-pointers.patch
+++ b/debian/patches/0003-use-std-shared-pointers.patch
@@ -9,20 +9,26 @@ index bf4e7e4..d6e5c83 100644
 @@ -351,7 +351,7 @@ FCLCollisionNode::FCLCollisionNode(dynamics::BodyNode* _bodyNode)
    {
      dynamics::ShapePtr shape = _bodyNode->getCollisionShape(i);
- 
+
 -    boost::shared_ptr<fcl::CollisionGeometry> fclCollGeom;
 +    fcl_shared_ptr<fcl::CollisionGeometry> fclCollGeom;
- 
+
      switch (shape->getShapeType())
      {
 diff --git a/kido/collision/fcl/FCLTypes.hpp b/kido/collision/fcl/FCLTypes.hpp
-index 3463d37..f6a3d94 100644
+index 3463d37..ba07a22 100644
 --- a/kido/collision/fcl/FCLTypes.hpp
 +++ b/kido/collision/fcl/FCLTypes.hpp
-@@ -42,6 +42,19 @@
+@@ -37,11 +37,25 @@
+ #ifndef KIDO_COLLISION_FCL_FCLTTYPES_HPP_
+ #define KIDO_COLLISION_FCL_FCLTTYPES_HPP_
+
++#include <memory>
+ #include <Eigen/Dense>
+ #include <fcl/math/vec_3f.h>
  #include <fcl/math/matrix_3f.h>
  #include <fcl/math/transform.h>
- 
+
 +#define FCL_VERSION_AT_LEAST(x,y,z) \
 +   (FCL_MAJOR_VERSION > x || (FCL_MAJOR_VERSION >= x && \
 +   (FCL_MINOR_VERSION > y || (FCL_MINOR_VERSION >= y && \
@@ -38,7 +44,7 @@ index 3463d37..f6a3d94 100644
 +
  namespace kido {
  namespace collision {
- 
+
 diff --git a/kido/utils/urdf/KidoLoader.cpp b/kido/utils/urdf/KidoLoader.cpp
 index a7e50c5..ec36feb 100644
 --- a/kido/utils/urdf/KidoLoader.cpp
@@ -46,22 +52,30 @@ index a7e50c5..ec36feb 100644
 @@ -23,7 +23,7 @@
  #include "kido/simulation/World.hpp"
  #include "kido/utils/urdf/urdf_world_parser.hpp"
- 
+
 -using ModelInterfacePtr = boost::shared_ptr<urdf::ModelInterface>;
 +using ModelInterfacePtr = fcl_shared_ptr<urdf::ModelInterface>;
- 
+
  namespace kido {
  namespace utils {
 diff --git a/kido/utils/urdf/urdf_world_parser.hpp b/kido/utils/urdf/urdf_world_parser.hpp
-index 74227bf..f49ca91 100644
+index 74227bf..21dd6ef 100644
 --- a/kido/utils/urdf/urdf_world_parser.hpp
 +++ b/kido/utils/urdf/urdf_world_parser.hpp
-@@ -63,7 +63,7 @@ public:
+@@ -43,6 +43,7 @@
+
+ #include "kido/common/Uri.hpp"
+ #include "kido/common/ResourceRetriever.hpp"
++#include "kido/collision/fcl/FCLTypes.hpp"
+
+ #include <urdf_model/model.h>
+ #include <urdf_model/pose.h>
+@@ -63,7 +64,7 @@ public:
    /// Copy over a standard urdfEntity
    Entity(const urdf::Entity& urdfEntity);
- 
+
 -  boost::shared_ptr<urdf::ModelInterface> model;
 +  fcl_shared_ptr<urdf::ModelInterface> model;
    urdf::Pose origin;
    urdf::Twist twist;
- 
+

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