diff -Nru qutecom-2.2+dfsg1/debian/changelog qutecom-2.2+dfsg1/debian/changelog --- qutecom-2.2+dfsg1/debian/changelog 2010-10-31 20:52:51.000000000 +0000 +++ qutecom-2.2+dfsg1/debian/changelog 2010-11-03 18:42:04.000000000 +0000 @@ -1,8 +1,18 @@ -qutecom (2.2+dfsg1-1~maverick1~ppa1) maverick; urgency=low +qutecom (2.2+dfsg1-2~maverick1~ppa1) maverick; urgency=low - * Upload to Qutecom PPA. + * Upload to QuteCom PPA. - -- Ludovico Cavedon Sun, 31 Oct 2010 13:51:51 -0700 + -- Ludovico Cavedon Wed, 03 Nov 2010 11:39:04 -0700 + +qutecom (2.2+dfsg1-2) experimental; urgency=low + + * Add build-dependency on libqtwebkit-dev or libqt4-dev older than 4.7. + * Use correct epoch number in libqt4-dev deendency. + * Fix handling for noopt flag in DEB_BUILD_OPTIONS. + * Add fix-linking-binutils-gold.patch: explicitly link phapi against libdl + on linux. Fixes linking failure with binutils-gold). + + -- Ludovico Cavedon Tue, 02 Nov 2010 23:56:45 -0700 qutecom (2.2+dfsg1-1) experimental; urgency=low diff -Nru qutecom-2.2+dfsg1/debian/control qutecom-2.2+dfsg1/debian/control --- qutecom-2.2+dfsg1/debian/control 2010-10-19 19:02:19.000000000 +0000 +++ qutecom-2.2+dfsg1/debian/control 2010-11-03 06:58:43.000000000 +0000 @@ -4,7 +4,8 @@ Maintainer: Debian VoIP Team Uploaders: Marco Nenciarini , Ludovico Cavedon Build-Depends: cdbs (>= 0.4.27), bzip2, debhelper (>= 7), quilt, - patchutils (>= 0.2.25), cmake (>= 2.6), libqt4-dev (>= 4.5), + patchutils (>= 0.2.25), cmake (>= 2.6), libqt4-dev (>= 4:4.5), + libqtwebkit-dev | libqt4-dev (<< 4:4.7), libglib2.0-dev (>= 2.10.3), libavcodec-dev (>= 0.cvs20060823-3.1), libswscale-dev (>= 0.cvs20060823-3.1), libgnutls-dev (>= 1.2.9), libboost-serialization-dev, libboost-thread-dev, libboost-signals-dev, diff -Nru qutecom-2.2+dfsg1/debian/patches/fix-linking-binutils-gold.patch qutecom-2.2+dfsg1/debian/patches/fix-linking-binutils-gold.patch --- qutecom-2.2+dfsg1/debian/patches/fix-linking-binutils-gold.patch 1970-01-01 00:00:00.000000000 +0000 +++ qutecom-2.2+dfsg1/debian/patches/fix-linking-binutils-gold.patch 2010-11-03 01:50:22.000000000 +0000 @@ -0,0 +1,21 @@ +Description: Explicitely link phapi against libdl on linux. Fixes linking failure with binutils-gold). +Author: Ludovico Cavedon +Bug: http://trac.qutecom.org/ticket/262 +# HG changeset patch +# User Ludovico Cavedon +# Date 1288748482 25200 +# Node ID f52e8735f2f04a70e11c60614efcd7b1815f6bd7 +# Parent 4c82e1dde9c0881245622f972a96a9702cd5eedb +Explicitely link phapi against libdl on linux. Fixes linking failure with binutils-gold). + +diff -r 4c82e1dde9c0 -r f52e8735f2f0 wifo/phapi/CMakeLists.txt +--- a/wifo/phapi/CMakeLists.txt Thu Oct 21 14:37:10 2010 +0200 ++++ b/wifo/phapi/CMakeLists.txt Tue Nov 02 18:41:22 2010 -0700 +@@ -243,6 +243,7 @@ + ow_add_private_libraries( + pthread + rt ++ dl + ) + + ow_add_private_definitions( diff -Nru qutecom-2.2+dfsg1/debian/patches/series qutecom-2.2+dfsg1/debian/patches/series --- qutecom-2.2+dfsg1/debian/patches/series 2010-10-20 07:03:32.000000000 +0000 +++ qutecom-2.2+dfsg1/debian/patches/series 2010-11-03 01:50:22.000000000 +0000 @@ -4,3 +4,4 @@ #purple_perl_tcl_noload.patch #curl-openssl-mt-fix.patch fix-include-case.patch +fix-linking-binutils-gold.patch diff -Nru qutecom-2.2+dfsg1/debian/rules qutecom-2.2+dfsg1/debian/rules --- qutecom-2.2+dfsg1/debian/rules 2010-10-23 09:11:01.000000000 +0000 +++ qutecom-2.2+dfsg1/debian/rules 2010-11-03 01:15:42.000000000 +0000 @@ -9,12 +9,6 @@ DEB_INSTALL_DOCS_qutecom := $(CURDIR)/qutecom/AUTHORS -ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) - DEB_CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE=Debug -else - DEB_CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE=RelWithDebInfo -endif - DEB_CMAKE_EXTRA_FLAGS := -DQT_UIC_EXECUTABLE=/usr/bin/uic-qt4 \ -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \ -DCMAKE_INSTALL_RPATH=/usr/lib/qutecom \ @@ -29,6 +23,12 @@ -DHAVE_SWSCALE=1 +ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + DEB_CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE=RelWithDebInfo +else + DEB_CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE=Debug +endif + ifeq ($(DEB_HOST_ARCH), i386) DEB_CMAKE_EXTRA_FLAGS += -DENABLE_CRASHREPORT=ON else