[SCM] qtcreator packaging branch, master, updated. debian/2.7.0-1-33-g761ec26

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 8f191f1fc8cfae3c2900976c72cf7ff53bdaf9b1
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Aug 31 23:17:57 2013 -0300

    Manually call qmake to avoid a FTBFS.
---
 debian/changelog |    2 ++
 debian/rules     |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8cd5ad4..b32f940 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ qtcreator (2.8.1-1) UNRELEASED; urgency=low
   * Refresh patches.
   * Remove 03_fix_DOCPATH.diff, no longer needed.
   * Adjust install files.
+  * Manually call qmake in order to avoid a FTBFS due to dh passing -nocache.
+    Upstream uses caches to put default data for building, so we need them.
 
   [ Pino Toscano ]
   * Switch Homepage to a qt-project.org page.
diff --git a/debian/rules b/debian/rules
index 8b88bf1..7894955 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ upstream_changes := $(wildcard dist/changes-*)
 
 override_dh_auto_configure:
 	mkdir -p builddir
-	dh_auto_configure -- $(CURDIR) IDE_LIBRARY_BASENAME=lib/$(DEB_HOST_MULTIARCH) IDE_PACKAGE_MODE=1 USE_SYSTEM_BOTAN=1 $(extra_configure_opts)
+	cd builddir ; qmake $(CURDIR) IDE_LIBRARY_BASENAME=lib/$(DEB_HOST_MULTIARCH) IDE_PACKAGE_MODE=1 USE_SYSTEM_BOTAN=1 $(extra_configure_opts)
 
 override_dh_auto_install:
 ifneq (,$(filter qtcreator-doc, $(shell dh_listpackages)))

-- 
qtcreator packaging