[SCM] krdc packaging branch, master, updated. debian/4.13.1-1-6-gda139d9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/krdc.git;a=commitdiff;h=6ce55e9

The following commit has been merged in the master branch:
commit 6ce55e9db6ebd7032e8512a36d20310791bc66b2
Author: Maximiliano Curia <maxy at debian.org>
Date:   Thu Aug 28 19:46:47 2014 +0200

    Fix previous patch.
---
 debian/changelog                  |  6 ++++++
 debian/patches/fix_kfreebsd_ftbfs | 18 +++++-------------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b4b9d51..d7e2f0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+krdc (4:4.13.1-3) UNRELEASED; urgency=medium
+
+  * Fix previous patch
+
+ -- Maximiliano Curia <maxy at debian.org>  Wed, 27 Aug 2014 05:11:08 +0200
+
 krdc (4:4.13.1-2) unstable; urgency=medium
 
   * New patch: fix_kfreebsd_ftbfs (Closes: #754687)
diff --git a/debian/patches/fix_kfreebsd_ftbfs b/debian/patches/fix_kfreebsd_ftbfs
index 2352ba5..2d8fc1a 100644
--- a/debian/patches/fix_kfreebsd_ftbfs
+++ b/debian/patches/fix_kfreebsd_ftbfs
@@ -1,24 +1,16 @@
 Index: krdc/vnc/vncclientthread.cpp
 ===================================================================
---- krdc.orig/vnc/vncclientthread.cpp	2014-08-26 23:05:50.606094524 +0200
-+++ krdc/vnc/vncclientthread.cpp	2014-08-26 23:13:29.107290324 +0200
-@@ -26,6 +26,7 @@
- #include <cerrno>
- #include <netinet/in.h>
- #include <netinet/tcp.h>
-+#include <sys/param.h>
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <QMutexLocker>
-@@ -606,6 +607,7 @@
+--- 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 @@
          return;
      }
  
-+#if !defined(__FreeBSD__) || __FreeBSD__ >= 10
++#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 +625,7 @@
+@@ -623,6 +624,7 @@
          kError(5011) << "setsockopt(TCP_KEEPCNT)" << strerror(errno);
          return;
      }

-- 
krdc packaging