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

[Charles Plessy]

Author: plessy
Date: 2010-01-28 10:57:50 +0000 (Thu, 28 Jan 2010)
New Revision: 4589

Added:
   trunk/packages/treeviewx/trunk/debian/patches/90_fix_for_wx2.8.diff
Modified:
   trunk/packages/treeviewx/trunk/debian/changelog
   trunk/packages/treeviewx/trunk/debian/control
   trunk/packages/treeviewx/trunk/debian/copyright
   trunk/packages/treeviewx/trunk/debian/patches/series
Log:
Build against wxWindows 2.8, and other minor packaging changes.


Modified: trunk/packages/treeviewx/trunk/debian/changelog
===================================================================
--- trunk/packages/treeviewx/trunk/debian/changelog	2010-01-26 14:25:28 UTC (rev 4588)
+++ trunk/packages/treeviewx/trunk/debian/changelog	2010-01-28 10:57:50 UTC (rev 4589)
@@ -1,10 +1,17 @@
-treeviewx (0.5.1-7) UNRELEASED; urgency=low
+treeviewx (0.5.1-7) unstable; urgency=low
 
   * Refreshed debian/copyright according to latest developments
     of the machine-readable format.
-  * Collected upstream informations in debian/upstream-metadata.yaml
+  * Collected upstream information in debian/upstream-metadata.yaml
+    and removed bibliographic information from the long description
+    (debian/control).
+  * Added in ‘debian/patches/90_fix_for_wx2.8.diff’ Ryan Niebur's patch
+    to build TreeView X with wxWidgets 2.8 (Closes: #567238, thanks!).
+  * Build against libwxgtk2.8-dev (debian/control).
+  * Checked conformance with Policy 3.8.4 and incremented Standards-Version
+    to reflect this (debian/control, no changes needed).
 
- -- Charles Plessy <plessy at debian.org>  Tue, 01 Sep 2009 13:02:38 +0200
+ -- Charles Plessy <plessy at debian.org>  Thu, 28 Jan 2010 18:52:23 +0900
 
 treeviewx (0.5.1-6) unstable; urgency=low
 
@@ -18,7 +25,7 @@
   * Standards-Version: 3.8.3 (Added README.source)
   * debhelper 7
   * Added myself to uploaders
-  * Tested wether package also build against libwxgtk2.8-dev but failed
+  * Tested whether package also build against libwxgtk2.8-dev but failed
     -> Upstream should be contacted about wxgtk upgrade to be safe for
        the future
   * Removed explicit dependency from libgnomeprintui2.2-0
@@ -74,7 +81,7 @@
 
 treeviewx (0.5.1-2) unstable; urgency=low
 
-  * Added a transitional dependancy on libgnomeprintui2.2-0, thanks to Roger
+  * Added a transitional dependency on libgnomeprintui2.2-0, thanks to Roger
     Leigh for understanding the problem. Closes: #392219
   * Fixed the debian/watch file.
   * Added an example tree (courtesy of Roger Leigh).

Modified: trunk/packages/treeviewx/trunk/debian/control
===================================================================
--- trunk/packages/treeviewx/trunk/debian/control	2010-01-26 14:25:28 UTC (rev 4588)
+++ trunk/packages/treeviewx/trunk/debian/control	2010-01-28 10:57:50 UTC (rev 4589)
@@ -5,8 +5,8 @@
 DM-Upload-Allowed: yes
 Uploaders: Charles Plessy <plessy at debian.org>,
  Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 7.1), cdbs, autotools-dev, quilt, libwxgtk2.6-dev
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7.1), cdbs, autotools-dev, quilt, libwxgtk2.8-dev
+Standards-Version: 3.8.4
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/treeviewx/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/treeviewx/trunk/
 Homepage: http://darwin.zoology.gla.ac.uk/~rpage/treeviewx/
@@ -20,7 +20,3 @@
  (such as those output by PAUP*, ClustalX, TREE-PUZZLE, and other programs). It
  allows to order the branches of the trees, and to export the trees in SVG
  format.
- .
- The program was written by Rod Page r.page at bio.gla.ac.uk using the wxWidgets
- C++ library. It was published in Computer Applications in the Biosciences. 1996
- 12: 357-358.

Modified: trunk/packages/treeviewx/trunk/debian/copyright
===================================================================
--- trunk/packages/treeviewx/trunk/debian/copyright	2010-01-26 14:25:28 UTC (rev 4588)
+++ trunk/packages/treeviewx/trunk/debian/copyright	2010-01-28 10:57:50 UTC (rev 4589)
@@ -55,7 +55,7 @@
 License: Same as TreeView X
 
 Files: debian/*
-Copyright: © 2006-2009 Charles Plessy <charles-debian-nospam at plessy.org>
+Copyright: © 2006–2010 Charles Plessy <plessy at debian.org>
            © 2007 David Paleino <d.paleino at gmail.com>
 License: PD
  Please treat the packaging work as if it were in the public domain.

Added: trunk/packages/treeviewx/trunk/debian/patches/90_fix_for_wx2.8.diff
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/90_fix_for_wx2.8.diff	                        (rev 0)
+++ trunk/packages/treeviewx/trunk/debian/patches/90_fix_for_wx2.8.diff	2010-01-28 10:57:50 UTC (rev 4589)
@@ -0,0 +1,15 @@
+Author: Ryan Niebur
+Bug-Debian: http://bugs.debian.org/567238
+Description: To build with wxwidgets 2.8
+Forwarded: Roderic Page <r.page at bio.gla.ac.uk>
+--- treeviewx-0.5.1.orig/tview.cpp
++++ treeviewx-0.5.1/tview.cpp
+@@ -994,7 +994,7 @@
+ MyCanvas::MyCanvas(wxView *v, wxMDIChildFrame *frame, const wxPoint& pos, const wxSize& size, long style):
+  wxScrolledWindow(frame, -1, pos, size, style)
+ {
+-	SetBackgroundColour(wxColour("WHITE"));
++	SetBackgroundColour(wxColour(wxT("WHITE")));
+ 	view = v;
+ 	magnification = 1;
+ }

Modified: trunk/packages/treeviewx/trunk/debian/patches/series
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/series	2010-01-26 14:25:28 UTC (rev 4588)
+++ trunk/packages/treeviewx/trunk/debian/patches/series	2010-01-28 10:57:50 UTC (rev 4589)
@@ -4,3 +4,4 @@
 60_LGPLtoGPL.diff
 70_choose_tree.diff
 80_missing_includes.diff
+90_fix_for_wx2.8.diff