[SCM] qttools packaging branch, master, updated. debian/5.2.1-7-3-gd29af4b

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qttools.git;a=commitdiff;h=d29af4b

The following commit has been merged in the master branch:
commit d29af4b4709d2f877a0f018a533ec778887f0cdb
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Mar 19 13:28:04 2014 +0400

    Update copyright files for all external docs, not just for qtbase.
---
 debian/changelog |  1 +
 debian/rules     | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cf21887..21bc4ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qttools-opensource-src (5.2.1-8) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Simplify libqt5designercomponents5.symbols a bit more.
+  * Update copyright files for all external docs, not just for qtbase.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 18 Mar 2014 10:22:06 +0400
 
diff --git a/debian/rules b/debian/rules
index 4f344ee..791ba5c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,10 +57,12 @@ override_dh_install:
 
 override_dh_installdocs-indep:
 	dh_installdocs -i
-	# We want to use the qtbase copyright in qtbase5-doc
-	rm -v debian/qtbase5-doc/usr/share/doc/qtbase5-doc/copyright
-	cp /usr/share/doc/qtbase5-doc-html/copyright \
-		debian/qtbase5-doc/usr/share/doc/qtbase5-doc/
+	# Use the correct copyright in external -doc packages
+	for source in qtbase5 qtdeclarative5 qtxmlpatterns5; do \
+		rm -v debian/$$source-doc/usr/share/doc/$$source-doc/copyright; \
+		cp /usr/share/doc/$$source-doc-html/copyright \
+			debian/$$source-doc/usr/share/doc/$$source-doc/; \
+	done
 	cp /usr/share/doc/qtbase5-doc-html/LGPL_EXCEPTION.txt \
 		debian/qtbase5-doc/usr/share/doc/qtbase5-doc/
 

-- 
qttools packaging