[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.8.0-9-gb4e811b

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 513cf31a92088529b6e9556e7f3364b762668807
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat May 29 04:06:20 2010 +0300

    debian-qt-kde.mk: replace usr/share/doc/kde4 references with usr/share/doc/kde.
---
 debian/changelog               |    2 ++
 qt-kde-team/1/debian-qt-kde.mk |   10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c523e38..2b94299 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ pkg-kde-tools (0.9.0~pre2) UNRELEASED; urgency=low
   * Switch HTML_INSTALL_DIR from /usr/share/doc/kde4/HTML to
     /usr/share/doc/kde/HTML, add NEWS entry about this important change which
     may trigger FTBFSes in the third party packages.
+  * debian-qt-kde.mk: replace usr/share/doc/kde4 references with
+    usr/share/doc/kde.
 
  -- Modestas Vainius <modax at debian.org>  Tue, 25 May 2010 17:31:29 +0300
 
diff --git a/qt-kde-team/1/debian-qt-kde.mk b/qt-kde-team/1/debian-qt-kde.mk
index 5381e37..3ed6029 100644
--- a/qt-kde-team/1/debian-qt-kde.mk
+++ b/qt-kde-team/1/debian-qt-kde.mk
@@ -75,15 +75,15 @@ $(patsubst %,binary-post-install/%,$(DEB_ARCH_PACKAGES)) :: binary-post-install/
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/usr/share/doc/kde4/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en; find . -name index.docbook`; do \
 		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
 		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde4/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde4/HTML/en/$$pkg; \
-		meinproc4 $(DEB_DESTDIR)/usr/share/doc/kde4/HTML/en/$$pkg/index.docbook; \
+		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+		meinproc4 $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en/$$pkg/index.docbook; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-		rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde4/HTML/en/$$pkg; \
+		rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
 	done
 
 # Run dh_sameversiondep

-- 
Debian Qt/KDE packaging tools