[med-svn] r3954 - trunk/packages/phylip/trunk/debian/patches

[Andreas Tille]

Author: tille
Date: 2009-09-11 06:04:07 +0000 (Fri, 11 Sep 2009)
New Revision: 3954

Removed:
   trunk/packages/phylip/trunk/debian/patches/02_fix_treedist
Modified:
   trunk/packages/phylip/trunk/debian/patches/01_src_Makefile.patch
   trunk/packages/phylip/trunk/debian/patches/01_src_phylip_h
   trunk/packages/phylip/trunk/debian/patches/series
Log:
Updated patches (former SVN did not reflected the really used patches, reason unknown)


Modified: trunk/packages/phylip/trunk/debian/patches/01_src_Makefile.patch
===================================================================
--- trunk/packages/phylip/trunk/debian/patches/01_src_Makefile.patch	2009-09-09 16:43:12 UTC (rev 3953)
+++ trunk/packages/phylip/trunk/debian/patches/01_src_Makefile.patch	2009-09-11 06:04:07 UTC (rev 3954)
@@ -1,14 +1,14 @@
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -51,6 +51,7 @@
+--- phylip-3.67.orig/src/Makefile
++++ phylip-3.67/src/Makefile
+@@ -45,6 +45,7 @@
  #
  # the following specifies the directory where the executables will be placed
  EXEDIR  = ../exe
-+DATADIR = ../fonts
++DATADIR = ../exe
  #
  # ----------------------------------------------------------------------------
  #
-@@ -232,8 +233,10 @@
+@@ -189,8 +190,10 @@
  	@echo "Installing PHYLIP v3.6 binaries in $(EXEDIR)"
  	@mkdir -p $(EXEDIR)
  	@cp $(PROGS) $(EXEDIR)
@@ -21,3 +21,17 @@
  	@echo "Finished installation."
  	@echo ""
  
+@@ -207,6 +210,13 @@
+ 	@echo "Finished cleanup."
+ 	@echo ""
+ 
++distclean:
++	@make clean
++	@echo "Removing executables"
++	@rm -rf $(EXEDIR) $(DATADIR)
++	@echo "Finaly removed all executable files."
++	@echo ""
++
+ #
+ # compile object files shared between programs
+ # (make's implicit rule for %.o will take care of these)

Modified: trunk/packages/phylip/trunk/debian/patches/01_src_phylip_h
===================================================================
--- trunk/packages/phylip/trunk/debian/patches/01_src_phylip_h	2009-09-09 16:43:12 UTC (rev 3953)
+++ trunk/packages/phylip/trunk/debian/patches/01_src_phylip_h	2009-09-11 06:04:07 UTC (rev 3954)
@@ -1,5 +1,5 @@
---- a/src/phylip.h
-+++ b/src/phylip.h
+--- phylip-3.67.orig/src/phylip.h
++++ phylip-3.67/src/phylip.h
 @@ -72,7 +72,7 @@
  #define EBCDIC false
  #define INFILE "infile"

Deleted: trunk/packages/phylip/trunk/debian/patches/02_fix_treedist
===================================================================
--- trunk/packages/phylip/trunk/debian/patches/02_fix_treedist	2009-09-09 16:43:12 UTC (rev 3953)
+++ trunk/packages/phylip/trunk/debian/patches/02_fix_treedist	2009-09-11 06:04:07 UTC (rev 3954)
@@ -1,20 +0,0 @@
---- a/src/cons.h
-+++ b/src/cons.h
-@@ -52,6 +52,7 @@
- boolean samename(naym, plotstring);
- void   reordertips(void);
- void   read_groups (pattern_elm ****, long, long, FILE *);
-+void   clean_up_final ();
- /* function prototypes */
- #endif
- 
---- a/src/treedist.c
-+++ b/src/treedist.c
-@@ -1104,7 +1104,6 @@
- int main(int argc, Char *argv[])
- {  
-   pattern_elm  ***pattern_array;
--  char *s; /* for getenv */
-   long trees_in_1 = 0, trees_in_2 = 0;
-   long tip_count = 0;
-   long alt_maxgrp = -1;

Modified: trunk/packages/phylip/trunk/debian/patches/series
===================================================================
--- trunk/packages/phylip/trunk/debian/patches/series	2009-09-09 16:43:12 UTC (rev 3953)
+++ trunk/packages/phylip/trunk/debian/patches/series	2009-09-11 06:04:07 UTC (rev 3954)
@@ -1,3 +1,3 @@
-01_src_Makefile.patch 
+01_Makefile.patch
+01_src_Makefile.patch
 01_src_phylip_h
-02_fix_treedist