[med-svn] r11969 - in trunk/packages/treeviewx/trunk/debian: . patches source

Timothy Booth tbooth-guest at alioth.debian.org
Thu Aug 2 10:13:07 UTC 2012 

Author: tbooth-guest
Date: 2012-08-02 10:13:07 +0000 (Thu, 02 Aug 2012)
New Revision: 11969

Added:
   trunk/packages/treeviewx/trunk/debian/patches/fix_loading_crash.patch
   trunk/packages/treeviewx/trunk/debian/source/
   trunk/packages/treeviewx/trunk/debian/source/format
Modified:
   trunk/packages/treeviewx/trunk/debian/changelog
   trunk/packages/treeviewx/trunk/debian/control
   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/series
   trunk/packages/treeviewx/trunk/debian/rules
   trunk/packages/treeviewx/trunk/debian/watch
Log:
This is an important fix as currently treeview doesn't work at all.

Only tested on Ubuntu but I suggest this should be pushed to Debian as
release -3 as soon as it's tested.  Test case is simply:

tv /usr/share/doc/treeviewx/examples/tree.phb



Modified: trunk/packages/treeviewx/trunk/debian/changelog
===================================================================
--- trunk/packages/treeviewx/trunk/debian/changelog	2012-08-02 08:38:00 UTC (rev 11968)
+++ trunk/packages/treeviewx/trunk/debian/changelog	2012-08-02 10:13:07 UTC (rev 11969)
@@ -1,3 +1,13 @@
+treeviewx (0.5.1+20100823-2precise3) precise; urgency=low
+
+  * Fudge watchfile to renumber version as in README.source
+  * Apply patch from http://code.google.com/p/treeviewx/issues/detail?id=1
+    to fix crash loading trees. 
+  * Moved to DH build system (fairly trivial)
+  * Refresh patches
+
+ -- Tim Booth <tbooth at ceh.ac.uk>  Wed, 01 Aug 2012 18:01:41 +0100
+
 treeviewx (0.5.1+20100823-2) UNRELEASED; urgency=low
 
   * debian/watch: Fixed after Google code redirector stopped working

Modified: trunk/packages/treeviewx/trunk/debian/control
===================================================================
--- trunk/packages/treeviewx/trunk/debian/control	2012-08-02 08:38:00 UTC (rev 11968)
+++ trunk/packages/treeviewx/trunk/debian/control	2012-08-02 10:13:07 UTC (rev 11969)
@@ -5,8 +5,8 @@
 DM-Upload-Allowed: yes
 Uploaders: Charles Plessy <plessy at debian.org>,
  Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 8), cdbs, autotools-dev, quilt, libwxgtk2.8-dev
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 8), quilt, libwxgtk2.8-dev
+Standards-Version: 3.9.3
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/treeviewx/trunk/
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/treeviewx/trunk/
 Homepage: http://code.google.com/p/treeviewx/

Modified: trunk/packages/treeviewx/trunk/debian/patches/60_LGPLtoGPL.diff
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/60_LGPLtoGPL.diff	2012-08-02 08:38:00 UTC (rev 11968)
+++ trunk/packages/treeviewx/trunk/debian/patches/60_LGPLtoGPL.diff	2012-08-02 10:13:07 UTC (rev 11969)
@@ -1,7 +1,6 @@
 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
+--- a/COPYING
++++ b/COPYING
 @@ -2,7 +2,7 @@
  		       Version 2, June 1991
  
@@ -20,9 +19,8 @@
  
  
  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
+--- /dev/null
++++ b/LGPLtoGPL.diff
 @@ -0,0 +1,21 @@
 +diff -ruN tv.orig/COPYING tv/COPYING
 +--- tv.orig/COPYING	2006-06-12 21:11:38.000000000 +0900
@@ -45,9 +43,8 @@
 + 
 + 
 + 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
+--- a/tdoc.cpp
++++ b/tdoc.cpp
 @@ -3,20 +3,19 @@
   * A phylogenetic tree viewer.
   * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -79,9 +76,8 @@
   */
   
   // $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
+--- a/tdoc.h
++++ b/tdoc.h
 @@ -3,20 +3,19 @@
   * A phylogenetic tree viewer.
   * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -113,9 +109,8 @@
   */
   
   // $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
+--- a/tproject.h
++++ b/tproject.h
 @@ -3,20 +3,19 @@
   * A phylogenetic tree viewer.
   * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -147,9 +142,8 @@
   */
   
   // $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
+--- a/TreeLib/lcaquery.h
++++ b/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>
@@ -181,9 +175,8 @@
   */
  
   // $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
+--- a/TreeLib/mast.cpp
++++ b/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>
@@ -215,9 +208,8 @@
   */
  
   // $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
+--- a/TreeLib/mast.h
++++ b/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>
@@ -249,9 +241,8 @@
   */
  
   // $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
