[med-svn] r17674 - trunk/packages/treeviewx/trunk/debian/patches
Andreas Tille
tille at moszumanska.debian.org
Sun Aug 10 17:22:15 UTC 2014
Author: tille
Date: 2014-08-10 17:22:15 +0000 (Sun, 10 Aug 2014)
New Revision: 17674
Modified:
trunk/packages/treeviewx/trunk/debian/patches/60_LGPLtoGPL.patch
trunk/packages/treeviewx/trunk/debian/patches/70_choose_tree.patch
trunk/packages/treeviewx/trunk/debian/patches/fix_loading_crash.patch
trunk/packages/treeviewx/trunk/debian/patches/svg.patch
trunk/packages/treeviewx/trunk/debian/patches/treeview-xpm-not-xbm.patch
trunk/packages/treeviewx/trunk/debian/patches/wx3.0-compat.patch
Log:
Refreshed patches
Modified: trunk/packages/treeviewx/trunk/debian/patches/60_LGPLtoGPL.patch
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/60_LGPLtoGPL.patch 2014-08-10 05:57:46 UTC (rev 17673)
+++ trunk/packages/treeviewx/trunk/debian/patches/60_LGPLtoGPL.patch 2014-08-10 17:22:15 UTC (rev 17674)
@@ -1,6 +1,6 @@
Converts LGPL statements to GPL, updates FSF's adress.
---- treeviewx-0.5.1+20100823.orig/COPYING
-+++ treeviewx-0.5.1+20100823/COPYING
+--- tv-0.5.orig/COPYING
++++ tv-0.5/COPYING
@@ -2,7 +2,7 @@
Version 2, June 1991
@@ -20,7 +20,7 @@
Also add information on how to contact you by electronic and paper mail.
--- /dev/null
-+++ treeviewx-0.5.1+20100823/LGPLtoGPL.diff
++++ tv-0.5/LGPLtoGPL.diff
@@ -0,0 +1,21 @@
+diff -ruN tv.orig/COPYING tv/COPYING
+--- tv.orig/COPYING 2006-06-12 21:11:38.000000000 +0900
@@ -43,8 +43,8 @@
+
+
+ Also add information on how to contact you by electronic and paper mail.
---- treeviewx-0.5.1+20100823.orig/tdoc.cpp
-+++ treeviewx-0.5.1+20100823/tdoc.cpp
+--- tv-0.5.orig/tdoc.cpp
++++ tv-0.5/tdoc.cpp
@@ -3,20 +3,19 @@
* A phylogenetic tree viewer.
* Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -76,8 +76,8 @@
*/
// $Id: tdoc.cpp,v 1.6 2001/07/25 10:37:06 rdmp1c Exp $
---- treeviewx-0.5.1+20100823.orig/tdoc.h
-+++ treeviewx-0.5.1+20100823/tdoc.h
+--- tv-0.5.orig/tdoc.h
++++ tv-0.5/tdoc.h
@@ -3,20 +3,19 @@
* A phylogenetic tree viewer.
* Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -109,8 +109,8 @@
*/
// $Id: tdoc.h,v 1.4 2001/07/24 10:49:48 rdmp1c Exp $
---- treeviewx-0.5.1+20100823.orig/tproject.h
-+++ treeviewx-0.5.1+20100823/tproject.h
+--- tv-0.5.orig/tproject.h
++++ tv-0.5/tproject.h
@@ -3,20 +3,19 @@
* A phylogenetic tree viewer.
* Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -142,8 +142,8 @@
*/
// $Id: tproject.h,v 1.9 2005/08/31 08:55:25 rdmp1c Exp $
---- treeviewx-0.5.1+20100823.orig/TreeLib/lcaquery.h
-+++ treeviewx-0.5.1+20100823/TreeLib/lcaquery.h
+--- tv-0.5.orig/TreeLib/lcaquery.h
++++ tv-0.5/TreeLib/lcaquery.h
@@ -3,20 +3,19 @@
* A library for manipulating phylogenetic trees.
* Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -175,8 +175,8 @@
*/
// $Id: lcaquery.h,v 1.1 2002/03/14 14:11:42 rdmp1c Exp $
---- treeviewx-0.5.1+20100823.orig/TreeLib/mast.cpp
-+++ treeviewx-0.5.1+20100823/TreeLib/mast.cpp
+--- tv-0.5.orig/TreeLib/mast.cpp
++++ tv-0.5/TreeLib/mast.cpp
@@ -3,20 +3,19 @@
* A library for manipulating phylogenetic trees.
* Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -208,8 +208,8 @@
*/
// $Id: mast.cpp,v 1.5 2005/05/24 22:55:16 rdmp1c Exp $
---- treeviewx-0.5.1+20100823.orig/TreeLib/mast.h
-+++ treeviewx-0.5.1+20100823/TreeLib/mast.h
+--- tv-0.5.orig/TreeLib/mast.h
++++ tv-0.5/TreeLib/mast.h
@@ -3,20 +3,19 @@
* A library for manipulating phylogenetic trees.
* Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -241,8 +241,8 @@
*/
// $Id: mast.h,v 1.1 2002/05/16 16:07:32 rdmp1c Exp $
---- treeviewx-0.5.1+20100823.orig/TreeLib/nodeiterator.h
-+++ treeviewx-0.5.1+20100823/TreeLib/nodeiterator.h
+--- tv-0.5.orig/TreeLib/nodeiterator.h
++++ tv-0.5/TreeLib/nodeiterator.h
@@ -3,20 +3,19 @@
* A library for manipulating phylogenetic trees.
* Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -274,8 +274,8 @@
*/
// $Id: nodeiterator.h,v 1.5 2005/03/29 16:48:52 rdmp1c Exp $
---- treeviewx-0.5.1+20100823.orig/TreeLib/Parse.cpp
-+++ treeviewx-0.5.1+20100823/TreeLib/Parse.cpp
+--- tv-0.5.orig/TreeLib/Parse.cpp
++++ tv-0.5/TreeLib/Parse.cpp
@@ -3,20 +3,19 @@
* A library for manipulating phylogenetic trees.
* Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -307,8 +307,8 @@
*/
// $Id: Parse.cpp,v 1.9 2002/02/23 12:22:32 rdmp1c Exp $
---- treeviewx-0.5.1+20100823.orig/TreeLib/Parse.h
-+++ treeviewx-0.5.1+20100823/TreeLib/Parse.h
+--- tv-0.5.orig/TreeLib/Parse.h
++++ tv-0.5/TreeLib/Parse.h
@@ -3,20 +3,19 @@
* A library for manipulating phylogenetic trees.
* Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -340,8 +340,8 @@
*/
// $Id: Parse.h,v 1.7 2004/03/04 23:22:42 rdmp1c Exp $
---- treeviewx-0.5.1+20100823.orig/TreeLib/profile.h
-+++ treeviewx-0.5.1+20100823/TreeLib/profile.h
+--- tv-0.5.orig/TreeLib/profile.h
++++ tv-0.5/TreeLib/profile.h
@@ -3,20 +3,19 @@
* A library for manipulating phylogenetic trees.
* Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -373,8 +373,8 @@
*/
// $Id: profile.h,v 1.31 2007/06/05 13:26:17 rdmp1c Exp $
---- treeviewx-0.5.1+20100823.orig/TreeLib/quartet.cpp
-+++ treeviewx-0.5.1+20100823/TreeLib/quartet.cpp
+--- tv-0.5.orig/TreeLib/quartet.cpp
++++ tv-0.5/TreeLib/quartet.cpp
@@ -3,20 +3,19 @@
* A library for manipulating phylogenetic trees.
* Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -406,8 +406,8 @@
*/
// $Id: quartet.cpp,v 1.2 2002/03/14 16:37:13 rdmp1c Exp $
---- treeviewx-0.5.1+20100823.orig/TreeLib/quartet.h
-+++ treeviewx-0.5.1+20100823/TreeLib/quartet.h
+--- tv-0.5.orig/TreeLib/quartet.h
++++ tv-0.5/TreeLib/quartet.h
@@ -3,20 +3,19 @@
* A library for manipulating phylogenetic trees.
* Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -439,8 +439,8 @@
*/
// $Id: quartet.h,v 1.2 2005/09/08 12:58:29 rdmp1c Exp $
---- treeviewx-0.5.1+20100823.orig/TreeLib/tokeniser.cpp
-+++ treeviewx-0.5.1+20100823/TreeLib/tokeniser.cpp
+--- tv-0.5.orig/TreeLib/tokeniser.cpp
++++ tv-0.5/TreeLib/tokeniser.cpp
@@ -3,20 +3,19 @@
* A library for manipulating phylogenetic trees.
* Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -472,8 +472,8 @@
*/
// $Id: tokeniser.cpp,v 1.14 2005/09/05 07:44:48 rdmp1c Exp $
---- treeviewx-0.5.1+20100823.orig/TreeLib/tokeniser.h
-+++ treeviewx-0.5.1+20100823/TreeLib/tokeniser.h
+--- tv-0.5.orig/TreeLib/tokeniser.h
++++ tv-0.5/TreeLib/tokeniser.h
@@ -3,20 +3,19 @@
* A library for manipulating phylogenetic trees.
* Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -505,8 +505,8 @@
*/
// $Id: tokeniser.h,v 1.14 2003/09/17 13:05:57 rdmp1c Exp $
---- treeviewx-0.5.1+20100823.orig/TreeLib/treedrawer.cpp
-+++ treeviewx-0.5.1+20100823/TreeLib/treedrawer.cpp
+--- tv-0.5.orig/TreeLib/treedrawer.cpp
++++ tv-0.5/TreeLib/treedrawer.cpp
@@ -3,20 +3,19 @@
* A library for manipulating phylogenetic trees.
* Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -538,8 +538,8 @@
*/
// $Id: treedrawer.cpp,v 1.20 2007/06/07 15:48:02 rdmp1c Exp $
---- treeviewx-0.5.1+20100823.orig/TreeLib/treedrawer.h
-+++ treeviewx-0.5.1+20100823/TreeLib/treedrawer.h
+--- tv-0.5.orig/TreeLib/treedrawer.h
++++ tv-0.5/TreeLib/treedrawer.h
@@ -3,20 +3,19 @@
* A library for manipulating phylogenetic trees.
* Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -571,8 +571,8 @@
*/
// $Id: treedrawer.h,v 1.10 2007/06/07 15:48:02 rdmp1c Exp $
---- treeviewx-0.5.1+20100823.orig/TreeLib/TreeLib.cpp
-+++ treeviewx-0.5.1+20100823/TreeLib/TreeLib.cpp
+--- tv-0.5.orig/TreeLib/TreeLib.cpp
++++ tv-0.5/TreeLib/TreeLib.cpp
@@ -3,20 +3,19 @@
* A library for manipulating phylogenetic trees.
* Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -604,8 +604,8 @@
*/
// $Id: TreeLib.cpp,v 1.30 2007/08/04 21:41:55 rdmp1c Exp $
---- treeviewx-0.5.1+20100823.orig/TreeLib/TreeLib.h
-+++ treeviewx-0.5.1+20100823/TreeLib/TreeLib.h
+--- tv-0.5.orig/TreeLib/TreeLib.h
++++ tv-0.5/TreeLib/TreeLib.h
@@ -3,20 +3,19 @@
* A library for manipulating phylogenetic trees.
* Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -637,8 +637,8 @@
*/
// $Id: TreeLib.h,v 1.30 2007/08/04 21:41:57 rdmp1c Exp $
---- treeviewx-0.5.1+20100823.orig/TreeLib/treeorder.cpp
-+++ treeviewx-0.5.1+20100823/TreeLib/treeorder.cpp
+--- tv-0.5.orig/TreeLib/treeorder.cpp
++++ tv-0.5/TreeLib/treeorder.cpp
@@ -3,20 +3,19 @@
* A library for manipulating phylogenetic trees.
* Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -670,8 +670,8 @@
*/
// $Id: treeorder.cpp,v 1.2 2005/02/23 14:19:00 rdmp1c Exp $
---- treeviewx-0.5.1+20100823.orig/TreeLib/treeorder.h
-+++ treeviewx-0.5.1+20100823/TreeLib/treeorder.h
+--- tv-0.5.orig/TreeLib/treeorder.h
++++ tv-0.5/TreeLib/treeorder.h
@@ -3,20 +3,19 @@
* A library for manipulating phylogenetic trees.
* Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -703,8 +703,8 @@
*/
// $Id: treeorder.h,v 1.4 2005/02/23 14:19:00 rdmp1c Exp $
---- treeviewx-0.5.1+20100823.orig/TreeLib/treereader.cpp
-+++ treeviewx-0.5.1+20100823/TreeLib/treereader.cpp
+--- tv-0.5.orig/TreeLib/treereader.cpp
++++ tv-0.5/TreeLib/treereader.cpp
@@ -3,20 +3,19 @@
* A library for manipulating phylogenetic trees.
* Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -736,8 +736,8 @@
*/
// $Id: treereader.cpp,v 1.5 2003/09/10 12:58:16 rdmp1c Exp $
---- treeviewx-0.5.1+20100823.orig/TreeLib/treereader.h
-+++ treeviewx-0.5.1+20100823/TreeLib/treereader.h
+--- tv-0.5.orig/TreeLib/treereader.h
++++ tv-0.5/TreeLib/treereader.h
@@ -3,20 +3,19 @@
* A library for manipulating phylogenetic trees.
* Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -769,8 +769,8 @@
*/
// $Id: treereader.h,v 1.4 2003/10/21 10:58:45 rdmp1c Exp $
---- treeviewx-0.5.1+20100823.orig/TreeLib/treewriter.cpp
-+++ treeviewx-0.5.1+20100823/TreeLib/treewriter.cpp
+--- tv-0.5.orig/TreeLib/treewriter.cpp
++++ tv-0.5/TreeLib/treewriter.cpp
@@ -3,20 +3,19 @@
* A library for manipulating phylogenetic trees.
* Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -802,8 +802,8 @@
*/
// $Id: treewriter.cpp,v 1.4 2005/02/23 14:32:44 rdmp1c Exp $
---- treeviewx-0.5.1+20100823.orig/TreeLib/treewriter.h
-+++ treeviewx-0.5.1+20100823/TreeLib/treewriter.h
+--- tv-0.5.orig/TreeLib/treewriter.h
++++ tv-0.5/TreeLib/treewriter.h
@@ -3,20 +3,19 @@
* A library for manipulating phylogenetic trees.
* Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -835,8 +835,8 @@
*/
// $Id: treewriter.h,v 1.5 2005/02/23 14:36:08 rdmp1c Exp $
---- treeviewx-0.5.1+20100823.orig/treeorder_dialog.cpp
-+++ treeviewx-0.5.1+20100823/treeorder_dialog.cpp
+--- tv-0.5.orig/treeorder_dialog.cpp
++++ tv-0.5/treeorder_dialog.cpp
@@ -3,20 +3,19 @@
* A phylogenetic tree viewer.
* Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -868,8 +868,8 @@
*/
// $Id: treeorder_dialog.cpp,v 1.2 2005/02/21 19:41:24 rdmp1c Exp $
---- treeviewx-0.5.1+20100823.orig/treeorder_dialog.h
-+++ treeviewx-0.5.1+20100823/treeorder_dialog.h
+--- tv-0.5.orig/treeorder_dialog.h
++++ tv-0.5/treeorder_dialog.h
@@ -3,20 +3,19 @@
* A phylogenetic tree viewer.
* Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -901,8 +901,8 @@
*/
// $Id: treeorder_dialog.h,v 1.2 2003/10/22 16:46:26 rdmp1c Exp $
---- treeviewx-0.5.1+20100823.orig/tv.cpp
-+++ treeviewx-0.5.1+20100823/tv.cpp
+--- tv-0.5.orig/tv.cpp
++++ tv-0.5/tv.cpp
@@ -3,20 +3,19 @@
* A phylogenetic tree viewer.
* Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -934,8 +934,8 @@
*/
// $Id: tv.cpp,v 1.43 2007/03/09 13:58:19 rdmp1c Exp $
---- treeviewx-0.5.1+20100823.orig/tv.h
-+++ treeviewx-0.5.1+20100823/tv.h
+--- tv-0.5.orig/tv.h
++++ tv-0.5/tv.h
@@ -3,20 +3,19 @@
* A phylogenetic tree viewer.
* Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -967,8 +967,8 @@
*/
// $Id: tv.h,v 1.4 2004/08/05 15:55:26 rdmp1c Exp $
---- treeviewx-0.5.1+20100823.orig/tview.cpp
-+++ treeviewx-0.5.1+20100823/tview.cpp
+--- tv-0.5.orig/tview.cpp
++++ tv-0.5/tview.cpp
@@ -3,20 +3,19 @@
* A phylogenetic tree viewer.
* Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -1000,8 +1000,8 @@
*/
// $Id: tview.cpp,v 1.40 2007/03/09 13:59:19 rdmp1c Exp $
---- treeviewx-0.5.1+20100823.orig/tview.h
-+++ treeviewx-0.5.1+20100823/tview.h
+--- tv-0.5.orig/tview.h
++++ tv-0.5/tview.h
@@ -3,20 +3,19 @@
* A phylogenetic tree viewer.
* Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
Modified: trunk/packages/treeviewx/trunk/debian/patches/70_choose_tree.patch
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/70_choose_tree.patch 2014-08-10 05:57:46 UTC (rev 17673)
+++ trunk/packages/treeviewx/trunk/debian/patches/70_choose_tree.patch 2014-08-10 17:22:15 UTC (rev 17674)
@@ -1,6 +1,6 @@
## 70_choose_tree.dpatch by William Alexander Grant <william.grant at ubuntu.com.au>
---- treeviewx-0.5.1+20100823.orig/tview.cpp
-+++ treeviewx-0.5.1+20100823/tview.cpp
+--- tv-0.5.orig/tview.cpp
++++ tv-0.5/tview.cpp
@@ -209,7 +209,7 @@
wxT("SVG vector picture files (*.svg)|*.svg"),
wxSAVE|wxOVERWRITE_PROMPT);
Modified: trunk/packages/treeviewx/trunk/debian/patches/fix_loading_crash.patch
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/fix_loading_crash.patch 2014-08-10 05:57:46 UTC (rev 17673)
+++ trunk/packages/treeviewx/trunk/debian/patches/fix_loading_crash.patch 2014-08-10 17:22:15 UTC (rev 17674)
@@ -1,8 +1,8 @@
Bug: http://code.google.com/p/treeviewx/issues/detail?id=1
Description: fix crash on loading tree file.
Author: Tim Booth
---- a/tview.cpp
-+++ b/tview.cpp
+--- tv-0.5.orig/tview.cpp
++++ tv-0.5/tview.cpp
@@ -278,7 +278,7 @@
char buf[256];
strcpy (buf, p->GetLabel().c_str());
Modified: trunk/packages/treeviewx/trunk/debian/patches/svg.patch
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/svg.patch 2014-08-10 05:57:46 UTC (rev 17673)
+++ trunk/packages/treeviewx/trunk/debian/patches/svg.patch 2014-08-10 17:22:15 UTC (rev 17674)
@@ -6,8 +6,8 @@
configure.in to match what it must have said when configure was
generated.
Forwarded: no
---- a/configure.in
-+++ b/configure.in
+--- tv-0.5.orig/configure.in
++++ tv-0.5/configure.in
@@ -54,7 +54,7 @@
# The reason for this is wxGTK RPMs from wxWidgets.org
# do not have the required SVG library (which is a contribution)
Modified: trunk/packages/treeviewx/trunk/debian/patches/treeview-xpm-not-xbm.patch
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/treeview-xpm-not-xbm.patch 2014-08-10 05:57:46 UTC (rev 17673)
+++ trunk/packages/treeviewx/trunk/debian/patches/treeview-xpm-not-xbm.patch 2014-08-10 17:22:15 UTC (rev 17674)
@@ -3,8 +3,8 @@
Last-Update: 2014-06-21
Forwarded: http://code.google.com/p/treeviewx/issues/detail?id=4
---- a/tv.cpp
-+++ b/tv.cpp
+--- tv-0.5.orig/tv.cpp
++++ tv-0.5/tv.cpp
@@ -215,7 +215,7 @@
frame->SetIcon(wxIcon("app")); // use the name of the icon in the resource file
#endif
Modified: trunk/packages/treeviewx/trunk/debian/patches/wx3.0-compat.patch
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/wx3.0-compat.patch 2014-08-10 05:57:46 UTC (rev 17673)
+++ trunk/packages/treeviewx/trunk/debian/patches/wx3.0-compat.patch 2014-08-10 17:22:15 UTC (rev 17674)
@@ -2,8 +2,8 @@
Author: Olly Betts <olly at survex.com>
Bug-Debian: https://bugs.debian.org/751255
Forwarded: no
---- a/tv.cpp
-+++ b/tv.cpp
+--- tv-0.5.orig/tv.cpp
++++ tv-0.5/tv.cpp
@@ -162,9 +162,9 @@
{
// Optional command line argument is name of file to open
@@ -16,8 +16,8 @@
#endif
// Read input/output files
if (argc > 1)
---- a/tview.cpp
-+++ b/tview.cpp
+--- tv-0.5.orig/tview.cpp
++++ tv-0.5/tview.cpp
@@ -63,9 +63,13 @@
#ifdef __WXMSW__
#else
More information about the debian-med-commit
mailing list