[Pkg-telepathy-commits] [SCM] telepathy-qt4 packaging branch, debian, updated. debian/0.3.6-1-14-g7ae70ab

[Jonny Lamb]

The following commit has been merged in the debian branch:
commit 65d63d895175343b8c0819fa9da352ab29378fd4
Author: Jonny Lamb <jonny at debian.org>
Date:   Thu Apr 14 11:33:39 2011 +0100

    debian/rules: Add more cmake-specific stuff.
    
    Signed-off-by: Jonny Lamb <jonny at debian.org>

diff --git a/debian/rules b/debian/rules
index ebaf2ad..a8a52f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-DEB_DH_MAKESHLIBS_ARGS_libtelepathy-qt4-1 := -V"libtelepathy-qt4-1 (>= 0.5)"
+DEB_DH_MAKESHLIBS_ARGS_libtelepathy-qt4-1 := -V"libtelepathy-qt4-1 (>= 0.5.15)"
 
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/cmake.mk
@@ -14,10 +14,12 @@ common-binary-post-install-arch:: list-missing
 
 DEB_DH_STRIP_ARGS := --dbg-package=libtelepathy-qt4-dbg
 
-#DEB_MAKE_CHECK_TARGET = check
+DEB_CMAKE_EXTRA_FLAGS := -DDISABLE_WERROR=ON -DCMAKE_INSTALL_LOCAL_ONLY=0 -DHAVE_DOT=YES
 
+ifeq (,$(findstring nodocs,$(DEB_BUILD_OPTIONS)))
 common-build-indep::
 	$(DEB_MAKE_INVOKE) doxygen-doc
+endif
 
 # symbols file to be added later, if C++ even allows
 #export DPKG_GENSYMBOLS_CHECK_LEVEL = 4

-- 
telepathy-qt4 packaging