[SCM] telepathy-qt4 packaging branch, master, updated. debian/0.9.3-1-36-g3f24e4e

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/telepathy-qt4.git;a=commitdiff;h=abbbc6d

The following commit has been merged in the master branch:
commit abbbc6d694eb492d8642e2e68acc41b96bf23421
Author: Diane Trout <diane at ghic.org>
Date:   Wed Jun 18 22:18:50 2014 -0700

    Specify location of local Qt documentation.
---
 debian/changelog | 1 +
 debian/rules     | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6a4bf23..b56438b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ telepathy-qt (0.9.4+dfsg-1) UNSTABLE; urgency=medium
   * Add qt4-dev-tools and qt4-doc-html to build-depends so we can
     rebuild documentation.
   * Install documentation from build directroy.
+  * Specify location of local Qt documentation.
 
  -- Diane Trout <diane at ghic.org>  Sat, 14 Jun 2014 10:17:26 -0700
 
diff --git a/debian/rules b/debian/rules
index c1c810d..1d9df87 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,13 +8,12 @@ include /usr/share/dpkg/architecture.mk
 override_dh_auto_configure:
 	dh_auto_configure -- -DDISABLE_WERROR=ON -DHAVE_DOT=YES \
 	                     -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" \
-	                     -DCMAKE_BUILD_TYPE=RelWithDebInfo
+	                     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+	                     -DQT_DOC_DIR=/usr/share/qt4/doc
 
-ifeq (,$(findstring nodocs,$(DEB_BUILD_OPTIONS)))
 override_dh_auto_build:
 	dh_auto_build --parallel
 	dh_auto_build -- doxygen-doc
-endif
 
 # Do not run tests, as they fall into race conditions sometimes
 override_dh_auto_test:

-- 
telepathy-qt4 packaging