diff -Nru qutecom-2.2.1+dfsg1/debian/changelog qutecom-2.2.1+dfsg1/debian/changelog --- qutecom-2.2.1+dfsg1/debian/changelog 2011-10-09 23:55:29.000000000 +0000 +++ qutecom-2.2.1+dfsg1/debian/changelog 2012-06-28 00:46:40.000000000 +0000 @@ -1,3 +1,12 @@ +qutecom (2.2.1+dfsg1-3ubuntu1) quantal; urgency=low + + * glib-single-include.patch: Fix FTBFS against new glib that no + longer allows the linking of glib.h over individual headers. + * pthread-link.patch: Hardcode -pthread instead of detecting + and attempting (incorrectly) to insert -lpthread willy-nilly. + + -- Adam Conrad Wed, 27 Jun 2012 18:04:27 -0600 + qutecom (2.2.1+dfsg1-3) unstable; urgency=low * Add format-string-security.patch to fix GCC format string warnings diff -Nru qutecom-2.2.1+dfsg1/debian/control qutecom-2.2.1+dfsg1/debian/control --- qutecom-2.2.1+dfsg1/debian/control 2011-10-09 23:55:29.000000000 +0000 +++ qutecom-2.2.1+dfsg1/debian/control 2012-06-28 00:08:33.000000000 +0000 @@ -1,7 +1,8 @@ Source: qutecom Section: net Priority: optional -Maintainer: Debian VoIP Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian VoIP Team Uploaders: Marco Nenciarini , Ludovico Cavedon Build-Depends: cdbs (>= 0.4.27), bzip2, debhelper (>= 7), patchutils (>= 0.2.25), cmake (>= 2.6), libqt4-dev (>= 4:4.5), diff -Nru qutecom-2.2.1+dfsg1/debian/patches/glib-single-include.patch qutecom-2.2.1+dfsg1/debian/patches/glib-single-include.patch --- qutecom-2.2.1+dfsg1/debian/patches/glib-single-include.patch 1970-01-01 00:00:00.000000000 +0000 +++ qutecom-2.2.1+dfsg1/debian/patches/glib-single-include.patch 2012-06-28 00:17:58.000000000 +0000 @@ -0,0 +1,12 @@ +Index: qutecom-2.2.1+dfsg1/libs/imwrapper/src/purple/PurpleIMFactory.h +=================================================================== +--- qutecom-2.2.1+dfsg1.orig/libs/imwrapper/src/purple/PurpleIMFactory.h 2011-02-10 03:03:43.000000000 -0700 ++++ qutecom-2.2.1+dfsg1/libs/imwrapper/src/purple/PurpleIMFactory.h 2012-06-27 18:17:58.158851413 -0600 +@@ -24,7 +24,6 @@ + #include + + #include +-#include + + class PurpleAccountMngr; + class PurpleChatMngr; diff -Nru qutecom-2.2.1+dfsg1/debian/patches/pthread-link.patch qutecom-2.2.1+dfsg1/debian/patches/pthread-link.patch --- qutecom-2.2.1+dfsg1/debian/patches/pthread-link.patch 1970-01-01 00:00:00.000000000 +0000 +++ qutecom-2.2.1+dfsg1/debian/patches/pthread-link.patch 2012-06-28 00:47:43.000000000 +0000 @@ -0,0 +1,18 @@ +Description: Harcore -pthread link option + pthread-link.patch: Hardcode -pthread instead of detecting + and attempting (incorrectly) to insert -lpthread willy-nilly. +Author: Adam Conrad +Forwarded: no +Last-Update: 2012-06-27 + +--- qutecom-2.2.1+dfsg1.orig/owbuild/FindPTHREAD.cmake ++++ qutecom-2.2.1+dfsg1/owbuild/FindPTHREAD.cmake +@@ -16,7 +16,7 @@ include (FindThreads) + if (CMAKE_USE_PTHREADS_INIT) + # hack to pass OWBuild check + set (PTHREAD_INCLUDE_DIR "/usr/include") +- set (PTHREAD_PUBLIC_LINK_FLAGS ${CMAKE_THREAD_LIBS_INIT}) ++ set (PTHREAD_PUBLIC_LINK_FLAGS "-pthread") + set (PTHREAD_FOUND TRUE) + mark_as_advanced (PTHREAD_INCLUDE_DIR) + else (CMAKE_USE_PTHREADS_INIT) 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 2011-10-09 23:55:29.000000000 +0000 +++ qutecom-2.2.1+dfsg1/debian/patches/series 2012-06-28 00:37:48.000000000 +0000 @@ -10,3 +10,5 @@ curl-include-fix-ftbfs.patch find-ffmpeg-pkgconfig.patch format-string-security.patch +glib-single-include.patch +pthread-link.patch