[Pkg-telepathy-commits] [SCM] telepathy-qt4 packaging branch, debian, updated. debian/0.7.1-1-10-gb6d4f8b

[Laurent Bigonville]

The following commit has been merged in the debian branch:
commit dde35346284c36b9a330fdface2439793a9d24b5
Author: Laurent Bigonville <bigon at debian.org>
Date:   Mon May 21 16:25:09 2012 +0200

    Fix FTBFS with gcc 4.7 by fixing missing <unistd.h> includes, thanks to Cyril Brulebois (Closes: #667391)

diff --git a/debian/changelog b/debian/changelog
index 8265511..c587030 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ telepathy-qt (0.9.1-1) UNRELEASED; urgency=low
     - Bump soname of both libraries
     - Bump build-dependencies
   * Switch to dpkg-source 3.0 (quilt) format
+  * Fix FTBFS with gcc 4.7 by fixing missing <unistd.h> includes,
+    thanks to Cyril Brulebois (Closes: #667391)
 
- -- Laurent Bigonville <bigon at debian.org>  Mon, 21 May 2012 16:06:55 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Mon, 21 May 2012 16:24:14 +0200
 
 telepathy-qt4 (0.7.1-1) unstable; urgency=low
 
diff --git a/debian/patches/fix_ftbfs_gcc47.patch b/debian/patches/fix_ftbfs_gcc47.patch
new file mode 100644
index 0000000..100bba3
--- /dev/null
+++ b/debian/patches/fix_ftbfs_gcc47.patch
@@ -0,0 +1,38 @@
+Description: Fix FTBFS with gcc-4.7
+Author: Cyril Brulebois <kibi at debian.org>
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=50204
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667391
+
+--- a/TelepathyQt/client-registrar.cpp
++++ b/TelepathyQt/client-registrar.cpp
+@@ -40,6 +40,8 @@
+ #include <TelepathyQt/PendingComposite>
+ #include <TelepathyQt/PendingReady>
+ 
++#include <unistd.h>
++
+ namespace Tp
+ {
+ 
+--- a/TelepathyQt/stream-tube-client.cpp
++++ b/TelepathyQt/stream-tube-client.cpp
+@@ -38,6 +38,8 @@
+ #include <QAbstractSocket>
+ #include <QHash>
+ 
++#include <unistd.h>
++
+ namespace Tp
+ {
+ 
+--- a/TelepathyQt/stream-tube-server.cpp
++++ b/TelepathyQt/stream-tube-server.cpp
+@@ -38,6 +38,8 @@
+ #include <TelepathyQt/OutgoingStreamTubeChannel>
+ #include <TelepathyQt/StreamTubeChannel>
+ 
++#include <unistd.h>
++
+ namespace Tp
+ {
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4137239
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_ftbfs_gcc47.patch

-- 
telepathy-qt4 packaging