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

[Diane Trout]

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

The following commit has been merged in the master branch:
commit 8034fa9e45e78ab3b494581cac1944ebf02a15ee
Author: Diane Trout <diane at ghic.org>
Date:   Tue Jun 24 20:38:52 2014 -0700

    Move building documentation to override_dh_auto_build-indep target.
    
    * Move building documentation to override_dh_auto_build-indep target.
    * Use dh_doxygen -i in override_dh_instaldocs so it only triesto clean
      documentation when building the indep package.
---
 debian/changelog | 8 ++++++++
 debian/rules     | 8 +++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b36ff9a..e3bbada 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+telepathy-qt (0.9.4+dfsg-3) UNRELEASED; urgency=medium
+
+  * Move building documentation to override_dh_auto_build-indep target.
+  * Use dh_doxygen -i in override_dh_instaldocs so it only triesto clean
+    documentation when building the indep package.
+
+ -- Diane Trout <diane at ghic.org>  Tue, 24 Jun 2014 11:20:27 -0700
+
 telepathy-qt (0.9.4+dfsg-2) unstable; urgency=medium
 
   * Add update-doxygen.patch to remove deprecated tags.
diff --git a/debian/rules b/debian/rules
index fb5e377..738ad9a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,8 +11,10 @@ override_dh_auto_configure:
 	                     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	                     -DQT_DOC_DIR=/usr/share/qt4/doc
 
-override_dh_auto_build:
+override_dh_auto_build-arch:
 	dh_auto_build --parallel
+
+override_dh_auto_build-indep:
 	dh_auto_build -- doxygen-doc
 
 # Do not run tests, as they fall into race conditions sometimes
@@ -28,11 +30,11 @@ override_dh_install:
 override_dh_installdocs:
 	dh_installdocs -a --link-doc=libtelepathy-qt4-2
 	dh_installdocs -i
-	find debian/libtelepathy-qt4-doc \( -name '*.md5' -o -name '*.map' \) -exec rm {} \;
+	dh_doxygen -i
 
 override_dh_auto_clean:
 	dh_auto_clean
 	find . -name '*.pyc' -exec rm {} \;
 
 get-orig-source:
-	. debian/get-orig-source
\ No newline at end of file
+	. debian/get-orig-source

-- 
telepathy-qt4 packaging