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

Diane Trout diane-guest at moszumanska.debian.org
Wed Jun 25 04:35:59 UTC 2014


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

The following commit has been merged in the master branch:
commit 764203e39ede8feb292d1f723de6fb6366e4e285
Author: Diane Trout <diane at ghic.org>
Date:   Sun Jun 22 22:53:58 2014 -0700

    replace dh_doxygen with directly searching for doxygen .map and .md5s The dh_doxygen version wasn't finding the unneeded files and was causing the build to fail.
---
 debian/changelog | 3 +++
 debian/rules     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3fabf69..f51e21f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 telepathy-qt (0.9.4+dfsg-2) UNRELEASED; urgency=medium
 
   * Add update-doxygen.patch to remove deprecated tags.
+  * replace dh_doxygen with directly searching for doxygen .map and .md5s
+    The dh_doxygen version wasn't finding the unneeded files and was
+    causing the build to fail.
 
  -- Diane Trout <diane at ghic.org>  Sun, 22 Jun 2014 22:49:18 -0700
 
diff --git a/debian/rules b/debian/rules
index 40e2f65..fb5e377 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,7 @@ override_dh_install:
 override_dh_installdocs:
 	dh_installdocs -a --link-doc=libtelepathy-qt4-2
 	dh_installdocs -i
-	dh_doxygen
+	find debian/libtelepathy-qt4-doc \( -name '*.md5' -o -name '*.map' \) -exec rm {} \;
 
 override_dh_auto_clean:
 	dh_auto_clean

-- 
telepathy-qt4 packaging



More information about the pkg-kde-commits mailing list