[med-svn] r3271 - trunk/packages/emboss/trunk/debian

[Charles Plessy]

Author: plessy
Date: 2009-04-08 07:30:53 +0000 (Wed, 08 Apr 2009)
New Revision: 3271

Modified:
   trunk/packages/emboss/trunk/debian/changelog
   trunk/packages/emboss/trunk/debian/rules
Log:
Repaired the regression tests and made stamping work.


Modified: trunk/packages/emboss/trunk/debian/changelog
===================================================================
--- trunk/packages/emboss/trunk/debian/changelog	2009-04-08 06:34:32 UTC (rev 3270)
+++ trunk/packages/emboss/trunk/debian/changelog	2009-04-08 07:30:53 UTC (rev 3271)
@@ -4,6 +4,10 @@
     - Corrections on syntax using the master qualifier name as a suffix.
     - Better support of the --without-x (not used in this package).
     - Bug corrected for needle and water using the -nobrief option.
+  * debian/rules
+    - Corrected again the targets to avoid calling them when it is not
+      necessary.
+    - Defines emboss_acdroot and emboss_data in order to run the tests.
 
  -- Charles Plessy <plessy at debian.org>  Wed, 08 Apr 2009 14:42:58 +0900
 

Modified: trunk/packages/emboss/trunk/debian/rules
===================================================================
--- trunk/packages/emboss/trunk/debian/rules	2009-04-08 06:34:32 UTC (rev 3270)
+++ trunk/packages/emboss/trunk/debian/rules	2009-04-08 07:30:53 UTC (rev 3271)
@@ -29,8 +29,8 @@
 
 include /usr/share/quilt/quilt.make
 
-build: build-stamp
-build-stamp: config.status patch debian/copyright
+build: build-stamp config.status patch debian/copyright
+build-stamp:
 	dh_testdir
 	$(MAKE) AJAX_FIXED_ROOT=\\\"/usr/share/EMBOSS\\\"
 	touch build-stamp
@@ -64,7 +64,7 @@
 
 	dh_clean debian/copyright config.sub config.guess test-stamp
 
-install: build-stamp install-stamp
+install: build install-stamp
 install-stamp:
 	dh_testdir
 	dh_testroot
@@ -119,13 +119,17 @@
 
 	touch install-stamp
 
-test: test-stamp
+test: build test-stamp
 test-stamp:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	[ ../debian/testembossrcbackup ] || cp test/.embossrc ../debian/testembossrcbackup
+	$(RM) test-stamp
+	[ debian/testembossrcbackup ] || cp test/.embossrc debian/testembossrcbackup
 	sed -i "/SET emboss_tempdata/cSET emboss_tempdata $(CURDIR)/test" test/.embossrc
 	sed -i "/SET emboss_qadata/cSET emboss_qadata $(CURDIR)/test" test/.embossrc
-	cd test/qa && PATH=$(CURDIR)/emboss:$$PATH ./qatest.csh
+	echo "SET emboss_acdroot $(CURDIR)/emboss/acd" >> test/.embossrc
+	echo "SET emboss_data $(CURDIR)/emboss/data" >> test/.embossrc
+	cd test/qa && EMBOSSRC=$(CURDIR)/test PATH=$(CURDIR)/emboss:$$PATH ./qatest.csh
+	touch test-stamp
 endif
 
 binary-indep: build install