[ros-gazebo-ros-pkgs] 01/04: Remove unneeded patches

[Jochen Sprickerhof]

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

jspricke pushed a commit to branch master
in repository ros-gazebo-ros-pkgs.

commit 94e16b7f962bdc82736ccda6cd682ecd854a4ae6
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Wed Dec 7 18:55:11 2016 +0100

    Remove unneeded patches
---
 .../0005-Delete-pass-location-of-plugins.patch     | 31 --------------------
 .../0006-Delete-pass-location-of-plugins.patch     | 25 ----------------
 debian/patches/0007-Drop-find-plugins.patch        | 33 ----------------------
 debian/patches/series                              |  3 --
 4 files changed, 92 deletions(-)

diff --git a/debian/patches/0005-Delete-pass-location-of-plugins.patch b/debian/patches/0005-Delete-pass-location-of-plugins.patch
deleted file mode 100644
index 70e1dec..0000000
--- a/debian/patches/0005-Delete-pass-location-of-plugins.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
-Date: Tue, 8 Nov 2016 15:42:22 +0100
-Subject: Delete pass location of plugins
-
----
- gazebo_ros/scripts/gzserver | 12 ------------
- 1 file changed, 12 deletions(-)
-
-diff --git a/gazebo_ros/scripts/gzserver b/gazebo_ros/scripts/gzserver
-index 883ad94..ce0ff5d 100755
---- a/gazebo_ros/scripts/gzserver
-+++ b/gazebo_ros/scripts/gzserver
-@@ -10,18 +10,6 @@ if [ $(uname) = "Darwin" ]; then
-     EXT=dylib
- fi
- 
--# add ros path plugin if it does not already exist in the passed in arguments
--if [ `expr "$final" : ".*libgazebo_ros_paths_plugin\.$EXT.*"` -eq 0 ]
--then
--    final="$final -s `catkin_find --first-only libgazebo_ros_paths_plugin.$EXT`"
--fi
--
--# add ros api plugin if it does not already exist in the passed in arguments
--if [ `expr "$final" : ".*libgazebo_ros_api_plugin\.$EXT.*"` -eq 0 ]
--then
--    final="$final -s `catkin_find --first-only libgazebo_ros_api_plugin.$EXT`"
--fi
--
- setup_path=$(pkg-config --variable=prefix gazebo)/share/gazebo/
- 
- # source setup.sh, but keep local modifications to GAZEBO_MASTER_URI
diff --git a/debian/patches/0006-Delete-pass-location-of-plugins.patch b/debian/patches/0006-Delete-pass-location-of-plugins.patch
deleted file mode 100644
index c97c6cc..0000000
--- a/debian/patches/0006-Delete-pass-location-of-plugins.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
-Date: Tue, 8 Nov 2016 15:42:57 +0100
-Subject: Delete pass location of plugins
-
----
- gazebo_ros/scripts/gzclient | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/gazebo_ros/scripts/gzclient b/gazebo_ros/scripts/gzclient
-index 0dab137..54a4e7e 100755
---- a/gazebo_ros/scripts/gzclient
-+++ b/gazebo_ros/scripts/gzclient
-@@ -10,12 +10,6 @@ if [ $(uname) = "Darwin" ]; then
-     EXT=dylib
- fi
- 
--# add ros plugin if does not exist
--if [ `expr "$final" : ".*libgazebo_ros_paths_plugin\.$EXT.*"` -eq 0 ]
--then
--    final="$final -g `catkin_find --first-only libgazebo_ros_paths_plugin.$EXT`"
--fi
--
- setup_path=$(pkg-config --variable=prefix gazebo)/share/gazebo/
- 
- # source setup.sh, but keep local modifications to GAZEBO_MASTER_URI
diff --git a/debian/patches/0007-Drop-find-plugins.patch b/debian/patches/0007-Drop-find-plugins.patch
deleted file mode 100644
index 276e83c..0000000
--- a/debian/patches/0007-Drop-find-plugins.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
-Date: Tue, 8 Nov 2016 16:30:30 +0100
-Subject: Drop find plugins
-
----
- gazebo_ros/scripts/gazebo | 14 +-------------
- 1 file changed, 1 insertion(+), 13 deletions(-)
-
-diff --git a/gazebo_ros/scripts/gazebo b/gazebo_ros/scripts/gazebo
-index 392dac7..f439e5f 100755
---- a/gazebo_ros/scripts/gazebo
-+++ b/gazebo_ros/scripts/gazebo
-@@ -12,19 +12,7 @@ if [ $(uname) = "Darwin" ]; then
-     SIGNAL=INT
- fi
- 
--# add ros path plugin if it does not already exist in the passed in arguments
--if [ `expr "$final" : ".*libgazebo_ros_paths_plugin\.$EXT.*"` -eq 0 ]
--then
--    final="$final -s `catkin_find --first-only libgazebo_ros_paths_plugin.$EXT`"
--fi
--
--# add ros api plugin if it does not already exist in the passed in arguments
--if [ `expr "$final" : ".*libgazebo_ros_api_plugin\.$EXT.*"` -eq 0 ]
--then
--    final="$final -s `catkin_find --first-only libgazebo_ros_api_plugin.$EXT`"
--fi
--
--client_final="-g `catkin_find --first-only libgazebo_ros_paths_plugin.$EXT`"
-+client_final="-g libgazebo_ros_paths_plugin.$EXT"
- 
- setup_path=$(pkg-config --variable=prefix gazebo)/share/gazebo/
- 
diff --git a/debian/patches/series b/debian/patches/series
index 142f5fe..544f9f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,3 @@
 0002-Add-Debian-specific-SONAMEs.patch
 0003-Add-Debian-specific-SONAMEs.patch
 0004-Add-Debian-specific-SONAMEs.patch
-0005-Delete-pass-location-of-plugins.patch
-0006-Delete-pass-location-of-plugins.patch
-0007-Drop-find-plugins.patch

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