[SCM] tora Debian packaging branch, master, updated. upstream/2.1.3-39-gd6d47e0

[Michael Meskes]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/tora.git;a=commitdiff;h=feccbfa

The following commit has been merged in the master branch:
commit feccbfaa831e3b40a2330eb41bcbaff928dde27d
Author: Michael Meskes <meskes at debian.org>
Date:   Mon Dec 12 15:46:48 2016 +0100

    Added older patch to patch system
---
 debian/patches/series      |  1 +
 debian/patches/unistd.diff | 21 +++++++++++++++++++++
 src/toextract.cpp          |  1 -
 src/toreport.cpp           |  2 --
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index d75723a..64e8a44 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 initializer.diff
+unistd.diff
diff --git a/debian/patches/unistd.diff b/debian/patches/unistd.diff
new file mode 100644
index 0000000..6af082c
--- /dev/null
+++ b/debian/patches/unistd.diff
@@ -0,0 +1,21 @@
+--- tora-2.1.3.orig/src/toextract.cpp
++++ tora-2.1.3/src/toextract.cpp
+@@ -46,6 +46,7 @@
+ #include "toextract.h"
+ 
+ #include <stdio.h>
++#include <unistd.h>
+ 
+ #include <qapplication.h>
+ #include <qlabel.h>
+--- tora-2.1.3.orig/src/toreport.cpp
++++ tora-2.1.3/src/toreport.cpp
+@@ -53,6 +53,8 @@
+ #include <winsock2.h>
+ #endif
+ 
++#include <unistd.h>
++
+ 
+ static bool SameContext(const QString &str, const QString &str2)
+ {
diff --git a/src/toextract.cpp b/src/toextract.cpp
index deee573..5a9e7fb 100644
--- a/src/toextract.cpp
+++ b/src/toextract.cpp
@@ -46,7 +46,6 @@
 #include "toextract.h"
 
 #include <stdio.h>
-#include <unistd.h>
 
 #include <qapplication.h>
 #include <qlabel.h>
diff --git a/src/toreport.cpp b/src/toreport.cpp
index fbdbfad..5d775db 100644
--- a/src/toreport.cpp
+++ b/src/toreport.cpp
@@ -53,8 +53,6 @@
 #include <winsock2.h>
 #endif
 
-#include <unistd.h>
-
 
 static bool SameContext(const QString &str, const QString &str2)
 {

-- 
tora Debian packaging