[med-svn] r7144 - in trunk/packages/treeviewx/trunk/debian: . patches
Charles Plessy
plessy at alioth.debian.org
Thu Jun 23 23:33:19 UTC 2011
Author: plessy
Date: 2011-06-23 23:33:19 +0000 (Thu, 23 Jun 2011)
New Revision: 7144
Removed:
trunk/packages/treeviewx/trunk/debian/README.Debian
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/80_missing_includes.diff
trunk/packages/treeviewx/trunk/debian/patches/90_fix_for_wx2.8.diff
Modified:
trunk/packages/treeviewx/trunk/debian/changelog
trunk/packages/treeviewx/trunk/debian/patches/series
Log:
Deleted patches applied upstream.
Deleted: trunk/packages/treeviewx/trunk/debian/README.Debian
===================================================================
--- trunk/packages/treeviewx/trunk/debian/README.Debian 2011-06-23 23:26:12 UTC (rev 7143)
+++ trunk/packages/treeviewx/trunk/debian/README.Debian 2011-06-23 23:33:19 UTC (rev 7144)
@@ -1,7 +0,0 @@
-TreeView X for Debian
----------------------
-
-The original source code was modified by wrapping some character chains with
-wxT(), in order to build it with wxGTK 2.6.
-
- -- Charles Plessy <charles-debian-nospam at plessy.org>, Sat, 11 Feb 2006 17:27:26 +0900
Modified: trunk/packages/treeviewx/trunk/debian/changelog
===================================================================
--- trunk/packages/treeviewx/trunk/debian/changelog 2011-06-23 23:26:12 UTC (rev 7143)
+++ trunk/packages/treeviewx/trunk/debian/changelog 2011-06-23 23:33:19 UTC (rev 7144)
@@ -1,6 +1,10 @@
treeviewx (0.5.1+20100823-1) UNRELEASED; urgency=low
* New upstream version, hosted on Google Code.
+ * Deleted debian/patches 45_gcc4.3.diff, 50_wxT_tv.cpp.diff,
+ 51_wxT_tview.cpp.diff, 80_missing_includes.diff, 90_fix_for_wx2.8.diff,
+ applied upstream, and debian/README.Debian, that only mentionned these
+ patches.
* Corrected Vcs-* URLs in debian/control.
* Using Debhelper 8 (debian/control, debian/compat).
* Incremented Standards-Version to reflect conformance with Policy 3.9.2.
Deleted: trunk/packages/treeviewx/trunk/debian/patches/45_gcc4.3.diff
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/45_gcc4.3.diff 2011-06-23 23:26:12 UTC (rev 7143)
+++ trunk/packages/treeviewx/trunk/debian/patches/45_gcc4.3.diff 2011-06-23 23:33:19 UTC (rev 7144)
@@ -1,21 +0,0 @@
-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>
Deleted: trunk/packages/treeviewx/trunk/debian/patches/50_wxT_tv.cpp.diff
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/50_wxT_tv.cpp.diff 2011-06-23 23:26:12 UTC (rev 7143)
+++ trunk/packages/treeviewx/trunk/debian/patches/50_wxT_tv.cpp.diff 2011-06-23 23:33:19 UTC (rev 7144)
@@ -1,17 +0,0 @@
-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();
Deleted: trunk/packages/treeviewx/trunk/debian/patches/51_wxT_tview.cpp.diff
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/51_wxT_tview.cpp.diff 2011-06-23 23:26:12 UTC (rev 7143)
+++ trunk/packages/treeviewx/trunk/debian/patches/51_wxT_tview.cpp.diff 2011-06-23 23:33:19 UTC (rev 7144)
@@ -1,25 +0,0 @@
-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)
Deleted: trunk/packages/treeviewx/trunk/debian/patches/80_missing_includes.diff
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/80_missing_includes.diff 2011-06-23 23:26:12 UTC (rev 7143)
+++ trunk/packages/treeviewx/trunk/debian/patches/80_missing_includes.diff 2011-06-23 23:33:19 UTC (rev 7144)
@@ -1,71 +0,0 @@
-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 )
Deleted: trunk/packages/treeviewx/trunk/debian/patches/90_fix_for_wx2.8.diff
===================================================================
--- trunk/packages/treeviewx/trunk/debian/patches/90_fix_for_wx2.8.diff 2011-06-23 23:26:12 UTC (rev 7143)
+++ trunk/packages/treeviewx/trunk/debian/patches/90_fix_for_wx2.8.diff 2011-06-23 23:33:19 UTC (rev 7144)
@@ -1,15 +0,0 @@
-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 2011-06-23 23:26:12 UTC (rev 7143)
+++ trunk/packages/treeviewx/trunk/debian/patches/series 2011-06-23 23:33:19 UTC (rev 7144)
@@ -1,7 +1,2 @@
-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
-90_fix_for_wx2.8.diff
More information about the debian-med-commit
mailing list