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

[manuel at alioth.debian.org]

Author: manuel
Date: 2008-10-31 15:54:57 +0000 (Fri, 31 Oct 2008)
New Revision: 2610

Added:
   trunk/packages/phylip/trunk/debian/patches/02_fix_treedist
Removed:
   trunk/packages/phylip/trunk/debian/patches/02_src_cons_h
Modified:
   trunk/packages/phylip/trunk/debian/patches/series
Log:
Renamed treedist patch, fixed remaining warning on treedist


Copied: trunk/packages/phylip/trunk/debian/patches/02_fix_treedist (from rev 2608, trunk/packages/phylip/trunk/debian/patches/02_src_cons_h)
===================================================================
--- trunk/packages/phylip/trunk/debian/patches/02_fix_treedist	                        (rev 0)
+++ trunk/packages/phylip/trunk/debian/patches/02_fix_treedist	2008-10-31 15:54:57 UTC (rev 2610)
@@ -0,0 +1,20 @@
+--- 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;


Property changes on: trunk/packages/phylip/trunk/debian/patches/02_fix_treedist
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: trunk/packages/phylip/trunk/debian/patches/02_src_cons_h
===================================================================
--- trunk/packages/phylip/trunk/debian/patches/02_src_cons_h	2008-10-31 15:35:10 UTC (rev 2609)
+++ trunk/packages/phylip/trunk/debian/patches/02_src_cons_h	2008-10-31 15:54:57 UTC (rev 2610)
@@ -1,10 +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
- 

Modified: trunk/packages/phylip/trunk/debian/patches/series
===================================================================
--- trunk/packages/phylip/trunk/debian/patches/series	2008-10-31 15:35:10 UTC (rev 2609)
+++ trunk/packages/phylip/trunk/debian/patches/series	2008-10-31 15:54:57 UTC (rev 2610)
@@ -1,3 +1,3 @@
 01_src_Makefile.patch 
 01_src_phylip_h
-02_src_cons_h
+02_fix_treedist