[med-svn] [eigensoft] 01/03: DEP3 header and removed unused patches

Andreas Tille tille at debian.org
Tue Jan 26 13:19:51 UTC 2016


This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository eigensoft.

commit d6c4956fa214eeb4618299a11e1ad9b0179c06dd
Author: Andreas Tille <tille at debian.org>
Date:   Tue Jan 26 14:00:59 2016 +0100

    DEP3 header and removed unused patches
---
 debian/changelog                                |  1 +
 debian/patches/atlasLinkNotNeeded.patch         | 30 -----------------
 debian/patches/g772gfortran.patch               | 43 -------------------------
 debian/patches/optimizingBlasDependencies.patch | 30 -----------------
 debian/patches/perlPath.patch                   | 16 ++++-----
 5 files changed, 9 insertions(+), 111 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1139cbf..b30c008 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ eigensoft (6.0.1+ds-1) UNRELEASED; urgency=medium
   * Priority: optional
   * debhelper 9
   * Remove -dbg package which is autogenerated now
+  * DEP3 header and removed unused patches
 
  -- Andreas Tille <tille at debian.org>  Tue, 26 Jan 2016 12:55:32 +0100
 
diff --git a/debian/patches/atlasLinkNotNeeded.patch b/debian/patches/atlasLinkNotNeeded.patch
deleted file mode 100644
index 7448755..0000000
--- a/debian/patches/atlasLinkNotNeeded.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: eigenstrat-3.0/src/Makefile
-===================================================================
---- eigenstrat-3.0.orig/src/Makefile	2011-09-14 11:51:57.597092399 +0200
-+++ eigenstrat-3.0/src/Makefile	2011-09-14 11:53:41.913609546 +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 -latlas -l$(BLAS) -Wimplicit
-+	gcc -I$(IDIR) $(DEBUG_OPTIONS) -pthread -o $(M1) $(M1O) $(NLIB) -L/broad/tools/lib64 -lm -llapack -l$(BLAS) -Wimplicit
- 
- $(M1Z): nicklib $(M1ZO)
--	gcc -I$(IDIR) $(DEBUG_OPTIONS) -pthread -o $(M1Z) $(M1ZO) $(NLIB)  -L/broad/tools/lib64 -lm -latlas -llapack -l$(BLAS) -Wimplicit
-+	gcc -I$(IDIR) $(DEBUG_OPTIONS) -pthread -o $(M1Z) $(M1ZO) $(NLIB)  -L/broad/tools/lib64 -lm -llapack -l$(BLAS) -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 -latlas -llapack -l$(BLAS) -Wimplicit
-+	gcc  -I$(IDIR) $(DEBUG_OPTIONS) -pthread -o $(M6) $(M6O) $(NLIB) -L/broad/tools/lib64 -lm -llapack -l$(BLAS) -Wimplicit
- 
- $(M7): nicklib $(M7O)
--	gcc  -I$(IDIR) $(DEBUG_OPTIONS) -pthread -o $(M7) $(M7O) $(NLIB) -L/broad/tools/lib64 -lm -latlas -llapack -l$(BLAS)  -Wimplicit
-+	gcc  -I$(IDIR) $(DEBUG_OPTIONS) -pthread -o $(M7) $(M7O) $(NLIB) -L/broad/tools/lib64 -lm -llapack -l$(BLAS)  -Wimplicit
- 
- $(M8): nicklib $(M8O)
- 	gcc  -I$(IDIR) $(DEBUG_OPTIONS) -o $(M8) $(M8O) $(NLIB) -lm  -Wimplicit
diff --git a/debian/patches/g772gfortran.patch b/debian/patches/g772gfortran.patch
deleted file mode 100644
index e2b82c7..0000000
--- a/debian/patches/g772gfortran.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: eigenstrat-3.0/src/Makefile
-===================================================================
---- eigenstrat-3.0.orig/src/Makefile	2011-09-14 11:27:28.565807868 +0200
-+++ eigenstrat-3.0/src/Makefile	2011-09-14 11:30:59.594854531 +0200
-@@ -21,7 +21,7 @@
- 
- # CC=/util/bin/gcc 
- CC=gcc
--FF=g77     
-+FF=gfortran
- 
- CFLAGS= -c -pthread -I$(IDIR) -I$(IDIR3) -Wimplicit
- OBJ=strsubs.o sortit.o vsubs.o statsubs.o linsubs.o getpars.o xsearch.o gauss.o	gds.o
-@@ -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 -lg2c -lm -llapack -latlas -l$(BLAS) -Wimplicit 
-+	gcc -I$(IDIR) $(DEBUG_OPTIONS) -pthread -o $(M1) $(M1O) $(NLIB) -L/broad/tools/lib64 -lm -llapack -latlas -l$(BLAS) -Wimplicit
- 
- $(M1Z): nicklib $(M1ZO)
--	gcc -I$(IDIR) $(DEBUG_OPTIONS) -pthread -o $(M1Z) $(M1ZO) $(NLIB)  -L/broad/tools/lib64 -lm -lg2c -latlas -llapack -l$(BLAS) -Wimplicit
-+	gcc -I$(IDIR) $(DEBUG_OPTIONS) -pthread -o $(M1Z) $(M1ZO) $(NLIB)  -L/broad/tools/lib64 -lm -latlas -llapack -l$(BLAS) -Wimplicit
- 
- $(M2): nicklib $(M2O)
- 	gcc -I$(IDIR) $(DEBUG_OPTIONS) -lm  -o $(M2) $(M2O) $(NLIB) -Wimplicit
-@@ -105,13 +105,13 @@
- 	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 -lg2c -lm -latlas -llapack -l$(BLAS) -Wimplicit
-+	gcc  -I$(IDIR) $(DEBUG_OPTIONS) -pthread -o $(M6) $(M6O) $(NLIB) -L/broad/tools/lib64 -lm -latlas -llapack -l$(BLAS) -Wimplicit
- 
- $(M7): nicklib $(M7O)
--	gcc  -I$(IDIR) $(DEBUG_OPTIONS) -pthread -o $(M7) $(M7O) $(NLIB) -L/broad/tools/lib64 -lg2c -lm -latlas -llapack -l$(BLAS)  -Wimplicit
-+	gcc  -I$(IDIR) $(DEBUG_OPTIONS) -pthread -o $(M7) $(M7O) $(NLIB) -L/broad/tools/lib64 -lm -latlas -llapack -l$(BLAS)  -Wimplicit
- 
- $(M8): nicklib $(M8O)
--	gcc  -I$(IDIR) $(DEBUG_OPTIONS) -o $(M8) $(M8O) $(NLIB) -lg2c -lm  -Wimplicit
-+	gcc  -I$(IDIR) $(DEBUG_OPTIONS) -o $(M8) $(M8O) $(NLIB) -lm  -Wimplicit
- 
- $(M9): nicklib $(M9O)
- 	gcc -I$(IDIR) $(DEBUG_OPTIONS) -lm  -o $(M9) $(M9O) $(NLIB) -Wimplicit
diff --git a/debian/patches/optimizingBlasDependencies.patch b/debian/patches/optimizingBlasDependencies.patch
deleted file mode 100644
index 050841f..0000000
--- a/debian/patches/optimizingBlasDependencies.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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
diff --git a/debian/patches/perlPath.patch b/debian/patches/perlPath.patch
index 88a00be..2128c9c 100644
--- a/debian/patches/perlPath.patch
+++ b/debian/patches/perlPath.patch
@@ -1,17 +1,17 @@
-Index: EIG4.2/bin/fixgreen
-===================================================================
---- EIG4.2.orig/bin/fixgreen	2011-08-30 19:50:31.000000000 +0200
-+++ EIG4.2/bin/fixgreen	2011-09-15 14:56:30.965757769 +0200
+Author: Steffen Moeller <moeller at debian.org>
+Last-Update: Thu, 15 Sep 2011 14:20:03 +0200
+Description: Use proper Perl PATH
+
+--- a/bin/fixgreen
++++ b/bin/fixgreen
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl  -w 
 +#!/usr/bin/perl  -w
  
  ## a better green color for gnuplot (dark green)
  ## and yellow
-Index: EIG4.2/bin/ploteig
-===================================================================
---- EIG4.2.orig/bin/ploteig	2011-08-30 19:50:31.000000000 +0200
-+++ EIG4.2/bin/ploteig	2011-09-15 14:56:35.277779144 +0200
+--- a/bin/ploteig
++++ b/bin/ploteig
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl  -w 
 +#!/usr/bin/perl  -w

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/eigensoft.git



More information about the debian-med-commit mailing list