From: gregor herrmann Date: Wed, 9 May 2012 14:44:42 +0000 (+0200) Subject: Imported Debian patch 1.7-1.1 X-Git-Tag: debian/1.7-1.1^0 X-Git-Url: https://git.sur5r.net/?p=minitube;a=commitdiff_plain;h=c242b72771e7a414d2905cca70b53d361baacdba Imported Debian patch 1.7-1.1 --- diff --git a/debian/changelog b/debian/changelog index 20e6582..d9857f7 100644 --- 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 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 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 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 +Last-Update: 2012-05-09 + +--- a/src/qtsingleapplication/qtlocalpeer.cpp ++++ b/src/qtsingleapplication/qtlocalpeer.cpp +@@ -49,6 +49,7 @@ + #include + #include + #include ++#include + + #if defined(Q_OS_WIN) + #include diff --git a/debian/patches/series b/debian/patches/series index 23df937..4d6bbb1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ disable-update-check proper-tempfiles assure-quit-keybinding +gcc-4.7.patch