+--- a/TreeLib/nodeiterator.h
++++ b/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>
@@ -283,9 +274,8 @@
   */
  
   // $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
+--- a/TreeLib/Parse.cpp
++++ b/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>
@@ -317,9 +307,8 @@
   */
  
   // $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
+--- a/TreeLib/Parse.h
++++ b/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>
@@ -351,9 +340,8 @@
   */
   
   // $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
+--- a/TreeLib/profile.h
++++ b/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>
@@ -384,10 +372,9 @@
 + * 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
+  // $Id: profile.h,v 1.31 2007/06/05 13:26:17 rdmp1c Exp $
+--- a/TreeLib/quartet.cpp
++++ b/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>
@@ -419,9 +406,8 @@
   */
  
   // $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
+--- a/TreeLib/quartet.h
++++ b/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>
@@ -452,10 +438,9 @@
 + * 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
+  // $Id: quartet.h,v 1.2 2005/09/08 12:58:29 rdmp1c Exp $
+--- a/TreeLib/tokeniser.cpp
++++ b/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>
@@ -487,9 +472,8 @@
   */
   
  // $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
+--- a/TreeLib/tokeniser.h
++++ b/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>
@@ -521,9 +505,8 @@
   */
   
   // $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
+--- a/TreeLib/treedrawer.cpp
++++ b/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>
@@ -554,10 +537,9 @@
 + * 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
+ // $Id: treedrawer.cpp,v 1.20 2007/06/07 15:48:02 rdmp1c Exp $
+--- a/TreeLib/treedrawer.h
++++ b/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>
@@ -588,10 +570,9 @@
 + * 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
+ // $Id: treedrawer.h,v 1.10 2007/06/07 15:48:02 rdmp1c Exp $
+--- a/TreeLib/TreeLib.cpp
++++ b/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>
@@ -622,10 +603,9 @@
 + * 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
+ // $Id: TreeLib.cpp,v 1.30 2007/08/04 21:41:55 rdmp1c Exp $
+--- a/TreeLib/TreeLib.h
++++ b/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>
@@ -656,10 +636,9 @@
 + * 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
+ // $Id: TreeLib.h,v 1.30 2007/08/04 21:41:57 rdmp1c Exp $
+--- a/TreeLib/treeorder.cpp
++++ b/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>
@@ -691,9 +670,8 @@
   */
  
  // $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
+--- a/TreeLib/treeorder.h
++++ b/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>
@@ -725,9 +703,8 @@
   */
  
   // $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
+--- a/TreeLib/treereader.cpp
++++ b/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>
@@ -759,9 +736,8 @@
   */
   
   // $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
+--- a/TreeLib/treereader.h
++++ b/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>
@@ -793,9 +769,8 @@
   */
   
  // $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
+--- a/TreeLib/treewriter.cpp
++++ b/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>
@@ -827,9 +802,8 @@
   */
   
   // $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
+--- a/TreeLib/treewriter.h
++++ b/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>
@@ -861,9 +835,8 @@
   */
   
  // $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
+--- a/treeorder_dialog.cpp
++++ b/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>
@@ -895,9 +868,8 @@
   */
   
  // $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
+--- a/treeorder_dialog.h
++++ b/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>
@@ -929,9 +901,8 @@
   */
   
  // $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
+--- a/tv.cpp
++++ b/tv.cpp
 @@ -3,20 +3,19 @@
   * A phylogenetic tree viewer.
   * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -962,10 +933,9 @@
 + * 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
+  // $Id: tv.cpp,v 1.43 2007/03/09 13:58:19 rdmp1c Exp $
+--- a/tv.h
++++ b/tv.h
 @@ -3,20 +3,19 @@
   * A phylogenetic tree viewer.
   * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -997,9 +967,8 @@
   */
   
   // $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
+--- a/tview.cpp
++++ b/tview.cpp
 @@ -3,20 +3,19 @@
   * A phylogenetic tree viewer.
   * Copyright (C) 2001 Roderic D. M. Page <r.page at bio.gla.ac.uk>
@@ -1030,10 +999,9 @@
 + * 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
+  // $Id: tview.cpp,v 1.40 2007/03/09 13:59:19 rdmp1c Exp $
+--- a/tview.h
++++ b/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.diff
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/70_choose_tree.diff	2012-08-02 08:38:00 UTC (rev 11968)
+++ trunk/packages/treeviewx/trunk/debian/patches/70_choose_tree.diff	2012-08-02 10:13:07 UTC (rev 11969)
@@ -1,13 +1,12 @@
 ## 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 @@
+--- a/tview.cpp
++++ b/tview.cpp
+@@ -209,7 +209,7 @@
+         wxT("SVG vector picture files (*.svg)|*.svg"),
+         wxSAVE|wxOVERWRITE_PROMPT);
  
