[gazebo] 05/06: Remove patches that are now in upstream code

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

commit cb4df5e3e04633f9b495f4f4a0a06f95e5cc7057
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Mon Feb 2 18:18:59 2015 +0100

    Remove patches that are now in upstream code
---
 debian/patches/0001-respect-linker-flags.patch     | 15 --------
 .../patches/0002-install-deprecated-manpages.patch | 15 --------
 debian/patches/0007-remove-gzmodel_create.patch    | 44 ----------------------
 debian/patches/series                              |  3 --
 4 files changed, 77 deletions(-)

diff --git a/debian/patches/0001-respect-linker-flags.patch b/debian/patches/0001-respect-linker-flags.patch
deleted file mode 100644
index 2db5a88..0000000
--- a/debian/patches/0001-respect-linker-flags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: respect given CMAKE_SHARED_LINKER_FLAGS
-Author: Jose Luis Rivero <jrivero at osrfoundation.org>
-Forwarded: https://bitbucket.org/osrf/gazebo/pull-request/1122
-
---- gazebo-3.0.0.orig/deps/opende/CMakeLists.txt
-+++ gazebo-3.0.0/deps/opende/CMakeLists.txt
-@@ -243,7 +243,7 @@ if (SSE2_FOUND OR SSE3_FOUND OR SSSE3_FO
-   set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSSE")
- endif()
- 
--set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}} -MF -MT -fno-strict-aliasing -DPIC ")
-+set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}} -MF -MT -fno-strict-aliasing -DPIC ")
- 
- gz_add_library(gazebo_ode ${sources})
- target_link_libraries(gazebo_ode
diff --git a/debian/patches/0002-install-deprecated-manpages.patch b/debian/patches/0002-install-deprecated-manpages.patch
deleted file mode 100644
index f16ae12..0000000
--- a/debian/patches/0002-install-deprecated-manpages.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix comparison to install manpages
-Author: Jose Luis Rivero <jrivero at osrfoundation.org>
-Forwarded: https://bitbucket.org/osrf/gazebo/pull-request/1123
-
---- gazebo-3.0.0.orig/tools/CMakeLists.txt
-+++ gazebo-3.0.0/tools/CMakeLists.txt
-@@ -43,7 +43,7 @@ add_executable(gzfactory gzfactory.cc)
- target_link_libraries(gzfactory gazebo_common gazebo_transport pthread)
- gz_install_executable(gzfactory)
- 
--if (${GAZEBO_VERSION} VERSION_GREATER 3.0)
-+if (${GAZEBO_VERSION} VERSION_LESS 4.0)
-   message (WARNING
-     "Installing deprecated manpages. This should be removed after Gazebo 3.0")
-   manpage(gzfactory 1)
diff --git a/debian/patches/0007-remove-gzmodel_create.patch b/debian/patches/0007-remove-gzmodel_create.patch
deleted file mode 100644
index c69acd4..0000000
--- a/debian/patches/0007-remove-gzmodel_create.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: remove deprecated gzmodel_create script
-Author: Jose Luis Rivero <jrivero at osrfoundation.org>
-Bug: https://bitbucket.org/osrf/gazebo/pull-request/1130
-
---- gazebo-3.0.0.orig/tools/CMakeLists.txt
-+++ gazebo-3.0.0/tools/CMakeLists.txt
-@@ -61,7 +61,5 @@ gz_install_executable(gz)
- 
- roffman(gz 1)
- 
--install (PROGRAMS gzmodel_create gzmodel_create DESTINATION ${BIN_INSTALL_DIR})
--
- install (PROGRAMS gzprop DESTINATION ${BIN_INSTALL_DIR})
- manpage(gzprop 1)
---- gazebo-3.0.0.orig/tools/gzmodel_create
-+++ /dev/null
-@@ -1,27 +0,0 @@
--#!/bin/sh
--
--manifest="<?xml version='1.0'?>
--<model>
--  <name>my_model</name>
--  <version>1.0</version>
--  <sdf>model.sdf</sdf>
--
--  <author>
--    <name>my_name</name>
--    <email>me at my.email</email>
--  </author>
--  
--  <description>
--  A description of my model
--  </description>
--</model>";
--
--if [ $1 ]
--then
--  mkdir $1
--  echo "$manifest" > $1/model.config;
--else
--  echo "Enter a directory to create for the model."
--  echo "Usage:"
--  echo "  gzmodel_create [directory]"
--fi
diff --git a/debian/patches/series b/debian/patches/series
index 2e040d3..da7d777 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,5 @@
-0001-respect-linker-flags.patch
-0002-install-deprecated-manpages.patch
 0003-respect-cmake-c-flags.patch
 0004-visibility-skyx.patch
 0005-fix-problems-on-manpage.patch
 0006-do-not-generate-pdf.patch
-0007-remove-gzmodel_create.patch
 0008-arial-font-removed-in-dfsg.patch

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