[SCM] Debian Qt/KDE packaging tools branch, master, updated. master/0.5.0-4-ge953ed0

[Ana Beatriz Guerrero López]

The following commit has been merged in the master branch:
commit e953ed00e6719f81b9fe678e0bfbe515616a7837
Author: Ana Guerrero <ana at ekaia.org>
Date:   Wed Sep 23 10:40:53 2009 +0200

    Fix the path for the documentation from kde to kde4.
    
    Change the generation of the HTML documentation's path to
    /usr/share/doc/kde4/ instead of /usr/share/doc/kde/. We are building
    with -DHTML_INSTALL_DIR=/usr/share/doc/kde4/HTML
---
 debian/changelog               |   12 ++++++++++--
 qt-kde-team/1/debian-qt-kde.mk |   10 +++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 557d6fd..204a83f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,16 @@
-pkg-kde-tools (0.5.1) UNRELEASED; urgency=low
+pkg-kde-tools (0.5.1) unstable; urgency=low
+
+  +++ Changes by Modestas Vainius:
 
   * dh_sameversiondep: really disable warnings about unknown substvars.
 
- -- Modestas Vainius <modestas at vainius.eu>  Sun, 30 Aug 2009 09:42:18 +0300
+  +++ Changes by Ana Beatriz Guerrero Lopez:
+
+  * Change the generation of the HTML documentation's path to
+    /usr/share/doc/kde4/ instead of /usr/share/doc/kde/. We are building with 
+    -DHTML_INSTALL_DIR=/usr/share/doc/kde4/HTML .
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 23 Sep 2009 10:14:30 +0200
 
 pkg-kde-tools (0.5.0) unstable; urgency=low
 
diff --git a/qt-kde-team/1/debian-qt-kde.mk b/qt-kde-team/1/debian-qt-kde.mk
index e55d807..de80f12 100644
--- a/qt-kde-team/1/debian-qt-kde.mk
+++ b/qt-kde-team/1/debian-qt-kde.mk
@@ -62,15 +62,15 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 
 binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en; find . -name index.docbook`; do \
+	for doc in `cd $(DEB_DESTDIR)/usr/share/doc/kde4/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/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; \
+		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; \
 	done
 	for pkg in $(DOC_HTML_PRUNE) ; do \
-		rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \
+		rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde4/HTML/en/$$pkg; \
 	done
 
 # Run dh_sameversiondep

-- 
Debian Qt/KDE packaging tools