[urdfdom] 03/04: Removed patch merged upstream

[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 urdfdom.

commit 55ff3e0645355bbd919ad5763fb97ffefb6e4e2d
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Mon Aug 22 14:34:11 2016 +0000

    Removed patch merged upstream
---
 .../0002-Respect-cmake-install-libdir.patch        | 22 ----------------------
 debian/patches/series                              |  1 -
 debian/rules                                       |  2 +-
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/debian/patches/0002-Respect-cmake-install-libdir.patch b/debian/patches/0002-Respect-cmake-install-libdir.patch
deleted file mode 100644
index 798b438..0000000
--- a/debian/patches/0002-Respect-cmake-install-libdir.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Jose Luis Rivero <jrivero at osrfoundation.org>
-Date: The Jan 09 17:40:23 2014 +0100
-Subject: Disable upstram fixed value for CMAKE_INSTALL_LIBDIR 
-
-Forwarded: yes
-Bug: https://github.com/ros/urdfdom/issues/21
-Author: Jose Luis Rivero <jrivero at osrfoundation.org>
----
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f89ea96..8c4631a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -12,7 +12,7 @@ message (STATUS "${PROJECT_NAME} version ${URDF_VERSION}")
- include(GNUInstallDirs)
- 
- # hack: by default this would be 'lib/x86_64-linux-gnu'
--set(CMAKE_INSTALL_LIBDIR lib)
-+# set(CMAKE_INSTALL_LIBDIR lib)
- 
- # set the default build type
- if (NOT CMAKE_BUILD_TYPE)
diff --git a/debian/patches/series b/debian/patches/series
index 9b469f2..3efe86d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-Fix-installed-CMake-module-to-cope-with-multiarch.patch
-0002-Respect-cmake-install-libdir.patch
diff --git a/debian/rules b/debian/rules
index 541d74e..00aee24 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@
 override_dh_auto_clean:
 	rm -f cmake/pkgconfig/urdfdom.pc \
 	      cmake/urdfdom-config.cmake
-	find urdf_parser_py/ -name *.pyc -exec rm {} \;
+	find urdf_parser/ -name *.pyc -exec rm {} \;
 	dh_auto_clean --
 
 override_dh_strip:

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