[med-svn] r1229 - in trunk/packages/treeviewx/trunk/debian: . patches
charles-guest at alioth.debian.org
charles-guest at alioth.debian.org
Thu Jan 31 01:51:08 UTC 2008
Author: charles-guest
Date: 2008-01-31 01:51:08 +0000 (Thu, 31 Jan 2008)
New Revision: 1229
Added:
trunk/packages/treeviewx/trunk/debian/patches/45_gcc4.3.diff
trunk/packages/treeviewx/trunk/debian/patches/50_wxT_tv.cpp.diff
trunk/packages/treeviewx/trunk/debian/patches/51_wxT_tview.cpp.diff
trunk/packages/treeviewx/trunk/debian/patches/60_LGPLtoGPL.diff
trunk/packages/treeviewx/trunk/debian/patches/70_choose_tree.diff
trunk/packages/treeviewx/trunk/debian/patches/80_missing_includes.diff
trunk/packages/treeviewx/trunk/debian/patches/series
Removed:
trunk/packages/treeviewx/trunk/debian/patches/00list
trunk/packages/treeviewx/trunk/debian/patches/45_gcc4.3.dpatch
trunk/packages/treeviewx/trunk/debian/patches/50_wxT_tv.cpp.dpatch
trunk/packages/treeviewx/trunk/debian/patches/51_wxT_tview.cpp.dpatch
trunk/packages/treeviewx/trunk/debian/patches/60_LGPLtoGPL.dpatch
trunk/packages/treeviewx/trunk/debian/patches/70_choose_tree.dpatch
trunk/packages/treeviewx/trunk/debian/patches/80_missing_includes.dpatch
Modified:
trunk/packages/treeviewx/trunk/debian/control
Log:
swiched from dpatch to quilt
Modified: trunk/packages/treeviewx/trunk/debian/control
===================================================================
--- trunk/packages/treeviewx/trunk/debian/control 2008-01-30 18:17:57 UTC (rev 1228)
+++ trunk/packages/treeviewx/trunk/debian/control 2008-01-31 01:51:08 UTC (rev 1229)
@@ -5,7 +5,7 @@
XS-DM-Upload-Allowed: yes
Uploaders: Charles Plessy <charles-debian-nospam at plessy.org>,
David Paleino <d.paleino at gmail.com>
-Build-Depends: debhelper (>= 5), autotools-dev, dpatch, libwxgtk2.6-dev
+Build-Depends: debhelper (>= 5), cdbs, autotools-dev, quilt, libwxgtk2.6-dev
Standards-Version: 3.7.3
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/treeviewx/trunk/
Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/treeviewx
Deleted: trunk/packages/treeviewx/trunk/debian/patches/00list
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/00list 2008-01-30 18:17:57 UTC (rev 1228)
+++ trunk/packages/treeviewx/trunk/debian/patches/00list 2008-01-31 01:51:08 UTC (rev 1229)
@@ -1,6 +0,0 @@
-45_gcc4.3.dpatch
-50_wxT_tv.cpp.dpatch
-51_wxT_tview.cpp.dpatch
-60_LGPLtoGPL.dpatch
-70_choose_tree.dpatch
-80_missing_includes.dpatch
Added: trunk/packages/treeviewx/trunk/debian/patches/45_gcc4.3.diff
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/45_gcc4.3.diff (rev 0)
+++ trunk/packages/treeviewx/trunk/debian/patches/45_gcc4.3.diff 2008-01-31 01:51:08 UTC (rev 1229)
@@ -0,0 +1,21 @@
+Makes TreeView X buildable with gcc 4.3
+--- ./TreeLib/TreeLib.cpp~ 2007-04-04 12:30:13.000000000 +0000
++++ ./TreeLib/TreeLib.cpp 2007-04-04 12:30:19.000000000 +0000
+@@ -23,6 +23,7 @@
+ #include "TreeLib.h"
+ #include "Parse.h"
+
++#include <cstdlib>
+ #include <vector>
+
+
+--- ./TreeLib/treereader.cpp~ 2007-04-04 12:33:15.000000000 +0000
++++ ./TreeLib/treereader.cpp 2007-04-04 12:33:27.000000000 +0000
+@@ -21,6 +21,7 @@
+ // $Id: treereader.cpp,v 1.5 2003/09/10 12:58:16 rdmp1c Exp $
+
+ #include "treereader.h"
++#include <cstdlib>
+
+ #if __MWERKS__
+ #include <string.h>
Property changes on: trunk/packages/treeviewx/trunk/debian/patches/45_gcc4.3.diff
___________________________________________________________________
Name: svn:executable
+ *
Deleted: trunk/packages/treeviewx/trunk/debian/patches/45_gcc4.3.dpatch
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/45_gcc4.3.dpatch 2008-01-30 18:17:57 UTC (rev 1228)
+++ trunk/packages/treeviewx/trunk/debian/patches/45_gcc4.3.dpatch 2008-01-31 01:51:08 UTC (rev 1229)
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 45_gcc4.3.dpatch by Charles Plessy <charles-debian-nospam at plessy.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Makes TreeView X buildable with gcc 4.3
-
- at DPATCH@
-
---- ./TreeLib/TreeLib.cpp~ 2007-04-04 12:30:13.000000000 +0000
-+++ ./TreeLib/TreeLib.cpp 2007-04-04 12:30:19.000000000 +0000
-@@ -23,6 +23,7 @@
- #include "TreeLib.h"
- #include "Parse.h"
-
-+#include <cstdlib>
- #include <vector>
-
-
---- ./TreeLib/treereader.cpp~ 2007-04-04 12:33:15.000000000 +0000
-+++ ./TreeLib/treereader.cpp 2007-04-04 12:33:27.000000000 +0000
-@@ -21,6 +21,7 @@
- // $Id: treereader.cpp,v 1.5 2003/09/10 12:58:16 rdmp1c Exp $
-
- #include "treereader.h"
-+#include <cstdlib>
-
- #if __MWERKS__
- #include <string.h>
Added: trunk/packages/treeviewx/trunk/debian/patches/50_wxT_tv.cpp.diff
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/50_wxT_tv.cpp.diff (rev 0)
+++ trunk/packages/treeviewx/trunk/debian/patches/50_wxT_tv.cpp.diff 2008-01-31 01:51:08 UTC (rev 1229)
@@ -0,0 +1,17 @@
+Adding wxT escapes in the tv.cpp file
+--- tv-0.5.1-old/tv.cpp 2005-03-23 22:30:32.000000000 +0900
++++ tv-0.5.1/tv.cpp 2006-03-13 09:35:38.000000000 +0900
+@@ -312,11 +312,11 @@
+ {
+ #ifdef __WXMSW__
+ file_menu->AppendSeparator();
+- file_menu->Append(SAVEAS_PICTURE_CMD, "Save As Picture..."), wxT("Save picture of tree to metafile");
++ file_menu->Append(SAVEAS_PICTURE_CMD, wxT("Save As Picture...")), wxT("Save picture of tree to metafile");
+ #else
+ #ifdef USE_SVG
+ file_menu->AppendSeparator();
+- file_menu->Append(SAVEAS_PICTURE_CMD, "Save As Picture..."), wxT("Save picture of tree to SVG file");
++ file_menu->Append(SAVEAS_PICTURE_CMD, wxT("Save As Picture...")), wxT("Save picture of tree to SVG file");
+ #endif
+ #endif
+ file_menu->AppendSeparator();
Property changes on: trunk/packages/treeviewx/trunk/debian/patches/50_wxT_tv.cpp.diff
___________________________________________________________________
Name: svn:executable
+ *
Deleted: trunk/packages/treeviewx/trunk/debian/patches/50_wxT_tv.cpp.dpatch
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/50_wxT_tv.cpp.dpatch 2008-01-30 18:17:57 UTC (rev 1228)
+++ trunk/packages/treeviewx/trunk/debian/patches/50_wxT_tv.cpp.dpatch 2008-01-31 01:51:08 UTC (rev 1229)
@@ -1,25 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_wxT_tv.cpp.dpatch by Charles Plessy <charles-debian-nospam at plessy.org>
-## This patch is hereby released in the public domain.
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adding wxT escapes in the tv.cpp file
-
- at DPATCH@
-
---- tv-0.5.1-old/tv.cpp 2005-03-23 22:30:32.000000000 +0900
-+++ tv-0.5.1/tv.cpp 2006-03-13 09:35:38.000000000 +0900
-@@ -312,11 +312,11 @@
- {
- #ifdef __WXMSW__
- file_menu->AppendSeparator();
-- file_menu->Append(SAVEAS_PICTURE_CMD, "Save As Picture..."), wxT("Save picture of tree to metafile");
-+ file_menu->Append(SAVEAS_PICTURE_CMD, wxT("Save As Picture...")), wxT("Save picture of tree to metafile");
- #else
- #ifdef USE_SVG
- file_menu->AppendSeparator();
-- file_menu->Append(SAVEAS_PICTURE_CMD, "Save As Picture..."), wxT("Save picture of tree to SVG file");
-+ file_menu->Append(SAVEAS_PICTURE_CMD, wxT("Save As Picture...")), wxT("Save picture of tree to SVG file");
- #endif
- #endif
- file_menu->AppendSeparator();
Added: trunk/packages/treeviewx/trunk/debian/patches/51_wxT_tview.cpp.diff
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/51_wxT_tview.cpp.diff (rev 0)
+++ trunk/packages/treeviewx/trunk/debian/patches/51_wxT_tview.cpp.diff 2008-01-31 01:51:08 UTC (rev 1229)
@@ -0,0 +1,25 @@
+Adding wxT escapes in the tview.cpp file
+--- tv-0.5.1-old/tview.cpp 2005-08-31 17:55:13.000000000 +0900
++++ tv-0.5.1/tview.cpp 2006-03-13 09:35:50.000000000 +0900
+@@ -184,8 +184,8 @@
+ wxString pictureFileName = GetFrame()->GetTitle();
+ pictureFileName += wxT(".emf");
+ wxFrame *f = GetMainFrame();
+- wxFileDialog dialog((wxWindow *)f, "Save Picture as", "", pictureFileName,
+- "Enhanced metafile (*.emf)|*.emf",
++ wxFileDialog dialog((wxWindow *)f, wxT("Save Picture as"), wxT(""), pictureFileName,
++ wxT("Enhanced metafile (*.emf)|*.emf"),
+ wxSAVE|wxOVERWRITE_PROMPT);
+
+ if (dialog.ShowModal() == wxID_OK)
+@@ -204,8 +204,8 @@
+ #else
+ wxFrame *f = GetMainFrame();
+ #endif
+- wxFileDialog dialog((wxWindow *)f, "Save Picture as", "", pictureFileName,
+- "SVG vector picture files (*.svg)|*.svg",
++ wxFileDialog dialog((wxWindow *)f, wxT("Save Picture as"), wxT(""), pictureFileName,
++ wxT("SVG vector picture files (*.svg)|*.svg"),
+ wxSAVE|wxOVERWRITE_PROMPT);
+
+ if (dialog.ShowModal() == wxID_OK)
Property changes on: trunk/packages/treeviewx/trunk/debian/patches/51_wxT_tview.cpp.diff
___________________________________________________________________
Name: svn:executable
+ *
Deleted: trunk/packages/treeviewx/trunk/debian/patches/51_wxT_tview.cpp.dpatch
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/51_wxT_tview.cpp.dpatch 2008-01-30 18:17:57 UTC (rev 1228)
+++ trunk/packages/treeviewx/trunk/debian/patches/51_wxT_tview.cpp.dpatch 2008-01-31 01:51:08 UTC (rev 1229)
@@ -1,33 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 51_wxT_tview.cpp.dpatch by Charles Plessy <charles-debian-nospam at plessy.org>
-## This patch is hereby released in the public domain.
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adding wxT escapes in the tview.cpp file
-
- at DPATCH@
-
---- tv-0.5.1-old/tview.cpp 2005-08-31 17:55:13.000000000 +0900
-+++ tv-0.5.1/tview.cpp 2006-03-13 09:35:50.000000000 +0900
-@@ -184,8 +184,8 @@
- wxString pictureFileName = GetFrame()->GetTitle();
- pictureFileName += wxT(".emf");
- wxFrame *f = GetMainFrame();
-- wxFileDialog dialog((wxWindow *)f, "Save Picture as", "", pictureFileName,
-- "Enhanced metafile (*.emf)|*.emf",
-+ wxFileDialog dialog((wxWindow *)f, wxT("Save Picture as"), wxT(""), pictureFileName,
-+ wxT("Enhanced metafile (*.emf)|*.emf"),
- wxSAVE|wxOVERWRITE_PROMPT);
-
- if (dialog.ShowModal() == wxID_OK)
-@@ -204,8 +204,8 @@
- #else
- wxFrame *f = GetMainFrame();
- #endif
-- wxFileDialog dialog((wxWindow *)f, "Save Picture as", "", pictureFileName,
-- "SVG vector picture files (*.svg)|*.svg",
-+ wxFileDialog dialog((wxWindow *)f, wxT("Save Picture as"), wxT(""), pictureFileName,
-+ wxT("SVG vector picture files (*.svg)|*.svg"),
- wxSAVE|wxOVERWRITE_PROMPT);
-
- if (dialog.ShowModal() == wxID_OK)
Added: trunk/packages/treeviewx/trunk/debian/patches/60_LGPLtoGPL.diff
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/60_LGPLtoGPL.diff (rev 0)
+++ trunk/packages/treeviewx/trunk/debian/patches/60_LGPLtoGPL.diff 2008-01-31 01:51:08 UTC (rev 1229)
@@ -0,0 +1,1067 @@
+Converts LGPL statements to GPL, updates FSF's adress.
+diff -ruN tv.orig/COPYING tv/COPYING
+--- tv.orig/COPYING 2006-06-12 21:11:38.000000000 +0900
++++ tv/COPYING 2006-06-28 20:39:19.000000000 +0900
+@@ -2,7 +2,7 @@
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+@@ -305,7 +305,7 @@
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+ Also add information on how to contact you by electronic and paper mail.
+diff -ruN tv.orig/LGPLtoGPL.diff tv/LGPLtoGPL.diff
+--- tv.orig/LGPLtoGPL.diff 1970-01-01 09:00:00.000000000 +0900
++++ tv/LGPLtoGPL.diff 2006-06-28 20:48:52.000000000 +0900
+@@ -0,0 +1,21 @@
++diff -ruN tv.orig/COPYING tv/COPYING
++--- tv.orig/COPYING 2006-06-12 21:11:38.000000000 +0900
+++++ tv/COPYING 2006-06-28 20:39:19.000000000 +0900
++@@ -2,7 +2,7 @@
++ Version 2, June 1991
++
++ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
++- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+++ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
++ Everyone is permitted to copy and distribute verbatim copies
++ of this license document, but changing it is not allowed.
++
++@@ -305,7 +305,7 @@
++
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software
++- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+++ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
++
++
++ Also add information on how to contact you by electronic and paper mail.
+diff -ruN tv.orig/tdoc.cpp tv/tdoc.cpp
+--- tv.orig/tdoc.cpp 2006-06-12 21:11:38.000000000 +0900
++++ tv/tdoc.cpp 2006-06-28 20:30:56.000000000 +0900
+@@ -3,20 +3,19 @@
+ * A phylogenetic tree viewer.
+ * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
+ *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
+ *
+- * This library is distributed in the hope that it will be useful,
++ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Library General Public License for more details.
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
+ *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307, USA.
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ // $Id: tdoc.cpp,v 1.6 2001/07/25 10:37:06 rdmp1c Exp $
+diff -ruN tv.orig/tdoc.h tv/tdoc.h
+--- tv.orig/tdoc.h 2006-06-28 20:26:50.000000000 +0900
++++ tv/tdoc.h 2006-06-28 20:24:07.000000000 +0900
+@@ -3,20 +3,19 @@
+ * A phylogenetic tree viewer.
+ * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
+ *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
+ *
+- * This library is distributed in the hope that it will be useful,
++ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Library General Public License for more details.
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
+ *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307, USA.
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ // $Id: tdoc.h,v 1.4 2001/07/24 10:49:48 rdmp1c Exp $
+diff -ruN tv.orig/tproject.h tv/tproject.h
+--- tv.orig/tproject.h 2006-06-12 21:11:38.000000000 +0900
++++ tv/tproject.h 2006-06-28 20:30:40.000000000 +0900
+@@ -3,20 +3,19 @@
+ * A phylogenetic tree viewer.
+ * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
+ *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
+ *
+- * This library is distributed in the hope that it will be useful,
++ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Library General Public License for more details.
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
+ *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307, USA.
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ // $Id: tproject.h,v 1.9 2005/08/31 08:55:25 rdmp1c Exp $
+diff -ruN tv.orig/TreeLib/lcaquery.h tv/TreeLib/lcaquery.h
+--- tv.orig/TreeLib/lcaquery.h 2006-06-12 21:11:34.000000000 +0900
++++ tv/TreeLib/lcaquery.h 2006-06-28 20:31:23.000000000 +0900
+@@ -3,20 +3,19 @@
+ * A library for manipulating phylogenetic trees.
+ * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
+ *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
+ *
+- * This library is distributed in the hope that it will be useful,
++ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Library General Public License for more details.
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
+ *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307, USA.
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ // $Id: lcaquery.h,v 1.1 2002/03/14 14:11:42 rdmp1c Exp $
+diff -ruN tv.orig/TreeLib/mast.cpp tv/TreeLib/mast.cpp
+--- tv.orig/TreeLib/mast.cpp 2006-06-12 21:11:34.000000000 +0900
++++ tv/TreeLib/mast.cpp 2006-06-28 20:31:07.000000000 +0900
+@@ -3,20 +3,19 @@
+ * A library for manipulating phylogenetic trees.
+ * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
+ *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
+ *
+- * This library is distributed in the hope that it will be useful,
++ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Library General Public License for more details.
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
+ *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307, USA.
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ // $Id: mast.cpp,v 1.5 2005/05/24 22:55:16 rdmp1c Exp $
+diff -ruN tv.orig/TreeLib/mast.h tv/TreeLib/mast.h
+--- tv.orig/TreeLib/mast.h 2006-06-12 21:11:34.000000000 +0900
++++ tv/TreeLib/mast.h 2006-06-28 20:31:23.000000000 +0900
+@@ -3,20 +3,19 @@
+ * A library for manipulating phylogenetic trees.
+ * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
+ *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
+ *
+- * This library is distributed in the hope that it will be useful,
++ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Library General Public License for more details.
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
+ *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307, USA.
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ // $Id: mast.h,v 1.1 2002/05/16 16:07:32 rdmp1c Exp $
+diff -ruN tv.orig/TreeLib/nodeiterator.h tv/TreeLib/nodeiterator.h
+--- tv.orig/TreeLib/nodeiterator.h 2006-06-12 21:11:34.000000000 +0900
++++ tv/TreeLib/nodeiterator.h 2006-06-28 20:31:23.000000000 +0900
+@@ -3,20 +3,19 @@
+ * A library for manipulating phylogenetic trees.
+ * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
+ *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
+ *
+- * This library is distributed in the hope that it will be useful,
++ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Library General Public License for more details.
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
+ *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307, USA.
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ // $Id: nodeiterator.h,v 1.5 2005/03/29 16:48:52 rdmp1c Exp $
+diff -ruN tv.orig/TreeLib/Parse.cpp tv/TreeLib/Parse.cpp
+--- tv.orig/TreeLib/Parse.cpp 2006-06-12 21:11:34.000000000 +0900
++++ tv/TreeLib/Parse.cpp 2006-06-28 20:31:08.000000000 +0900
+@@ -3,20 +3,19 @@
+ * A library for manipulating phylogenetic trees.
+ * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
+ *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
+ *
+- * This library is distributed in the hope that it will be useful,
++ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Library General Public License for more details.
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
+ *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307, USA.
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ // $Id: Parse.cpp,v 1.9 2002/02/23 12:22:32 rdmp1c Exp $
+diff -ruN tv.orig/TreeLib/Parse.h tv/TreeLib/Parse.h
+--- tv.orig/TreeLib/Parse.h 2006-06-12 21:11:34.000000000 +0900
++++ tv/TreeLib/Parse.h 2006-06-28 20:31:23.000000000 +0900
+@@ -3,20 +3,19 @@
+ * A library for manipulating phylogenetic trees.
+ * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
+ *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
+ *
+- * This library is distributed in the hope that it will be useful,
++ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Library General Public License for more details.
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
+ *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307, USA.
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ // $Id: Parse.h,v 1.7 2004/03/04 23:22:42 rdmp1c Exp $
+diff -ruN tv.orig/TreeLib/profile.h tv/TreeLib/profile.h
+--- tv.orig/TreeLib/profile.h 2006-06-12 21:11:34.000000000 +0900
++++ tv/TreeLib/profile.h 2006-06-28 20:31:23.000000000 +0900
+@@ -3,20 +3,19 @@
+ * A library for manipulating phylogenetic trees.
+ * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
+ *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
+ *
+- * This library is distributed in the hope that it will be useful,
++ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Library General Public License for more details.
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
+ *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307, USA.
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ // $Id: profile.h,v 1.30 2005/08/31 08:55:59 rdmp1c Exp $
+diff -ruN tv.orig/TreeLib/quartet.cpp tv/TreeLib/quartet.cpp
+--- tv.orig/TreeLib/quartet.cpp 2006-06-12 21:11:34.000000000 +0900
++++ tv/TreeLib/quartet.cpp 2006-06-28 20:31:08.000000000 +0900
+@@ -3,20 +3,19 @@
+ * A library for manipulating phylogenetic trees.
+ * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
+ *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
+ *
+- * This library is distributed in the hope that it will be useful,
++ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Library General Public License for more details.
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
+ *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307, USA.
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ // $Id: quartet.cpp,v 1.2 2002/03/14 16:37:13 rdmp1c Exp $
+diff -ruN tv.orig/TreeLib/quartet.h tv/TreeLib/quartet.h
+--- tv.orig/TreeLib/quartet.h 2006-06-12 21:11:34.000000000 +0900
++++ tv/TreeLib/quartet.h 2006-06-28 20:31:23.000000000 +0900
+@@ -3,20 +3,19 @@
+ * A library for manipulating phylogenetic trees.
+ * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
+ *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
+ *
+- * This library is distributed in the hope that it will be useful,
++ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Library General Public License for more details.
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
+ *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307, USA.
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ // $Id: quartet.h,v 1.1 2002/03/14 14:11:42 rdmp1c Exp $
+diff -ruN tv.orig/TreeLib/tokeniser.cpp tv/TreeLib/tokeniser.cpp
+--- tv.orig/TreeLib/tokeniser.cpp 2006-06-12 21:11:34.000000000 +0900
++++ tv/TreeLib/tokeniser.cpp 2006-06-28 20:31:08.000000000 +0900
+@@ -3,20 +3,19 @@
+ * A library for manipulating phylogenetic trees.
+ * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
+ *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
+ *
+- * This library is distributed in the hope that it will be useful,
++ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Library General Public License for more details.
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
+ *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307, USA.
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ // $Id: tokeniser.cpp,v 1.14 2005/09/05 07:44:48 rdmp1c Exp $
+diff -ruN tv.orig/TreeLib/tokeniser.h tv/TreeLib/tokeniser.h
+--- tv.orig/TreeLib/tokeniser.h 2006-06-12 21:11:34.000000000 +0900
++++ tv/TreeLib/tokeniser.h 2006-06-28 20:31:23.000000000 +0900
+@@ -3,20 +3,19 @@
+ * A library for manipulating phylogenetic trees.
+ * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
+ *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
+ *
+- * This library is distributed in the hope that it will be useful,
++ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Library General Public License for more details.
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
+ *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307, USA.
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ // $Id: tokeniser.h,v 1.14 2003/09/17 13:05:57 rdmp1c Exp $
+diff -ruN tv.orig/TreeLib/treedrawer.cpp tv/TreeLib/treedrawer.cpp
+--- tv.orig/TreeLib/treedrawer.cpp 2006-06-12 21:11:34.000000000 +0900
++++ tv/TreeLib/treedrawer.cpp 2006-06-28 20:31:08.000000000 +0900
+@@ -3,20 +3,19 @@
+ * A library for manipulating phylogenetic trees.
+ * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
+ *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
+ *
+- * This library is distributed in the hope that it will be useful,
++ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Library General Public License for more details.
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
+ *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307, USA.
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ // $Id: treedrawer.cpp,v 1.18 2005/09/06 13:00:14 rdmp1c Exp $
+diff -ruN tv.orig/TreeLib/treedrawer.h tv/TreeLib/treedrawer.h
+--- tv.orig/TreeLib/treedrawer.h 2006-06-12 21:11:34.000000000 +0900
++++ tv/TreeLib/treedrawer.h 2006-06-28 20:31:23.000000000 +0900
+@@ -3,20 +3,19 @@
+ * A library for manipulating phylogenetic trees.
+ * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
+ *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
+ *
+- * This library is distributed in the hope that it will be useful,
++ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Library General Public License for more details.
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
+ *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307, USA.
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ // $Id: treedrawer.h,v 1.8 2004/03/16 07:07:40 rdmp1c Exp $
+diff -ruN tv.orig/TreeLib/TreeLib.cpp tv/TreeLib/TreeLib.cpp
+--- tv.orig/TreeLib/TreeLib.cpp 2006-06-12 21:11:34.000000000 +0900
++++ tv/TreeLib/TreeLib.cpp 2006-06-28 20:31:08.000000000 +0900
+@@ -3,20 +3,19 @@
+ * A library for manipulating phylogenetic trees.
+ * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
+ *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
+ *
+- * This library is distributed in the hope that it will be useful,
++ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Library General Public License for more details.
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
+ *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307, USA.
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ // $Id: TreeLib.cpp,v 1.26 2004/05/13 12:22:11 jcotton Exp $
+diff -ruN tv.orig/TreeLib/TreeLib.h tv/TreeLib/TreeLib.h
+--- tv.orig/TreeLib/TreeLib.h 2006-06-12 21:11:34.000000000 +0900
++++ tv/TreeLib/TreeLib.h 2006-06-28 20:31:23.000000000 +0900
+@@ -3,20 +3,19 @@
+ * A library for manipulating phylogenetic trees.
+ * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
+ *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
+ *
+- * This library is distributed in the hope that it will be useful,
++ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Library General Public License for more details.
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
+ *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307, USA.
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ // $Id: TreeLib.h,v 1.26 2004/05/13 12:22:11 jcotton Exp $
+diff -ruN tv.orig/TreeLib/treeorder.cpp tv/TreeLib/treeorder.cpp
+--- tv.orig/TreeLib/treeorder.cpp 2006-06-12 21:11:34.000000000 +0900
++++ tv/TreeLib/treeorder.cpp 2006-06-28 20:31:08.000000000 +0900
+@@ -3,20 +3,19 @@
+ * A library for manipulating phylogenetic trees.
+ * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
+ *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
+ *
+- * This library is distributed in the hope that it will be useful,
++ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Library General Public License for more details.
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
+ *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307, USA.
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ // $Id: treeorder.cpp,v 1.2 2005/02/23 14:19:00 rdmp1c Exp $
+diff -ruN tv.orig/TreeLib/treeorder.h tv/TreeLib/treeorder.h
+--- tv.orig/TreeLib/treeorder.h 2006-06-12 21:11:34.000000000 +0900
++++ tv/TreeLib/treeorder.h 2006-06-28 20:31:23.000000000 +0900
+@@ -3,20 +3,19 @@
+ * A library for manipulating phylogenetic trees.
+ * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
+ *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
+ *
+- * This library is distributed in the hope that it will be useful,
++ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Library General Public License for more details.
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
+ *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307, USA.
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ // $Id: treeorder.h,v 1.4 2005/02/23 14:19:00 rdmp1c Exp $
+diff -ruN tv.orig/TreeLib/treereader.cpp tv/TreeLib/treereader.cpp
+--- tv.orig/TreeLib/treereader.cpp 2006-06-12 21:11:34.000000000 +0900
++++ tv/TreeLib/treereader.cpp 2006-06-28 20:31:08.000000000 +0900
+@@ -3,20 +3,19 @@
+ * A library for manipulating phylogenetic trees.
+ * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
+ *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
+ *
+- * This library is distributed in the hope that it will be useful,
++ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Library General Public License for more details.
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
+ *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307, USA.
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ // $Id: treereader.cpp,v 1.5 2003/09/10 12:58:16 rdmp1c Exp $
+diff -ruN tv.orig/TreeLib/treereader.h tv/TreeLib/treereader.h
+--- tv.orig/TreeLib/treereader.h 2006-06-12 21:11:34.000000000 +0900
++++ tv/TreeLib/treereader.h 2006-06-28 20:31:23.000000000 +0900
+@@ -3,20 +3,19 @@
+ * A library for manipulating phylogenetic trees.
+ * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
+ *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
+ *
+- * This library is distributed in the hope that it will be useful,
++ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Library General Public License for more details.
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
+ *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307, USA.
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ // $Id: treereader.h,v 1.4 2003/10/21 10:58:45 rdmp1c Exp $
+diff -ruN tv.orig/TreeLib/treewriter.cpp tv/TreeLib/treewriter.cpp
+--- tv.orig/TreeLib/treewriter.cpp 2006-06-12 21:11:34.000000000 +0900
++++ tv/TreeLib/treewriter.cpp 2006-06-28 20:31:08.000000000 +0900
+@@ -3,20 +3,19 @@
+ * A library for manipulating phylogenetic trees.
+ * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
+ *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
+ *
+- * This library is distributed in the hope that it will be useful,
++ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Library General Public License for more details.
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
+ *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307, USA.
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ // $Id: treewriter.cpp,v 1.4 2005/02/23 14:32:44 rdmp1c Exp $
+diff -ruN tv.orig/TreeLib/treewriter.h tv/TreeLib/treewriter.h
+--- tv.orig/TreeLib/treewriter.h 2006-06-12 21:11:34.000000000 +0900
++++ tv/TreeLib/treewriter.h 2006-06-28 20:31:23.000000000 +0900
+@@ -3,20 +3,19 @@
+ * A library for manipulating phylogenetic trees.
+ * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
+ *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
+ *
+- * This library is distributed in the hope that it will be useful,
++ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Library General Public License for more details.
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
+ *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307, USA.
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ // $Id: treewriter.h,v 1.5 2005/02/23 14:36:08 rdmp1c Exp $
+diff -ruN tv.orig/treeorder_dialog.cpp tv/treeorder_dialog.cpp
+--- tv.orig/treeorder_dialog.cpp 2006-06-12 21:11:38.000000000 +0900
++++ tv/treeorder_dialog.cpp 2006-06-28 20:30:56.000000000 +0900
+@@ -3,20 +3,19 @@
+ * A phylogenetic tree viewer.
+ * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
+ *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
+ *
+- * This library is distributed in the hope that it will be useful,
++ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Library General Public License for more details.
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
+ *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307, USA.
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ // $Id: treeorder_dialog.cpp,v 1.2 2005/02/21 19:41:24 rdmp1c Exp $
+diff -ruN tv.orig/treeorder_dialog.h tv/treeorder_dialog.h
+--- tv.orig/treeorder_dialog.h 2006-06-12 21:11:38.000000000 +0900
++++ tv/treeorder_dialog.h 2006-06-28 20:30:40.000000000 +0900
+@@ -3,20 +3,19 @@
+ * A phylogenetic tree viewer.
+ * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
+ *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
+ *
+- * This library is distributed in the hope that it will be useful,
++ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Library General Public License for more details.
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
+ *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307, USA.
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ // $Id: treeorder_dialog.h,v 1.2 2003/10/22 16:46:26 rdmp1c Exp $
+diff -ruN tv.orig/tv.cpp tv/tv.cpp
+--- tv.orig/tv.cpp 2006-06-12 21:11:38.000000000 +0900
++++ tv/tv.cpp 2006-06-28 20:30:56.000000000 +0900
+@@ -3,20 +3,19 @@
+ * A phylogenetic tree viewer.
+ * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
+ *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
+ *
+- * This library is distributed in the hope that it will be useful,
++ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Library General Public License for more details.
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
+ *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307, USA.
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ // $Id: tv.cpp,v 1.41 2005/03/23 13:30:32 rdmp1c Exp $
+diff -ruN tv.orig/tv.h tv/tv.h
+--- tv.orig/tv.h 2006-06-12 21:11:38.000000000 +0900
++++ tv/tv.h 2006-06-28 20:29:26.000000000 +0900
+@@ -3,20 +3,19 @@
+ * A phylogenetic tree viewer.
+ * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
+ *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
+ *
+- * This library is distributed in the hope that it will be useful,
++ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Library General Public License for more details.
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
+ *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307, USA.
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ // $Id: tv.h,v 1.4 2004/08/05 15:55:26 rdmp1c Exp $
+diff -ruN tv.orig/tview.cpp tv/tview.cpp
+--- tv.orig/tview.cpp 2006-06-12 21:11:38.000000000 +0900
++++ tv/tview.cpp 2006-06-28 20:30:56.000000000 +0900
+@@ -3,20 +3,19 @@
+ * A phylogenetic tree viewer.
+ * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
+ *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
+ *
+- * This library is distributed in the hope that it will be useful,
++ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Library General Public License for more details.
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
+ *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307, USA.
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ // $Id: tview.cpp,v 1.37 2005/08/31 08:55:13 rdmp1c Exp $
+diff -ruN tv.orig/tview.h tv/tview.h
+--- tv.orig/tview.h 2006-06-12 21:11:38.000000000 +0900
++++ tv/tview.h 2006-06-28 20:30:43.000000000 +0900
+@@ -3,20 +3,19 @@
+ * A phylogenetic tree viewer.
+ * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
+ *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Library General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
+ *
+- * This library is distributed in the hope that it will be useful,
++ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Library General Public License for more details.
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
+ *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+- * MA 02111-1307, USA.
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ // $Id: tview.h,v 1.21 2005/08/31 08:55:01 rdmp1c Exp $
Property changes on: trunk/packages/treeviewx/trunk/debian/patches/60_LGPLtoGPL.diff
___________________________________________________________________
Name: svn:executable
+ *
Deleted: trunk/packages/treeviewx/trunk/debian/patches/60_LGPLtoGPL.dpatch
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/60_LGPLtoGPL.dpatch 2008-01-30 18:17:57 UTC (rev 1228)
+++ trunk/packages/treeviewx/trunk/debian/patches/60_LGPLtoGPL.dpatch 2008-01-31 01:51:08 UTC (rev 1229)
@@ -1,1075 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 60_LGPLtoGPL.dpatch by Charles Plessy <charles-debian-nospam at plessy.org>
-## This patch is hereby released in the public domain.
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Converts LGPL statements to GPL, updates FSF's adress.
-
- at DPATCH@
-
-diff -ruN tv.orig/COPYING tv/COPYING
---- tv.orig/COPYING 2006-06-12 21:11:38.000000000 +0900
-+++ tv/COPYING 2006-06-28 20:39:19.000000000 +0900
-@@ -2,7 +2,7 @@
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-@@ -305,7 +305,7 @@
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-
- Also add information on how to contact you by electronic and paper mail.
-diff -ruN tv.orig/LGPLtoGPL.diff tv/LGPLtoGPL.diff
---- tv.orig/LGPLtoGPL.diff 1970-01-01 09:00:00.000000000 +0900
-+++ tv/LGPLtoGPL.diff 2006-06-28 20:48:52.000000000 +0900
-@@ -0,0 +1,21 @@
-+diff -ruN tv.orig/COPYING tv/COPYING
-+--- tv.orig/COPYING 2006-06-12 21:11:38.000000000 +0900
-++++ tv/COPYING 2006-06-28 20:39:19.000000000 +0900
-+@@ -2,7 +2,7 @@
-+ Version 2, June 1991
-+
-+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-+- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-++ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-+ Everyone is permitted to copy and distribute verbatim copies
-+ of this license document, but changing it is not allowed.
-+
-+@@ -305,7 +305,7 @@
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program; if not, write to the Free Software
-+- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-++ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-+
-+
-+ Also add information on how to contact you by electronic and paper mail.
-diff -ruN tv.orig/tdoc.cpp tv/tdoc.cpp
---- tv.orig/tdoc.cpp 2006-06-12 21:11:38.000000000 +0900
-+++ tv/tdoc.cpp 2006-06-28 20:30:56.000000000 +0900
-@@ -3,20 +3,19 @@
- * A phylogenetic tree viewer.
- * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
- *
-- * This library is distributed in the hope that it will be useful,
-+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Library General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307, USA.
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- // $Id: tdoc.cpp,v 1.6 2001/07/25 10:37:06 rdmp1c Exp $
-diff -ruN tv.orig/tdoc.h tv/tdoc.h
---- tv.orig/tdoc.h 2006-06-28 20:26:50.000000000 +0900
-+++ tv/tdoc.h 2006-06-28 20:24:07.000000000 +0900
-@@ -3,20 +3,19 @@
- * A phylogenetic tree viewer.
- * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
- *
-- * This library is distributed in the hope that it will be useful,
-+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Library General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307, USA.
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- // $Id: tdoc.h,v 1.4 2001/07/24 10:49:48 rdmp1c Exp $
-diff -ruN tv.orig/tproject.h tv/tproject.h
---- tv.orig/tproject.h 2006-06-12 21:11:38.000000000 +0900
-+++ tv/tproject.h 2006-06-28 20:30:40.000000000 +0900
-@@ -3,20 +3,19 @@
- * A phylogenetic tree viewer.
- * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
- *
-- * This library is distributed in the hope that it will be useful,
-+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Library General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307, USA.
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- // $Id: tproject.h,v 1.9 2005/08/31 08:55:25 rdmp1c Exp $
-diff -ruN tv.orig/TreeLib/lcaquery.h tv/TreeLib/lcaquery.h
---- tv.orig/TreeLib/lcaquery.h 2006-06-12 21:11:34.000000000 +0900
-+++ tv/TreeLib/lcaquery.h 2006-06-28 20:31:23.000000000 +0900
-@@ -3,20 +3,19 @@
- * A library for manipulating phylogenetic trees.
- * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
- *
-- * This library is distributed in the hope that it will be useful,
-+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Library General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307, USA.
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- // $Id: lcaquery.h,v 1.1 2002/03/14 14:11:42 rdmp1c Exp $
-diff -ruN tv.orig/TreeLib/mast.cpp tv/TreeLib/mast.cpp
---- tv.orig/TreeLib/mast.cpp 2006-06-12 21:11:34.000000000 +0900
-+++ tv/TreeLib/mast.cpp 2006-06-28 20:31:07.000000000 +0900
-@@ -3,20 +3,19 @@
- * A library for manipulating phylogenetic trees.
- * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
- *
-- * This library is distributed in the hope that it will be useful,
-+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Library General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307, USA.
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- // $Id: mast.cpp,v 1.5 2005/05/24 22:55:16 rdmp1c Exp $
-diff -ruN tv.orig/TreeLib/mast.h tv/TreeLib/mast.h
---- tv.orig/TreeLib/mast.h 2006-06-12 21:11:34.000000000 +0900
-+++ tv/TreeLib/mast.h 2006-06-28 20:31:23.000000000 +0900
-@@ -3,20 +3,19 @@
- * A library for manipulating phylogenetic trees.
- * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
- *
-- * This library is distributed in the hope that it will be useful,
-+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Library General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307, USA.
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- // $Id: mast.h,v 1.1 2002/05/16 16:07:32 rdmp1c Exp $
-diff -ruN tv.orig/TreeLib/nodeiterator.h tv/TreeLib/nodeiterator.h
---- tv.orig/TreeLib/nodeiterator.h 2006-06-12 21:11:34.000000000 +0900
-+++ tv/TreeLib/nodeiterator.h 2006-06-28 20:31:23.000000000 +0900
-@@ -3,20 +3,19 @@
- * A library for manipulating phylogenetic trees.
- * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
- *
-- * This library is distributed in the hope that it will be useful,
-+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Library General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307, USA.
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- // $Id: nodeiterator.h,v 1.5 2005/03/29 16:48:52 rdmp1c Exp $
-diff -ruN tv.orig/TreeLib/Parse.cpp tv/TreeLib/Parse.cpp
---- tv.orig/TreeLib/Parse.cpp 2006-06-12 21:11:34.000000000 +0900
-+++ tv/TreeLib/Parse.cpp 2006-06-28 20:31:08.000000000 +0900
-@@ -3,20 +3,19 @@
- * A library for manipulating phylogenetic trees.
- * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
- *
-- * This library is distributed in the hope that it will be useful,
-+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Library General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307, USA.
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- // $Id: Parse.cpp,v 1.9 2002/02/23 12:22:32 rdmp1c Exp $
-diff -ruN tv.orig/TreeLib/Parse.h tv/TreeLib/Parse.h
---- tv.orig/TreeLib/Parse.h 2006-06-12 21:11:34.000000000 +0900
-+++ tv/TreeLib/Parse.h 2006-06-28 20:31:23.000000000 +0900
-@@ -3,20 +3,19 @@
- * A library for manipulating phylogenetic trees.
- * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
- *
-- * This library is distributed in the hope that it will be useful,
-+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Library General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307, USA.
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- // $Id: Parse.h,v 1.7 2004/03/04 23:22:42 rdmp1c Exp $
-diff -ruN tv.orig/TreeLib/profile.h tv/TreeLib/profile.h
---- tv.orig/TreeLib/profile.h 2006-06-12 21:11:34.000000000 +0900
-+++ tv/TreeLib/profile.h 2006-06-28 20:31:23.000000000 +0900
-@@ -3,20 +3,19 @@
- * A library for manipulating phylogenetic trees.
- * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
- *
-- * This library is distributed in the hope that it will be useful,
-+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Library General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307, USA.
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- // $Id: profile.h,v 1.30 2005/08/31 08:55:59 rdmp1c Exp $
-diff -ruN tv.orig/TreeLib/quartet.cpp tv/TreeLib/quartet.cpp
---- tv.orig/TreeLib/quartet.cpp 2006-06-12 21:11:34.000000000 +0900
-+++ tv/TreeLib/quartet.cpp 2006-06-28 20:31:08.000000000 +0900
-@@ -3,20 +3,19 @@
- * A library for manipulating phylogenetic trees.
- * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
- *
-- * This library is distributed in the hope that it will be useful,
-+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Library General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307, USA.
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- // $Id: quartet.cpp,v 1.2 2002/03/14 16:37:13 rdmp1c Exp $
-diff -ruN tv.orig/TreeLib/quartet.h tv/TreeLib/quartet.h
---- tv.orig/TreeLib/quartet.h 2006-06-12 21:11:34.000000000 +0900
-+++ tv/TreeLib/quartet.h 2006-06-28 20:31:23.000000000 +0900
-@@ -3,20 +3,19 @@
- * A library for manipulating phylogenetic trees.
- * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
- *
-- * This library is distributed in the hope that it will be useful,
-+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Library General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307, USA.
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- // $Id: quartet.h,v 1.1 2002/03/14 14:11:42 rdmp1c Exp $
-diff -ruN tv.orig/TreeLib/tokeniser.cpp tv/TreeLib/tokeniser.cpp
---- tv.orig/TreeLib/tokeniser.cpp 2006-06-12 21:11:34.000000000 +0900
-+++ tv/TreeLib/tokeniser.cpp 2006-06-28 20:31:08.000000000 +0900
-@@ -3,20 +3,19 @@
- * A library for manipulating phylogenetic trees.
- * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
- *
-- * This library is distributed in the hope that it will be useful,
-+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Library General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307, USA.
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- // $Id: tokeniser.cpp,v 1.14 2005/09/05 07:44:48 rdmp1c Exp $
-diff -ruN tv.orig/TreeLib/tokeniser.h tv/TreeLib/tokeniser.h
---- tv.orig/TreeLib/tokeniser.h 2006-06-12 21:11:34.000000000 +0900
-+++ tv/TreeLib/tokeniser.h 2006-06-28 20:31:23.000000000 +0900
-@@ -3,20 +3,19 @@
- * A library for manipulating phylogenetic trees.
- * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
- *
-- * This library is distributed in the hope that it will be useful,
-+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Library General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307, USA.
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- // $Id: tokeniser.h,v 1.14 2003/09/17 13:05:57 rdmp1c Exp $
-diff -ruN tv.orig/TreeLib/treedrawer.cpp tv/TreeLib/treedrawer.cpp
---- tv.orig/TreeLib/treedrawer.cpp 2006-06-12 21:11:34.000000000 +0900
-+++ tv/TreeLib/treedrawer.cpp 2006-06-28 20:31:08.000000000 +0900
-@@ -3,20 +3,19 @@
- * A library for manipulating phylogenetic trees.
- * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
- *
-- * This library is distributed in the hope that it will be useful,
-+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Library General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307, USA.
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- // $Id: treedrawer.cpp,v 1.18 2005/09/06 13:00:14 rdmp1c Exp $
-diff -ruN tv.orig/TreeLib/treedrawer.h tv/TreeLib/treedrawer.h
---- tv.orig/TreeLib/treedrawer.h 2006-06-12 21:11:34.000000000 +0900
-+++ tv/TreeLib/treedrawer.h 2006-06-28 20:31:23.000000000 +0900
-@@ -3,20 +3,19 @@
- * A library for manipulating phylogenetic trees.
- * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
- *
-- * This library is distributed in the hope that it will be useful,
-+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Library General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307, USA.
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- // $Id: treedrawer.h,v 1.8 2004/03/16 07:07:40 rdmp1c Exp $
-diff -ruN tv.orig/TreeLib/TreeLib.cpp tv/TreeLib/TreeLib.cpp
---- tv.orig/TreeLib/TreeLib.cpp 2006-06-12 21:11:34.000000000 +0900
-+++ tv/TreeLib/TreeLib.cpp 2006-06-28 20:31:08.000000000 +0900
-@@ -3,20 +3,19 @@
- * A library for manipulating phylogenetic trees.
- * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
- *
-- * This library is distributed in the hope that it will be useful,
-+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Library General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307, USA.
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- // $Id: TreeLib.cpp,v 1.26 2004/05/13 12:22:11 jcotton Exp $
-diff -ruN tv.orig/TreeLib/TreeLib.h tv/TreeLib/TreeLib.h
---- tv.orig/TreeLib/TreeLib.h 2006-06-12 21:11:34.000000000 +0900
-+++ tv/TreeLib/TreeLib.h 2006-06-28 20:31:23.000000000 +0900
-@@ -3,20 +3,19 @@
- * A library for manipulating phylogenetic trees.
- * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
- *
-- * This library is distributed in the hope that it will be useful,
-+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Library General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307, USA.
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- // $Id: TreeLib.h,v 1.26 2004/05/13 12:22:11 jcotton Exp $
-diff -ruN tv.orig/TreeLib/treeorder.cpp tv/TreeLib/treeorder.cpp
---- tv.orig/TreeLib/treeorder.cpp 2006-06-12 21:11:34.000000000 +0900
-+++ tv/TreeLib/treeorder.cpp 2006-06-28 20:31:08.000000000 +0900
-@@ -3,20 +3,19 @@
- * A library for manipulating phylogenetic trees.
- * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
- *
-- * This library is distributed in the hope that it will be useful,
-+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Library General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307, USA.
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- // $Id: treeorder.cpp,v 1.2 2005/02/23 14:19:00 rdmp1c Exp $
-diff -ruN tv.orig/TreeLib/treeorder.h tv/TreeLib/treeorder.h
---- tv.orig/TreeLib/treeorder.h 2006-06-12 21:11:34.000000000 +0900
-+++ tv/TreeLib/treeorder.h 2006-06-28 20:31:23.000000000 +0900
-@@ -3,20 +3,19 @@
- * A library for manipulating phylogenetic trees.
- * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
- *
-- * This library is distributed in the hope that it will be useful,
-+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Library General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307, USA.
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- // $Id: treeorder.h,v 1.4 2005/02/23 14:19:00 rdmp1c Exp $
-diff -ruN tv.orig/TreeLib/treereader.cpp tv/TreeLib/treereader.cpp
---- tv.orig/TreeLib/treereader.cpp 2006-06-12 21:11:34.000000000 +0900
-+++ tv/TreeLib/treereader.cpp 2006-06-28 20:31:08.000000000 +0900
-@@ -3,20 +3,19 @@
- * A library for manipulating phylogenetic trees.
- * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
- *
-- * This library is distributed in the hope that it will be useful,
-+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Library General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307, USA.
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- // $Id: treereader.cpp,v 1.5 2003/09/10 12:58:16 rdmp1c Exp $
-diff -ruN tv.orig/TreeLib/treereader.h tv/TreeLib/treereader.h
---- tv.orig/TreeLib/treereader.h 2006-06-12 21:11:34.000000000 +0900
-+++ tv/TreeLib/treereader.h 2006-06-28 20:31:23.000000000 +0900
-@@ -3,20 +3,19 @@
- * A library for manipulating phylogenetic trees.
- * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
- *
-- * This library is distributed in the hope that it will be useful,
-+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Library General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307, USA.
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- // $Id: treereader.h,v 1.4 2003/10/21 10:58:45 rdmp1c Exp $
-diff -ruN tv.orig/TreeLib/treewriter.cpp tv/TreeLib/treewriter.cpp
---- tv.orig/TreeLib/treewriter.cpp 2006-06-12 21:11:34.000000000 +0900
-+++ tv/TreeLib/treewriter.cpp 2006-06-28 20:31:08.000000000 +0900
-@@ -3,20 +3,19 @@
- * A library for manipulating phylogenetic trees.
- * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
- *
-- * This library is distributed in the hope that it will be useful,
-+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Library General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307, USA.
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- // $Id: treewriter.cpp,v 1.4 2005/02/23 14:32:44 rdmp1c Exp $
-diff -ruN tv.orig/TreeLib/treewriter.h tv/TreeLib/treewriter.h
---- tv.orig/TreeLib/treewriter.h 2006-06-12 21:11:34.000000000 +0900
-+++ tv/TreeLib/treewriter.h 2006-06-28 20:31:23.000000000 +0900
-@@ -3,20 +3,19 @@
- * A library for manipulating phylogenetic trees.
- * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
- *
-- * This library is distributed in the hope that it will be useful,
-+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Library General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307, USA.
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- // $Id: treewriter.h,v 1.5 2005/02/23 14:36:08 rdmp1c Exp $
-diff -ruN tv.orig/treeorder_dialog.cpp tv/treeorder_dialog.cpp
---- tv.orig/treeorder_dialog.cpp 2006-06-12 21:11:38.000000000 +0900
-+++ tv/treeorder_dialog.cpp 2006-06-28 20:30:56.000000000 +0900
-@@ -3,20 +3,19 @@
- * A phylogenetic tree viewer.
- * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
- *
-- * This library is distributed in the hope that it will be useful,
-+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Library General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307, USA.
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- // $Id: treeorder_dialog.cpp,v 1.2 2005/02/21 19:41:24 rdmp1c Exp $
-diff -ruN tv.orig/treeorder_dialog.h tv/treeorder_dialog.h
---- tv.orig/treeorder_dialog.h 2006-06-12 21:11:38.000000000 +0900
-+++ tv/treeorder_dialog.h 2006-06-28 20:30:40.000000000 +0900
-@@ -3,20 +3,19 @@
- * A phylogenetic tree viewer.
- * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
- *
-- * This library is distributed in the hope that it will be useful,
-+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Library General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307, USA.
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- // $Id: treeorder_dialog.h,v 1.2 2003/10/22 16:46:26 rdmp1c Exp $
-diff -ruN tv.orig/tv.cpp tv/tv.cpp
---- tv.orig/tv.cpp 2006-06-12 21:11:38.000000000 +0900
-+++ tv/tv.cpp 2006-06-28 20:30:56.000000000 +0900
-@@ -3,20 +3,19 @@
- * A phylogenetic tree viewer.
- * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
- *
-- * This library is distributed in the hope that it will be useful,
-+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Library General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307, USA.
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- // $Id: tv.cpp,v 1.41 2005/03/23 13:30:32 rdmp1c Exp $
-diff -ruN tv.orig/tv.h tv/tv.h
---- tv.orig/tv.h 2006-06-12 21:11:38.000000000 +0900
-+++ tv/tv.h 2006-06-28 20:29:26.000000000 +0900
-@@ -3,20 +3,19 @@
- * A phylogenetic tree viewer.
- * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
- *
-- * This library is distributed in the hope that it will be useful,
-+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Library General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307, USA.
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- // $Id: tv.h,v 1.4 2004/08/05 15:55:26 rdmp1c Exp $
-diff -ruN tv.orig/tview.cpp tv/tview.cpp
---- tv.orig/tview.cpp 2006-06-12 21:11:38.000000000 +0900
-+++ tv/tview.cpp 2006-06-28 20:30:56.000000000 +0900
-@@ -3,20 +3,19 @@
- * A phylogenetic tree viewer.
- * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
- *
-- * This library is distributed in the hope that it will be useful,
-+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Library General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307, USA.
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- // $Id: tview.cpp,v 1.37 2005/08/31 08:55:13 rdmp1c Exp $
-diff -ruN tv.orig/tview.h tv/tview.h
---- tv.orig/tview.h 2006-06-12 21:11:38.000000000 +0900
-+++ tv/tview.h 2006-06-28 20:30:43.000000000 +0900
-@@ -3,20 +3,19 @@
- * A phylogenetic tree viewer.
- * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
- *
-- * This library is distributed in the hope that it will be useful,
-+ * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Library General Public License for more details.
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the Free
-- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-- * MA 02111-1307, USA.
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
- // $Id: tview.h,v 1.21 2005/08/31 08:55:01 rdmp1c Exp $
Added: trunk/packages/treeviewx/trunk/debian/patches/70_choose_tree.diff
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/70_choose_tree.diff (rev 0)
+++ trunk/packages/treeviewx/trunk/debian/patches/70_choose_tree.diff 2008-01-31 01:51:08 UTC (rev 1229)
@@ -0,0 +1,13 @@
+## 70_choose_tree.dpatch by William Alexander Grant <william.grant at ubuntu.com.au>
+diff -urNad treeviewx-0.5.1~/tview.cpp treeviewx-0.5.1/tview.cpp
+--- treeviewx-0.5.1~/tview.cpp 2006-12-17 10:33:21.000000000 +1100
++++ treeviewx-0.5.1/tview.cpp 2006-12-17 10:33:53.000000000 +1100
+@@ -742,7 +742,7 @@
+
+ dialog.SetSelection(p.GetCurrentTreeNumber());
+
+- if (dialog.ShowModal() == wxID_OK)
++ if ((dialog.ShowModal() == wxID_OK) && (p.GetNumTrees() != 0))
+ {
+ int j = dialog.GetSelection ();
+ #ifdef __WXMAC__
Property changes on: trunk/packages/treeviewx/trunk/debian/patches/70_choose_tree.diff
___________________________________________________________________
Name: svn:executable
+ *
Deleted: trunk/packages/treeviewx/trunk/debian/patches/70_choose_tree.dpatch
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/70_choose_tree.dpatch 2008-01-30 18:17:57 UTC (rev 1228)
+++ trunk/packages/treeviewx/trunk/debian/patches/70_choose_tree.dpatch 2008-01-31 01:51:08 UTC (rev 1229)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 70_choose_tree.dpatch by William Alexander Grant <william.grant at ubuntu.com.au>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Check that there are actually some trees before we try to set the
-## DP: selected one. This prevents a segfault when there are no trees in
-## DP: the document.
-
- at DPATCH@
-diff -urNad treeviewx-0.5.1~/tview.cpp treeviewx-0.5.1/tview.cpp
---- treeviewx-0.5.1~/tview.cpp 2006-12-17 10:33:21.000000000 +1100
-+++ treeviewx-0.5.1/tview.cpp 2006-12-17 10:33:53.000000000 +1100
-@@ -742,7 +742,7 @@
-
- dialog.SetSelection(p.GetCurrentTreeNumber());
-
-- if (dialog.ShowModal() == wxID_OK)
-+ if ((dialog.ShowModal() == wxID_OK) && (p.GetNumTrees() != 0))
- {
- int j = dialog.GetSelection ();
- #ifdef __WXMAC__
Added: trunk/packages/treeviewx/trunk/debian/patches/80_missing_includes.diff
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/80_missing_includes.diff (rev 0)
+++ trunk/packages/treeviewx/trunk/debian/patches/80_missing_includes.diff 2008-01-31 01:51:08 UTC (rev 1229)
@@ -0,0 +1,71 @@
+80_strlen_charactersblock.cpp.dpatch by David Paleino <d.paleino at gmail.com>
+Fixes "error: ‘strlen’ was not declared in this scope" during compilation
+diff -urNad trunk~/TreeLib/Parse.cpp trunk/TreeLib/Parse.cpp
+--- trunk~/TreeLib/Parse.cpp 2007-11-18 14:39:17.000000000 +0100
++++ trunk/TreeLib/Parse.cpp 2007-11-18 14:39:18.000000000 +0100
+@@ -19,8 +19,9 @@
+ */
+
+ // $Id: Parse.cpp,v 1.9 2002/02/23 12:22:32 rdmp1c Exp $
+-
++
+ #include <ctype.h>
++#include <cstring>
+ #include "Parse.h"
+
+ // Return the next token in the string
+diff -urNad trunk~/TreeLib/treereader.cpp trunk/TreeLib/treereader.cpp
+--- trunk~/TreeLib/treereader.cpp 2007-11-18 14:39:17.000000000 +0100
++++ trunk/TreeLib/treereader.cpp 2007-11-18 14:39:36.000000000 +0100
+@@ -22,6 +22,7 @@
+
+ #include "treereader.h"
+ #include <cstdlib>
++#include <cstring>
+
+ #if __MWERKS__
+ #include <string.h>
+diff -urNad trunk~/ncl-2.0/src/charactersblock.cpp trunk/ncl-2.0/src/charactersblock.cpp
+--- trunk~/ncl-2.0/src/charactersblock.cpp 2007-11-18 14:14:43.000000000 +0100
++++ trunk/ncl-2.0/src/charactersblock.cpp 2007-11-18 14:39:18.000000000 +0100
+@@ -8,6 +8,7 @@
+ #include "discretematrix.h"
+ #include "assumptionsblock.h"
+ #include "charactersblock.h"
++#include <cstring>
+
+ using namespace std;
+
+diff -urNad trunk~/ncl-2.0/src/nexus.cpp trunk/ncl-2.0/src/nexus.cpp
+--- trunk~/ncl-2.0/src/nexus.cpp 2007-10-02 09:51:43.000000000 +0200
++++ trunk/ncl-2.0/src/nexus.cpp 2007-11-18 14:39:18.000000000 +0100
+@@ -2,6 +2,7 @@
+ #include "xnexus.h"
+ #include "nexustoken.h"
+ #include "nexus.h"
++#include <cstring>
+
+ #define NCL_NAME_AND_VERSION "NCL version 2.01"
+ #define NCL_COPYRIGHT "Copyright (c) 2000 by Paul O. Lewis"
+diff -urNad trunk~/ncl-2.0/src/nexustoken.cpp trunk/ncl-2.0/src/nexustoken.cpp
+--- trunk~/ncl-2.0/src/nexustoken.cpp 2007-10-02 09:51:43.000000000 +0200
++++ trunk/ncl-2.0/src/nexustoken.cpp 2007-11-18 14:39:18.000000000 +0100
+@@ -1,6 +1,7 @@
+ #include "nexusdefs.h"
+ #include "xnexus.h"
+ #include "nexustoken.h"
++#include <cstring>
+
+ using namespace std;
+
+diff -urNad trunk~/ncl-2.0/src/nxsstring.cpp trunk/ncl-2.0/src/nxsstring.cpp
+--- trunk~/ncl-2.0/src/nxsstring.cpp 2007-10-02 09:51:43.000000000 +0200
++++ trunk/ncl-2.0/src/nxsstring.cpp 2007-11-18 14:39:18.000000000 +0100
+@@ -20,6 +20,7 @@
+ #include <stdio.h>
+ #include <assert.h>
+ #include <math.h>
++#include <cstring>
+ #include "nxsstring.h"
+
+ nxsstring& nxsstring::operator+=( const double d )
Property changes on: trunk/packages/treeviewx/trunk/debian/patches/80_missing_includes.diff
___________________________________________________________________
Name: svn:executable
+ *
Deleted: trunk/packages/treeviewx/trunk/debian/patches/80_missing_includes.dpatch
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/80_missing_includes.dpatch 2008-01-30 18:17:57 UTC (rev 1228)
+++ trunk/packages/treeviewx/trunk/debian/patches/80_missing_includes.dpatch 2008-01-31 01:51:08 UTC (rev 1229)
@@ -1,76 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 80_strlen_charactersblock.cpp.dpatch by David Paleino <d.paleino at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes "error: ‘strlen’ was not declared in this scope" during compilation
-
- at DPATCH@
-diff -urNad trunk~/TreeLib/Parse.cpp trunk/TreeLib/Parse.cpp
---- trunk~/TreeLib/Parse.cpp 2007-11-18 14:39:17.000000000 +0100
-+++ trunk/TreeLib/Parse.cpp 2007-11-18 14:39:18.000000000 +0100
-@@ -19,8 +19,9 @@
- */
-
- // $Id: Parse.cpp,v 1.9 2002/02/23 12:22:32 rdmp1c Exp $
--
-+
- #include <ctype.h>
-+#include <cstring>
- #include "Parse.h"
-
- // Return the next token in the string
-diff -urNad trunk~/TreeLib/treereader.cpp trunk/TreeLib/treereader.cpp
---- trunk~/TreeLib/treereader.cpp 2007-11-18 14:39:17.000000000 +0100
-+++ trunk/TreeLib/treereader.cpp 2007-11-18 14:39:36.000000000 +0100
-@@ -22,6 +22,7 @@
-
- #include "treereader.h"
- #include <cstdlib>
-+#include <cstring>
-
- #if __MWERKS__
- #include <string.h>
-diff -urNad trunk~/ncl-2.0/src/charactersblock.cpp trunk/ncl-2.0/src/charactersblock.cpp
---- trunk~/ncl-2.0/src/charactersblock.cpp 2007-11-18 14:14:43.000000000 +0100
-+++ trunk/ncl-2.0/src/charactersblock.cpp 2007-11-18 14:39:18.000000000 +0100
-@@ -8,6 +8,7 @@
- #include "discretematrix.h"
- #include "assumptionsblock.h"
- #include "charactersblock.h"
-+#include <cstring>
-
- using namespace std;
-
-diff -urNad trunk~/ncl-2.0/src/nexus.cpp trunk/ncl-2.0/src/nexus.cpp
---- trunk~/ncl-2.0/src/nexus.cpp 2007-10-02 09:51:43.000000000 +0200
-+++ trunk/ncl-2.0/src/nexus.cpp 2007-11-18 14:39:18.000000000 +0100
-@@ -2,6 +2,7 @@
- #include "xnexus.h"
- #include "nexustoken.h"
- #include "nexus.h"
-+#include <cstring>
-
- #define NCL_NAME_AND_VERSION "NCL version 2.01"
- #define NCL_COPYRIGHT "Copyright (c) 2000 by Paul O. Lewis"
-diff -urNad trunk~/ncl-2.0/src/nexustoken.cpp trunk/ncl-2.0/src/nexustoken.cpp
---- trunk~/ncl-2.0/src/nexustoken.cpp 2007-10-02 09:51:43.000000000 +0200
-+++ trunk/ncl-2.0/src/nexustoken.cpp 2007-11-18 14:39:18.000000000 +0100
-@@ -1,6 +1,7 @@
- #include "nexusdefs.h"
- #include "xnexus.h"
- #include "nexustoken.h"
-+#include <cstring>
-
- using namespace std;
-
-diff -urNad trunk~/ncl-2.0/src/nxsstring.cpp trunk/ncl-2.0/src/nxsstring.cpp
---- trunk~/ncl-2.0/src/nxsstring.cpp 2007-10-02 09:51:43.000000000 +0200
-+++ trunk/ncl-2.0/src/nxsstring.cpp 2007-11-18 14:39:18.000000000 +0100
-@@ -20,6 +20,7 @@
- #include <stdio.h>
- #include <assert.h>
- #include <math.h>
-+#include <cstring>
- #include "nxsstring.h"
-
- nxsstring& nxsstring::operator+=( const double d )
Added: trunk/packages/treeviewx/trunk/debian/patches/series
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/series (rev 0)
+++ trunk/packages/treeviewx/trunk/debian/patches/series 2008-01-31 01:51:08 UTC (rev 1229)
@@ -0,0 +1,6 @@
+45_gcc4.3.diff
+50_wxT_tv.cpp.diff
+51_wxT_tview.cpp.diff
+60_LGPLtoGPL.diff
+70_choose_tree.diff
+80_missing_includes.diff
More information about the debian-med-commit
mailing list