tags 665603 + pending tags 710605 + patch tags 710605 + pending thanks Dear maintainer,
I've prepared an NMU for qutecom (versioned as 2.2.1+dfsg1-3.1) and uploaded it to DELAYED/1. Please feel free to tell me if I should delay it longer. Regards -- Sebastian Ramacher
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-10 01:55:29.000000000 +0200 +++ qutecom-2.2.1+dfsg1/debian/changelog 2013-06-01 20:36:11.000000000 +0200 @@ -1,3 +1,14 @@ +qutecom (2.2.1+dfsg1-3.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/patches/ + - glib-single-include.patch: Apply patch from Michael Biebl to fix FTBFS + with newer glib. (Closes: #665603) + - eglibc-2.17.patch: Fix FTBFS with eglibc 2.17 providing TIME_UTC. + (Closes: #710605) + + -- Sebastian Ramacher <sramac...@debian.org> Sat, 01 Jun 2013 20:36:10 +0200 + 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/patches/eglibc-2.17.patch qutecom-2.2.1+dfsg1/debian/patches/eglibc-2.17.patch --- qutecom-2.2.1+dfsg1/debian/patches/eglibc-2.17.patch 1970-01-01 01:00:00.000000000 +0100 +++ qutecom-2.2.1+dfsg1/debian/patches/eglibc-2.17.patch 2013-06-01 20:36:02.000000000 +0200 @@ -0,0 +1,37 @@ +Description: Fix FTBFS with eglibc 2.17 + eglibc now provides TIME_UTC, conflicting with TIME_UTC from boost. Check if + TIME_UTC_ is available and use this one instead. +Author: Sebastian Ramacher <sramac...@debian.org> +Bug-Debian: http://bugs.debian.org/710605 +Last-Update: 2013-06-01 + +--- a/libs/owutil/thread/CMakeLists.txt ++++ b/libs/owutil/thread/CMakeLists.txt +@@ -1,3 +1,13 @@ ++INCLUDE (CheckCXXSourceCompiles) ++SET (CMAKE_REQUIRED_FLAGS "-pthread") ++CHECK_CXX_SOURCE_COMPILES ("#include <boost/thread/xtime.hpp> ++ int main() { ++ return boost::TIME_UTC_; ++ }" HAVE_BOOST_TIME_UTC_) ++IF (HAVE_BOOST_TIME_UTC_) ++ ADD_DEFINITIONS(-DHAVE_BOOST_TIME_UTC_) ++ENDIF (HAVE_BOOST_TIME_UTC_) ++ + ow_create_static_library(owthread) + + ow_use_public_libraries( +--- a/libs/owutil/thread/src/Thread.cpp ++++ b/libs/owutil/thread/src/Thread.cpp +@@ -105,7 +105,11 @@ + } + + boost::xtime xt; ++#ifdef HAVE_BOOST_TIME_UTC_ ++ boost::xtime_get(&xt, boost::TIME_UTC_); ++#else + boost::xtime_get(&xt, boost::TIME_UTC); ++#endif + xt.sec += seconds; + boost::thread::sleep(xt); + } 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 01:00:00.000000000 +0100 +++ qutecom-2.2.1+dfsg1/debian/patches/glib-single-include.patch 2013-06-01 19:35:16.000000000 +0200 @@ -0,0 +1,15 @@ +Description: Include glib.h instead of individual headers +Author: Michael Biebl <bi...@debian.org> +Bug-Debian: http://bugs.debian.org/665603 +Last-Update: 2013-06-01 + +--- qutecom-2.2.1+dfsg1.orig/libs/imwrapper/src/purple/PurpleIMFactory.h ++++ qutecom-2.2.1+dfsg1/libs/imwrapper/src/purple/PurpleIMFactory.h +@@ -24,7 +24,6 @@ + #include <imwrapper/IMAccount.h> + + #include <glib.h> +-#include <glib/gtypes.h> + + class PurpleAccountMngr; + class PurpleChatMngr; 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-10 01:55:29.000000000 +0200 +++ qutecom-2.2.1+dfsg1/debian/patches/series 2013-06-01 19:48:45.000000000 +0200 @@ -10,3 +10,5 @@ curl-include-fix-ftbfs.patch find-ffmpeg-pkgconfig.patch format-string-security.patch +glib-single-include.patch +eglibc-2.17.patch
signature.asc
Description: Digital signature
