[SCM] telepathy-qt4 packaging branch, master, updated. debian/0.9.6.1-6.1-21-gbbc36f7

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit bbc36f7d6e9eccbf1ddb9a63cb658a8ebd2817e1
Author: Pino Toscano <pino at debian.org>
Date:   Sun Dec 3 16:11:37 2017 +0100

    remove doc symlinking
---
 debian/changelog | 3 +++
 debian/rules     | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6c8dd30..1ab06e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,9 @@ telepathy-qt (0.9.7-1) UNRELEASED; urgency=medium
   * Remove the get-orig-source target in rules, since plain uscan works fine.
   * Fix the version of the older symbols of libtelepathy-qt5-0, and
     libtelepathy-qt5-farstream0: 0.0.9.5 was surely a typo for 0.9.5.
+  * Remove the symlinking of the doc directories to the one of
+    libtelepathy-qt4-2, otherwise it makes everything depend on Qt4 (for
+    little to no gain).
 
  -- Diane Trout <diane at ghic.org>  Fri, 22 Apr 2016 10:33:12 -0700
 
diff --git a/debian/rules b/debian/rules
index 5499e53..59be78a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,10 +40,8 @@ override_dh_auto_install:
 override_dh_install:
 	dh_install --fail-missing
 
-# -i is for the doc package, which doesn't depend on the shared library
 override_dh_installdocs:
-	dh_installdocs -a --link-doc=libtelepathy-qt4-2
-	dh_installdocs -i
+	dh_installdocs
 	dh_doxygen -i
 
 override_dh_auto_clean:

-- 
telepathy-qt4 packaging