[ros-ros-comm] 02/04: Remove patch, included upstream

[Jochen Sprickerhof]

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

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

commit 45dcd0e546e1ff0ec5ee8e92887a6d207641566a
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Fri Oct 27 15:27:34 2017 +0200

    Remove patch, included upstream
---
 ...7-Don-t-try-to-set-unknown-socket-options.patch | 22 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 23 deletions(-)

diff --git a/debian/patches/0007-Don-t-try-to-set-unknown-socket-options.patch b/debian/patches/0007-Don-t-try-to-set-unknown-socket-options.patch
deleted file mode 100644
index c6acdc6..0000000
--- a/debian/patches/0007-Don-t-try-to-set-unknown-socket-options.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Tue, 26 Sep 2017 10:53:26 +0200
-Subject: Don't try to set unknown socket options
-
-These are not avaible on FreeBSD, for example
----
- clients/roscpp/src/libros/transport/transport_tcp.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/clients/roscpp/src/libros/transport/transport_tcp.cpp b/clients/roscpp/src/libros/transport/transport_tcp.cpp
-index 9605dbb..cea4318 100644
---- a/clients/roscpp/src/libros/transport/transport_tcp.cpp
-+++ b/clients/roscpp/src/libros/transport/transport_tcp.cpp
-@@ -179,7 +179,7 @@ void TransportTCP::setKeepAlive(bool use, uint32_t idle, uint32_t interval, uint
-     }
- 
- /* cygwin SOL_TCP does not seem to support TCP_KEEPIDLE, TCP_KEEPINTVL, TCP_KEEPCNT */
--#if defined(SOL_TCP) && !defined(__CYGWIN__)
-+#if defined(SOL_TCP) && !defined(__CYGWIN__) && defined(TCP_KEEPIDLE) && defined(TCP_KEEPINTVL) && defined(TCP_KEEPCNT)
-     val = idle;
-     if (setsockopt(sock_, SOL_TCP, TCP_KEEPIDLE, &val, sizeof(val)) != 0)
-     {
diff --git a/debian/patches/series b/debian/patches/series
index 2c414dc..1981c29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@
 0004-Fix-executable-not-elf-or-script.patch
 0005-Add-defaults-to-roswtf.patch
 0006-Use-system-libb64.patch
-0007-Don-t-try-to-set-unknown-socket-options.patch

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