Control: tags 758545 + pending Dear maintainer,
I've prepared an NMU for qutecom (versioned as 2.2.1+dfsg1-5.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards, Felix
diff -Nru qutecom-2.2.1+dfsg1/debian/changelog qutecom-2.2.1+dfsg1/debian/changelog --- qutecom-2.2.1+dfsg1/debian/changelog 2014-03-01 09:54:11.000000000 +0100 +++ qutecom-2.2.1+dfsg1/debian/changelog 2014-09-10 12:02:58.000000000 +0200 @@ -1,3 +1,11 @@ +qutecom (2.2.1+dfsg1-5.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add find-qt4-cmake30.patch to fix FTBFS with cmake 3.0. (Closes: #758545) + * Add fix-missing-qt-include.patch to fix FTBFS with QtWebkit 2.3. + + -- Felix Geyer <[email protected]> Wed, 10 Sep 2014 12:02:55 +0200 + qutecom (2.2.1+dfsg1-5) unstable; urgency=medium * Add libav10.patch by Anton Khirnov to fix FTBFS with libav10 diff -Nru qutecom-2.2.1+dfsg1/debian/patches/find-qt4-cmake30.patch qutecom-2.2.1+dfsg1/debian/patches/find-qt4-cmake30.patch --- qutecom-2.2.1+dfsg1/debian/patches/find-qt4-cmake30.patch 1970-01-01 01:00:00.000000000 +0100 +++ qutecom-2.2.1+dfsg1/debian/patches/find-qt4-cmake30.patch 2014-09-10 11:41:19.000000000 +0200 @@ -0,0 +1,20 @@ +Description: find_package(Qt4 REQUIRED) is only called in + libs/3rdparty/qt4/CMakeLists.txt but qutecom uses Qt4 macros + in various CMakeLists.txt files that are not beneath + libs/3rdparty/qt4. + This was never supported and breaks with cmake 3.0. + To fix this add a find_package() call in the top level CMakeLists.txt. +Author: Felix Geyer <[email protected]> + +diff -Nur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2011-02-10 11:03:43.000000000 +0100 ++++ b/CMakeLists.txt 2014-08-18 19:07:13.554038111 +0200 +@@ -23,6 +23,8 @@ + include(DefineInstallationPaths.cmake) + include(DefineCPackDefaults.cmake) + ++find_package(Qt4 REQUIRED) ++ + subdirs( + libs/3rdparty + ) diff -Nru qutecom-2.2.1+dfsg1/debian/patches/fix-missing-qt-include.patch qutecom-2.2.1+dfsg1/debian/patches/fix-missing-qt-include.patch --- qutecom-2.2.1+dfsg1/debian/patches/fix-missing-qt-include.patch 1970-01-01 01:00:00.000000000 +0100 +++ qutecom-2.2.1+dfsg1/debian/patches/fix-missing-qt-include.patch 2014-09-10 11:59:01.000000000 +0200 @@ -0,0 +1,10 @@ +--- a/qutecom/src/presentation/qt/chat/QtChatHistoryWidget.cpp ++++ b/qutecom/src/presentation/qt/chat/QtChatHistoryWidget.cpp +@@ -36,6 +36,7 @@ + #include <QtCore/QFile> + #include <QtCore/QFileInfo> + #include <QtCore/QTime> ++#include <QtCore/QTimer> + + #include <QtGui/QFileDialog> + #include <QtGui/QScrollBar> diff -Nru qutecom-2.2.1+dfsg1/debian/patches/series qutecom-2.2.1+dfsg1/debian/patches/series --- qutecom-2.2.1+dfsg1/debian/patches/series 2014-03-01 09:13:30.000000000 +0100 +++ qutecom-2.2.1+dfsg1/debian/patches/series 2014-09-10 11:59:13.000000000 +0200 @@ -16,3 +16,5 @@ build.patch libav9.8.patch libav10.patch +find-qt4-cmake30.patch +fix-missing-qt-include.patch
