[Debian-med-packaging] [SCM] The European Molecular Biology Open Software Suite. branch, master, updated. upstream/6.3.0-28-g1e734e1

[Charles Plessy]

The following commit has been merged in the master branch:
commit 1e734e1bac3eb5e6feae4bbb1e052652b1cf72d9
Author: Charles Plessy <plessy at debian.org>
Date:   Fri Jul 16 23:55:37 2010 +0900

    Keep and restore a clean copy of the test directory, closes: #587170.
    
    The package could not be build twice in a row since some binary files
    were remaining in the test directory.

diff --git a/debian/rules b/debian/rules
index dfc6662..9ab19c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,19 +51,11 @@ debian/copyright:
 clean: unpatch
 	dh_testdir
 	dh_testroot
+	[ ! -d debian/testbackup ] || ( $(RM) --recursive test ; mv debian/testbackup test )
 	[ ! -f Makefile ] || $(MAKE) distclean
-
 	find jemboss/ -type f -name "*.class" | xargs -r rm -f
-
 	rm --force --recursive debian/emboss_tmp
-
 	$(RM) config.status install-stamp
-	
-	# Temporary fix that may become unecessary in the future.
-	rm -f test/gb/Makefile test/wormpep/Makefile
-
-	-cp debian/testembossrcbackup test/.embossrc
-
 	dh_clean debian/copyright config.sub config.guess test-stamp
 
 install: build install-stamp
@@ -129,13 +121,13 @@ test: build test-stamp
 test-stamp:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	$(RM) test-stamp
-	[ debian/testembossrcbackup ] || cp test/.embossrc debian/testembossrcbackup
+	[ -d debian/testbackup ] || cp -a test debian/testbackup
 	sed -i "/SET emboss_tempdata/cSET emboss_tempdata $(CURDIR)/test" test/.embossrc
 	sed -i "/SET emboss_qadata/cSET emboss_qadata $(CURDIR)/test" test/.embossrc
 	echo "SET emboss_acdroot $(CURDIR)/emboss/acd" >> test/.embossrc
 	echo "SET emboss_data $(CURDIR)/emboss/data" >> test/.embossrc
 	echo "SET emboss_docroot $(CURDIR)/doc" >> test/.embossrc
-	cd test/qa && EMBOSSRC=$(CURDIR)/test PATH=$(CURDIR)/emboss:$$PATH ./qatest.csh
+	cd test/qa && EMBOSSRC=$(CURDIR)/test PATH=$(CURDIR)/emboss:$$PATH EMBOSS_ROOT=../../../ ./qatest.csh
 	touch test-stamp
 endif
 

-- 
The European Molecular Biology Open Software Suite.