[SCM] qtcreator packaging branch, master, updated. f90f28b8de98179021a59953d745b9ea8c8df237

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 8288330b13a555554bfc954c560bfe47a1d0a29d
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon May 27 12:38:08 2013 -0300

    Build the documentation using qmake.
---
 debian/changelog |    1 +
 debian/rules     |    7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0fe338e..31e01b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ qtcreator (2.7.0-1) UNRELEASED; urgency=low
     Ubuntu, but I don't know who did it.
   * Remove unused patch posix_rt_nonlinux.diff.
   * Make every package that ships a binary managed by qtchooser depend on it.
+  * Build the documentation using qmake. Taken from Ubuntu.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 22 May 2013 15:40:28 -0300
 
diff --git a/debian/rules b/debian/rules
index b5060ec..1ccef46 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,12 +21,11 @@ override_dh_auto_configure:
 	dh_auto_configure -- $(CURDIR) IDE_LIBRARY_BASENAME=lib/$(DEB_HOST_MULTIARCH) IDE_PACKAGE_MODE=1 USE_SYSTEM_BOTAN=1 $(extra_configure_opts)
 
 override_dh_auto_install:
-	dh_auto_install -Smakefile -- INSTALL_ROOT=$(CURDIR)/debian/tmp/usr
 ifneq (,$(filter qtcreator-doc, $(shell dh_listpackages)))
-	$(MAKE) docs
-	install -D -p -m0644 share/doc/qtcreator/qtcreator.qch \
-		debian/tmp/usr/share/qtcreator/doc/qtcreator.qch
+	dh_auto_build -- qch_docs
 endif
+	dh_auto_install --destdir=debian/tmp/usr
+	dh_auto_build -- install_docs INSTALL_ROOT=$(CURDIR)/debian/tmp/usr
 
 override_dh_auto_clean:
 	dh_auto_clean

-- 
qtcreator packaging