[SCM] QtWebKit packaging branch, master, updated. debian/2.1.0-2011week13-2-34-g45b6aca

[Felix Geyer]

The following commit has been merged in the master branch:
commit 45b6acaba04e1664adfa8ed01ca64375d6d072f0
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Sat Nov 26 09:55:47 2011 +0100

    Use dh_auto_* instead of calling (q)make directly for the designer plugin.
---
 debian/rules |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index 350f520..f41c4c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,13 +18,17 @@ endif
 
 override_dh_auto_configure:
 	dh_auto_configure -- DEFINES+=ENABLE_VIDEO=1 DEFINES+=WTF_USE_GSTREAMER=1
-	cd $(QWEBVIEW_DIR); qmake-qt4
+	dh_auto_configure --sourcedirectory=$(QWEBVIEW_DIR)
+
+override_dh_auto_build:
+	dh_auto_build
+	dh_auto_build --sourcedirectory=$(QWEBVIEW_DIR)
 
 override_dh_auto_install:
 	dh_auto_install
-	$(MAKE) -C $(QWEBVIEW_DIR) INSTALL_ROOT=$(CURDIR)/debian/tmp install
+	dh_auto_install --sourcedirectory=$(QWEBVIEW_DIR)
 
 override_dh_auto_clean:
 	rm -f Source/Makefile
-	[ ! -f $(QWEBVIEW_DIR)/Makefile ] || $(MAKE) -C $(QWEBVIEW_DIR) distclean
 	dh_auto_clean
+	dh_auto_clean --sourcedirectory=$(QWEBVIEW_DIR)

-- 
QtWebKit packaging