[SCM] krdc packaging branch, master, updated. debian/15.12.0-1-11-gc577926

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/krdc.git;a=commitdiff;h=8d3dfc1

The following commit has been merged in the master branch:
commit 8d3dfc17267a9a9355c337aa14b400bee5b2a214
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date:   Thu Apr 21 01:23:24 2016 +0200

    Refresh patches
---
 debian/patches/fix_kfreebsd_ftbfs | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/debian/patches/fix_kfreebsd_ftbfs b/debian/patches/fix_kfreebsd_ftbfs
index 2d8fc1a..dbd286f 100644
--- a/debian/patches/fix_kfreebsd_ftbfs
+++ b/debian/patches/fix_kfreebsd_ftbfs
@@ -1,20 +1,29 @@
-Index: krdc/vnc/vncclientthread.cpp
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Thu, 21 Apr 2016 01:23:21 +0200
+Subject: fix_kfreebsd_ftbfs
+
 ===================================================================
---- krdc.orig/vnc/vncclientthread.cpp	2014-08-27 05:09:03.431346440 +0200
-+++ krdc/vnc/vncclientthread.cpp	2014-08-27 05:10:51.518905576 +0200
-@@ -606,6 +606,7 @@
+---
+ vnc/vncclientthread.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/vnc/vncclientthread.cpp b/vnc/vncclientthread.cpp
+index e4e5032..4d7c5c0 100644
+--- a/vnc/vncclientthread.cpp
++++ b/vnc/vncclientthread.cpp
+@@ -607,6 +607,7 @@ void VncClientThread::clientSetKeepalive()
          return;
      }
  
 +#if !defined(__FreeBSD_kernel__)
      optval = m_keepalive.intervalSeconds;
      if (setsockopt(cl->sock, IPPROTO_TCP, TCP_KEEPIDLE, &optval, optlen) < 0) {
-         kError(5011) << "setsockopt(TCP_KEEPIDLE)" << strerror(errno);
-@@ -623,6 +624,7 @@
-         kError(5011) << "setsockopt(TCP_KEEPCNT)" << strerror(errno);
+         qCritical(KRDC) << "setsockopt(TCP_KEEPIDLE)" << strerror(errno);
+@@ -624,6 +625,7 @@ void VncClientThread::clientSetKeepalive()
+         qCritical(KRDC) << "setsockopt(TCP_KEEPCNT)" << strerror(errno);
          return;
      }
 +#endif
      m_keepalive.set = true;
-     kDebug(5011) << "TCP keepalive set";
+     qCDebug(KRDC) << "TCP keepalive set";
  }

-- 
krdc packaging