Imported Debian patch 1.7-1.1

diff --git a/debian/changelog b/debian/changelog
index 20e658239173bf4f8e766cb509d80f0a00557622..d9857f7546fecc6cd772ad7845be42854e9335cc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+minitube (1.7-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "ftbfs with GCC-4.7": add patch that adds missing include.
+    (Closes: #667281)
+
+ -- gregor herrmann <gregoa@debian.org>  Wed, 09 May 2012 16:44:42 +0200
+
 minitube (1.7-1) unstable; urgency=low
 
   * New upstream version (Closes: #658990)
@@ -15,7 +23,7 @@ minitube (1.6-1) unstable; urgency=low
 
 minitube (1.5-2) unstable; urgency=low
 
-  * Do proper temporary file creation (Closes: #644935)
+  * Do proper temporary file creation (Closes: #644935).
 
  -- Jakob Haufe <sur5r@sur5r.net>  Wed, 12 Oct 2011 23:06:30 +0200
 

diff --git a/debian/patches/gcc-4.7.patch b/debian/patches/gcc-4.7.patch
new file mode 100644 (file)
index 0000000..95c9259
--- /dev/null
+++ b/debian/patches/gcc-4.7.patch
@@ -0,0 +1,17 @@
+Description: add missing include to avoid FTBFS with gcc 4.7
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/667281
+Forwarded: no
+Author: gregor herrmann <gregoa@debian.org>
+Last-Update: 2012-05-09
+
+--- a/src/qtsingleapplication/qtlocalpeer.cpp
++++ b/src/qtsingleapplication/qtlocalpeer.cpp
+@@ -49,6 +49,7 @@
+ #include <QtCore/QCoreApplication>
+ #include <QtCore/QTime>
+ #include <QDebug>
++#include <unistd.h>
+ 
+ #if defined(Q_OS_WIN)
+ #include <QtCore/QLibrary>

diff --git a/debian/patches/series b/debian/patches/series
index 23df937c0a557ec98bbabedf2566c16729145655..4d6bbb17c00332f49b960e88c5366b0ff1b40638 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 disable-update-check
 proper-tempfiles
 assure-quit-keybinding
+gcc-4.7.patch