[SCM] TANGO distributed control system. branch, master, updated. debian/6.1.1c-1-59-g84502f7

[Picca Frédéric-Emmanuel]

The following commit has been merged in the master branch:
commit 7315cc5c684f92fd619ccc827f2af4a77e7a3206
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Tue Oct 5 22:41:38 2010 +0200

    * simplify the rule since upstream apply the buildsystem patches.

diff --git a/debian/rules b/debian/rules
index 86e10e2..3c35850 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,19 +14,10 @@ get-orig-source:
 	ln -fs $(PACKAGE)-$(VERSION)~dfsg.tar.gz ../$(PACKAGE)_$(VERSION)~dfsg.orig.tar.gz
 
 override_dh_auto_configure:
-	mkdir -p "$(CURDIR)/$(BUILDROOT)"
-	for f in "$(CURDIR)"/*; do cp -arf "$$f" "$(CURDIR)/$(BUILDROOT)/"; done
-	cd "$(CURDIR)/$(BUILDROOT)" && autoreconf -fi -I m4
-	cd "$(CURDIR)/$(BUILDROOT)" && dh_auto_configure -- --with-omni=/usr --disable-dbcreate --disable-java --with-doxygen
-
-override_dh_auto_clean:
-	rm -rf "$(CURDIR)/$(BUILDROOT)"
-
-override_dh_auto_build:
-	cd "$(CURDIR)/$(BUILDROOT)" && dh_auto_build
+	dh_auto_configure -- --with-omni=/usr --disable-dbcreate --disable-java --with-doxygen
 
 override_dh_auto_install:
-	cd "$(CURDIR)/$(BUILDROOT)" && dh_auto_install --destdir="$(CURDIR)/debian/tmp/"
+	dh_auto_install --destdir="$(CURDIR)/debian/tmp/"
 	# install dbconfig-common scripts
 	install -d debian/tmp/usr/share/dbconfig-common/data/tango-db/install
 	install -p -m 644 $(CURDIR)/$(BUILDROOT)/cppserver/database/create_db.sql debian/tmp/usr/share/dbconfig-common/data/tango-db/install/mysql
@@ -35,7 +26,6 @@ override_dh_auto_install:
 	install -p -m 644 $(CURDIR)/$(BUILDROOT)/cppserver/database/create_db_tables.sql debian/tmp/usr/share/tango-db/create_db_tables.sql
 	install -p -m 644 $(CURDIR)/$(BUILDROOT)/cppserver/database/stored_proc.sql debian/tmp/usr/share/tango-db/stored_proc.sql
 	install -p -m 600 $(CURDIR)/$(BUILDROOT)/cppserver/database/my.cnf debian/tmp/usr/share/tango-db/my.cnf
-	cd "$(CURDIR)/$(BUILDROOT)" && dh_auto_install --destdir="$(CURDIR)/debian/tmp/"
 
 override_dh_strip:
 	dh_strip -plibtango7 --dbg-package=libtango7-dbg
@@ -47,7 +37,7 @@ override_dh_strip:
 	dh_strip -a -Nlibtango7 -Nliblog4tango4 -Ntango-db -Ntango-starter -Ntango-accesscontrol -Ntango-test
 
 %:
-	dh $@
+	dh $@ --builddirectory=$(BUILDROOT)
 
 .PHONY: get-orig-source
 

-- 
TANGO distributed control system.