[SCM] tora Debian packaging branch, master, updated. upstream/2.1.2-33-gc491fc8

Michael Meskes meskes at alioth.debian.org
Wed May 9 09:07:49 UTC 2012


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

The following commit has been merged in the master branch:
commit 51fcca8d8862334de4130b9831e423cffe896f4b
Author: Michael Meskes <meskes at debian.org>
Date:   Wed May 9 09:49:30 2012 +0200

    Fix FTBFS with gcc 4.7 by fixing missing <unistd.h> includes
    
    Closes: #667395
    
    Thanks: Cyril Brulebois <kibi at debian.org>
---
 debian/changelog  |    7 +++++++
 src/toextract.cpp |    1 +
 src/toreport.cpp  |    2 ++
 3 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 72d90ee..b1b4f72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tora (2.1.3-2) unstable; urgency=low
+
+  * Fix FTBFS with gcc 4.7 by fixing missing <unistd.h> includes.
+    Thanks to Cyril Brulebois <kibi at debian.org> (Closes: #667395)
+
+ -- Michael Meskes <meskes at debian.org>  Wed, 09 May 2012 09:49:57 +0200
+
 tora (2.1.3-1) unstable; urgency=low
 
   * New Upstream version 2.1.3
diff --git a/src/toextract.cpp b/src/toextract.cpp
index 5a9e7fb..deee573 100644
--- a/src/toextract.cpp
+++ b/src/toextract.cpp
@@ -46,6 +46,7 @@
 #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 5d775db..fbdbfad 100644
--- a/src/toreport.cpp
+++ b/src/toreport.cpp
@@ -53,6 +53,8 @@
 #include <winsock2.h>
 #endif
 
+#include <unistd.h>
+
 
 static bool SameContext(const QString &str, const QString &str2)
 {

-- 
tora Debian packaging 



More information about the pkg-kde-commits mailing list