[med-svn] r7788 - in trunk/packages/eigensoft/trunk/debian: . patches

[Steffen Möller]

Author: moeller
Date: 2011-09-14 10:41:52 +0000 (Wed, 14 Sep 2011)
New Revision: 7788

Added:
   trunk/packages/eigensoft/trunk/debian/patches/optimizingBlasDependencies.patch
Modified:
   trunk/packages/eigensoft/trunk/debian/control
   trunk/packages/eigensoft/trunk/debian/patches/series
   trunk/packages/eigensoft/trunk/debian/rules
Log:
Better now :)


Modified: trunk/packages/eigensoft/trunk/debian/control
===================================================================
--- trunk/packages/eigensoft/trunk/debian/control	2011-09-14 10:23:28 UTC (rev 7787)
+++ trunk/packages/eigensoft/trunk/debian/control	2011-09-14 10:41:52 UTC (rev 7788)
@@ -24,3 +24,10 @@
  populations, minimizing spurious associations while maximizing power to
  detect true associations. The EIGENSOFT package has a built-in plotting
  script and supports multiple file formats and quantitative phenotypes.
+
+Package: eigensoft-dbg
+Architecture: any
+Depends: ${misc:Depends}
+Description: debug symbols for the eigensoft package
+ This package should be installed prior to reporting reproducible
+ crashes to the developers.

Added: trunk/packages/eigensoft/trunk/debian/patches/optimizingBlasDependencies.patch
===================================================================
--- trunk/packages/eigensoft/trunk/debian/patches/optimizingBlasDependencies.patch	                        (rev 0)
+++ trunk/packages/eigensoft/trunk/debian/patches/optimizingBlasDependencies.patch	2011-09-14 10:41:52 UTC (rev 7788)
@@ -0,0 +1,30 @@
+Index: eigensoft-3.0/src/Makefile
+===================================================================
+--- eigensoft-3.0.orig/src/Makefile	2011-09-14 12:36:24.214315437 +0200
++++ eigensoft-3.0/src/Makefile	2011-09-14 12:37:50.882744706 +0200
+@@ -87,10 +87,10 @@
+ 	rm -f $(PROGS) $(PERLPROGS)
+ 
+ $(M1): nicklib $(M1O)
+-	gcc -I$(IDIR) $(DEBUG_OPTIONS) -pthread -o $(M1) $(M1O) $(NLIB) -L/broad/tools/lib64 -lm -llapack -l$(BLAS) -Wimplicit
++	gcc -I$(IDIR) $(DEBUG_OPTIONS) -pthread -o $(M1) $(M1O) $(NLIB) -L/broad/tools/lib64 -lm -llapack -Wimplicit
+ 
+ $(M1Z): nicklib $(M1ZO)
+-	gcc -I$(IDIR) $(DEBUG_OPTIONS) -pthread -o $(M1Z) $(M1ZO) $(NLIB)  -L/broad/tools/lib64 -lm -llapack -l$(BLAS) -Wimplicit
++	gcc -I$(IDIR) $(DEBUG_OPTIONS) -pthread -o $(M1Z) $(M1ZO) $(NLIB)  -L/broad/tools/lib64 -lm -llapack -Wimplicit
+ 
+ $(M2): nicklib $(M2O)
+ 	gcc -I$(IDIR) $(DEBUG_OPTIONS) -lm  -o $(M2) $(M2O) $(NLIB) -Wimplicit
+@@ -105,10 +105,10 @@
+ 	gcc  -I$(IDIR) $(DEBUG_OPTIONS) -lm  -o $(M5) $(M5O) $(NLIB) -Wimplicit
+ 
+ $(M6): nicklib $(M6O)
+-	gcc  -I$(IDIR) $(DEBUG_OPTIONS) -pthread -o $(M6) $(M6O) $(NLIB) -L/broad/tools/lib64 -lm -llapack -l$(BLAS) -Wimplicit
++	gcc  -I$(IDIR) $(DEBUG_OPTIONS) -pthread -o $(M6) $(M6O) $(NLIB) -L/broad/tools/lib64 -lm -llapack -Wimplicit
+ 
+ $(M7): nicklib $(M7O)
+-	gcc  -I$(IDIR) $(DEBUG_OPTIONS) -pthread -o $(M7) $(M7O) $(NLIB) -L/broad/tools/lib64 -lm -llapack -l$(BLAS)  -Wimplicit
++	gcc  -I$(IDIR) $(DEBUG_OPTIONS) -pthread -o $(M7) $(M7O) $(NLIB) -L/broad/tools/lib64 -lm -llapack -Wimplicit
+ 
+ $(M8): nicklib $(M8O)
+ 	gcc  -I$(IDIR) $(DEBUG_OPTIONS) -o $(M8) $(M8O) $(NLIB) -lm  -Wimplicit

Modified: trunk/packages/eigensoft/trunk/debian/patches/series
===================================================================
--- trunk/packages/eigensoft/trunk/debian/patches/series	2011-09-14 10:23:28 UTC (rev 7787)
+++ trunk/packages/eigensoft/trunk/debian/patches/series	2011-09-14 10:41:52 UTC (rev 7788)
@@ -1,2 +1,3 @@
 g772gfortran.patch
 atlasLinkNotNeeded.patch
+optimizingBlasDependencies.patch

Modified: trunk/packages/eigensoft/trunk/debian/rules
===================================================================
--- trunk/packages/eigensoft/trunk/debian/rules	2011-09-14 10:23:28 UTC (rev 7787)
+++ trunk/packages/eigensoft/trunk/debian/rules	2011-09-14 10:41:52 UTC (rev 7788)
@@ -13,13 +13,17 @@
 	dh $@ 
 
 override_dh_auto_build:
-	$(MAKE) FF=gfortran DEBUG_OPTIONS=-g -C src all
+	$(MAKE) DEBUG_OPTIONS=-g -C src all
+	cd src && make install
 
 override_dh_clean:
 	dh_clean
 	$(MAKE) -C src clean
 	rm -fr smartinclude smartlib smarttables
 
+override_dh_strip:
+	dh_strip --dbg-package=eigensoft-dbg
+
 VERSION=3.0
 get-orig-source:
 	[ ! -r ../EIG$(VERSION) ] || wget http://www.hsph.harvard.edu/faculty/alkes-price/files/EIG$(VERSION).tar.gz -O ../EIG$(VERSION).tar.gz