-     dialog.SetSelection(p.GetCurrentTreeNumber());
- 
 -    if (dialog.ShowModal() == wxID_OK)
 +    if ((dialog.ShowModal() == wxID_OK) && (p.GetNumTrees() != 0))
      {
- 		int j = dialog.GetSelection ();				
- #ifdef __WXMAC__
+ 		wxSVGFileDC pictureDC (dialog.GetPath(), 600, 650) ;
+ 		OnDraw (&pictureDC);

Added: trunk/packages/treeviewx/trunk/debian/patches/fix_loading_crash.patch
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/fix_loading_crash.patch	                        (rev 0)
+++ trunk/packages/treeviewx/trunk/debian/patches/fix_loading_crash.patch	2012-08-02 10:13:07 UTC (rev 11969)
@@ -0,0 +1,39 @@
+# Patch from http://code.google.com/p/treeviewx/issues/detail?id=1
+# to fix crash on loading tree file.
+--- a/tview.cpp
++++ b/tview.cpp
+@@ -278,7 +278,7 @@
+ 			char buf[256];
+ 			strcpy (buf, p->GetLabel().c_str());
+ 			wchar_t wbuf[256];
+-			mbstowcs (wbuf, buf, size_t(wbuf));
++			mbstowcs (wbuf, buf, 256);
+ 			s << wbuf;
+ #else
+    			s << p->GetLabel().c_str();
+@@ -563,7 +563,7 @@
+ 		char buf[256];
+ 		strcpy (buf, t.GetName().c_str());
+ 		wchar_t wbuf[256];
+-		mbstowcs (wbuf, buf, size_t(wbuf));
++		mbstowcs (wbuf, buf, 256);
+ 		txt << wbuf;
+ #else
+ 		txt << t.GetName().c_str();
+@@ -712,7 +712,7 @@
+ 		char buf[256];
+ 		strcpy (buf, p.GetIthTreeName(i).c_str());
+ 		wchar_t wbuf[256];
+-		mbstowcs (wbuf, buf, size_t(wbuf));
++		mbstowcs (wbuf, buf, 256);
+ 
+ 		std::wstring tname = wbuf;
+ 
+@@ -1046,6 +1046,7 @@
+ void MyCanvas::OnSize(wxSizeEvent& event)
+ {
+ 	Resize ();
++    Refresh();
+     event.Skip();
+ }
+ 

Modified: trunk/packages/treeviewx/trunk/debian/patches/series
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/series	2012-08-02 08:38:00 UTC (rev 11968)
+++ trunk/packages/treeviewx/trunk/debian/patches/series	2012-08-02 10:13:07 UTC (rev 11969)
@@ -1,2 +1,3 @@
 60_LGPLtoGPL.diff
 70_choose_tree.diff
+fix_loading_crash.patch

Modified: trunk/packages/treeviewx/trunk/debian/rules
===================================================================
--- trunk/packages/treeviewx/trunk/debian/rules	2012-08-02 08:38:00 UTC (rev 11968)
+++ trunk/packages/treeviewx/trunk/debian/rules	2012-08-02 10:13:07 UTC (rev 11969)
@@ -1,8 +1,17 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
+#
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
+%:
+	dh  $@
 
-install/treeviewx::
+#Installation is simply a matter of copying the files, without extensions
+override_dh_install:
+	dh_install
 	install -m 644 bitmaps/treeview.xpm $(CURDIR)/debian/treeviewx/usr/share/pixmaps/treeviewx.xpm
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f debian/stamp-*

Added: trunk/packages/treeviewx/trunk/debian/source/format
===================================================================
--- trunk/packages/treeviewx/trunk/debian/source/format	                        (rev 0)
+++ trunk/packages/treeviewx/trunk/debian/source/format	2012-08-02 10:13:07 UTC (rev 11969)
@@ -0,0 +1 @@
+3.0 (quilt)

Modified: trunk/packages/treeviewx/trunk/debian/watch
===================================================================
--- trunk/packages/treeviewx/trunk/debian/watch	2012-08-02 08:38:00 UTC (rev 11968)
+++ trunk/packages/treeviewx/trunk/debian/watch	2012-08-02 10:13:07 UTC (rev 11969)
@@ -1,4 +1,7 @@
 version=3
 # http://googlecode.debian.net/p/treeviewx/tv.(\d+.*)\.tar\.gz
+#add version mangle to reflect the decision noted in README.source
+#This is nasty but then this watchfile is nigh-on useless without it.
+opts="uversionmangle=s/^0.5$/0.5.1+20100823/" \
 http://code.google.com/p/treeviewx/downloads/list?can=1 \
   .*/tv-(\d[\d\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))|zip)

More information about the debian-med-commit mailing list