[SCM] Qt Assistant compatibility version packaging branch, master, updated. debian/4.6.3-3-6-gbe09ff6

[Felix Geyer]

The following commit has been merged in the master branch:
commit a3351ee24d3faa59aa431299ce6b7fdd6d41c8e8
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Fri Mar 9 11:37:03 2012 +0100

    Use dh_auto_* instead of calling (q)make directly for the library.
---
 debian/changelog |    7 +++++++
 debian/rules     |    9 ++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 12e0cb5..c68177c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qt-assistant-compat (4.6.3-4) UNRELEASED; urgency=low
+
+  [ Felix Geyer ]
+  * Use dh_auto_* instead of calling (q)make directly for the library.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 09 Mar 2012 11:32:59 +0100
+
 qt-assistant-compat (4.6.3-3) unstable; urgency=low
 
   * Use pkgkde-symbolshelper and fix issues with the symbol file.
diff --git a/debian/rules b/debian/rules
index 9858b12..9a9d994 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export QMAKE := /usr/bin/qmake-qt4
 export LRELEASE := /usr/bin/lrelease-qt4
 
 %:
@@ -11,21 +10,21 @@ export LRELEASE := /usr/bin/lrelease-qt4
 
 override_dh_auto_configure:
 	dh_auto_configure
-	cd lib; $(QMAKE) CONFIG+=create_prl
+	dh_auto_configure --sourcedirectory=lib -- CONFIG+=create_prl
 
 override_dh_auto_build:
 	dh_auto_build
-	cd lib; $(MAKE)
+	dh_auto_build --sourcedirectory=lib
 	cd translations; $(LRELEASE) assistant_adp_*.ts
 
 override_dh_auto_clean:
 	dh_auto_clean
-	cd lib; if [ -e Makefile ]; then $(MAKE) distclean; fi
+	dh_auto_clean --sourcedirectory=lib
 	rm -f translations/assistant_adp_*.qm
 
 override_dh_auto_install:
 	dh_auto_install
-	cd lib; $(MAKE) install INSTALL_ROOT=$(CURDIR)/debian/tmp
+	dh_auto_install --sourcedirectory=lib
 
 	# Fix wrong path in prl file
 	sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" \

-- 
Qt Assistant compatibility version packaging