From 696b54b25313d9fd2ce261ec3aaa2b002c4e7b62 Mon Sep 17 00:00:00 2001
From: John Hsu <johnhsu@willowgarage.com>
Date: Wed, 25 May 2011 11:19:43 -0700
Subject: [PATCH] reverting assimp changes due to lack of support for ppa

---
 collada_urdf/CMakeLists.txt | 4 ++--
 collada_urdf/manifest.xml   | 2 +-
 rosdep.yaml                 | 7 -------
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/collada_urdf/CMakeLists.txt b/collada_urdf/CMakeLists.txt
index 3ed033c..c7daaff 100644
--- a/collada_urdf/CMakeLists.txt
+++ b/collada_urdf/CMakeLists.txt
@@ -8,7 +8,7 @@ rosbuild_add_library(collada_urdf src/collada_urdf.cpp)
 rosbuild_link_boost(collada_urdf system)
 
 rosbuild_add_executable(urdf_to_collada src/urdf_to_collada.cpp)
-target_link_libraries(urdf_to_collada collada_urdf assimp)
+target_link_libraries(urdf_to_collada collada_urdf)
 
 rosbuild_add_gtest(test_collada_writer test/test_collada_urdf.cpp)
-target_link_libraries(test_collada_writer collada_urdf assimp)
+target_link_libraries(test_collada_writer collada_urdf)
diff --git a/collada_urdf/manifest.xml b/collada_urdf/manifest.xml
index 9d84c64..502f9d7 100644
--- a/collada_urdf/manifest.xml
+++ b/collada_urdf/manifest.xml
@@ -15,7 +15,7 @@
   <depend package="colladadom" />
   <depend package="resource_retriever" />
   <depend package="angles" />
-  <rosdep name="assimp"/>
+  <depend package="assimp"/>
   <platform os="ubuntu" version="9.04"/>
   <platform os="ubuntu" version="9.10"/>
   <platform os="ubuntu" version="10.04"/>
diff --git a/rosdep.yaml b/rosdep.yaml
index f815a07..2d78050 100644
--- a/rosdep.yaml
+++ b/rosdep.yaml
@@ -2,10 +2,3 @@ pcre:
   ubuntu: libpcre3-dev
   fedora: pcre-devel
   debian: libpcre3-dev
-assimp:
- ubuntu: |
-  if [ ! -f /etc/apt/sources.list.d/openrave-release*.list ] ; then
-    sudo add-apt-repository ppa:openrave/release
-    sudo apt-get update
-  fi
-  sudo apt-get install assimp-bin assimp-dev