[med-svn] r17294 - trunk/packages/gentle/trunk/debian/patches

[Andreas Tille]

Author: tille
Date: 2014-06-25 12:05:33 +0000 (Wed, 25 Jun 2014)
New Revision: 17294

Modified:
   trunk/packages/gentle/trunk/debian/patches/forward_slashes.patch
   trunk/packages/gentle/trunk/debian/patches/remove_clustalw.patch
   trunk/packages/gentle/trunk/debian/patches/remove_tinyxml.patch
Log:
Update patches


Modified: trunk/packages/gentle/trunk/debian/patches/forward_slashes.patch
===================================================================
--- trunk/packages/gentle/trunk/debian/patches/forward_slashes.patch	2014-06-25 11:57:26 UTC (rev 17293)
+++ trunk/packages/gentle/trunk/debian/patches/forward_slashes.patch	2014-06-25 12:05:33 UTC (rev 17294)
@@ -1,8 +1,8 @@
-Index: gentle-1.9+cvs20100605+dfsg/MyFrame.cpp
-===================================================================
---- gentle-1.9+cvs20100605+dfsg.orig/MyFrame.cpp	2010-06-17 18:31:13.000000000 +0200
-+++ gentle-1.9+cvs20100605+dfsg/MyFrame.cpp	2010-06-17 18:33:38.000000000 +0200
-@@ -586,7 +586,7 @@
+Description: Use forward slashes to find help files on POSIX systems
+
+--- a/MyFrame.cpp
++++ b/MyFrame.cpp
+@@ -586,7 +586,7 @@ void MyFrame::OnHelp(wxCommandEvent& eve
  	{
          wxHtmlHelpController *hc = new wxHtmlHelpController ( wxHF_DEFAULT_STYLE|wxHF_OPEN_FILES ) ;
          helpfile += myapp()->homedir ;

Modified: trunk/packages/gentle/trunk/debian/patches/remove_clustalw.patch
===================================================================
--- trunk/packages/gentle/trunk/debian/patches/remove_clustalw.patch	2014-06-25 11:57:26 UTC (rev 17293)
+++ trunk/packages/gentle/trunk/debian/patches/remove_clustalw.patch	2014-06-25 12:05:33 UTC (rev 17294)
@@ -1,8 +1,9 @@
-Index: gentle-1.9+20100602+dfsg/Makefile.am
-===================================================================
---- gentle-1.9+20100602+dfsg.orig/Makefile.am	2010-06-05 16:36:41.000000000 +0200
-+++ gentle-1.9+20100602+dfsg/Makefile.am	2010-06-05 16:36:41.000000000 +0200
-@@ -137,24 +137,6 @@
+Description: Since Debian packaged clustalw is used there is no point in using
+  the code copy provided by gentle upstream
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -137,24 +137,6 @@ TPhylip.cpp\
  TPhyloTree.cpp\
  PCR_Troubleshoot.cpp\
  TProteolysis.cpp\
@@ -27,7 +28,7 @@
  ipc/element.cpp\
  ipc/gp_out.cpp\
  ipc/ipc.cpp\
-@@ -231,12 +213,6 @@
+@@ -231,12 +213,6 @@ TPhylip.h\
  TPhyloTree.h\
  TEliteLaChromLogDialog.h\
  ncoils.h\

Modified: trunk/packages/gentle/trunk/debian/patches/remove_tinyxml.patch
===================================================================
--- trunk/packages/gentle/trunk/debian/patches/remove_tinyxml.patch	2014-06-25 11:57:26 UTC (rev 17293)
+++ trunk/packages/gentle/trunk/debian/patches/remove_tinyxml.patch	2014-06-25 12:05:33 UTC (rev 17294)
@@ -1,8 +1,9 @@
-Index: gentle-1.9+20100602+dfsg/Makefile.am
-===================================================================
---- gentle-1.9+20100602+dfsg.orig/Makefile.am	2010-06-02 11:08:25.000000000 +0200
-+++ gentle-1.9+20100602+dfsg/Makefile.am	2010-06-02 11:10:15.000000000 +0200
-@@ -63,7 +63,7 @@
+Description: Since Debian packaged tinyxml is used there is no point in using
+  the code copy provided by gentle upstream
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -63,7 +63,7 @@ bitmaps/print.bmp \
  bitmaps/scissors.bmp
  
  
@@ -11,7 +12,7 @@
  GENtle_LDFLAGS = -s
  GENtle_SOURCES = TXMLfile.cpp\
  TVectorTree.cpp\
-@@ -137,10 +137,6 @@
+@@ -137,10 +137,6 @@ TPhylip.cpp\
  TPhyloTree.cpp\
  PCR_Troubleshoot.cpp\
  TProteolysis.cpp\
@@ -22,7 +23,7 @@
  clustalw/alnscore.cpp\
  clustalw/amenu.cpp\
  clustalw/calcgap.cpp\
-@@ -235,8 +231,6 @@
+@@ -235,8 +231,6 @@ TPhylip.h\
  TPhyloTree.h\
  TEliteLaChromLogDialog.h\
  ncoils.h\
@@ -31,11 +32,9 @@
  clustalw/clustalw.h\
  clustalw/dayhoff.h \
  clustalw/general.h \
-Index: gentle-1.9+20100602+dfsg/main.h
-===================================================================
---- gentle-1.9+20100602+dfsg.orig/main.h	2010-06-02 22:02:39.000000000 +0200
-+++ gentle-1.9+20100602+dfsg/main.h	2010-06-02 22:03:57.000000000 +0200
-@@ -129,7 +129,11 @@
+--- a/main.h
++++ b/main.h
+@@ -129,7 +129,11 @@ using namespace std ;
  
  // Don't you *EVER* turn this on again!!!!
  //#define TIXML_USE_STL
@@ -47,11 +46,9 @@
  
  #include <wx/wx.h>
  #include <wx/toolbar.h>
-Index: gentle-1.9+20100602+dfsg/TXMLfile.cpp
-===================================================================
---- gentle-1.9+20100602+dfsg.orig/TXMLfile.cpp	2010-06-02 22:07:18.000000000 +0200
-+++ gentle-1.9+20100602+dfsg/TXMLfile.cpp	2010-06-02 22:22:56.000000000 +0200
-@@ -50,7 +50,7 @@
+--- a/TXMLfile.cpp
++++ b/TXMLfile.cpp
+@@ -50,7 +50,7 @@ void TXMLfile::load ( wxString file )
      analyze ( doc ) ;
      }
  
@@ -60,11 +57,9 @@
      {
      if ( doc.FirstChild ( "GBSeq" ) )
          {
-Index: gentle-1.9+20100602+dfsg/TXMLfile.h
-===================================================================
---- gentle-1.9+20100602+dfsg.orig/TXMLfile.h	2010-06-02 22:13:31.000000000 +0200
-+++ gentle-1.9+20100602+dfsg/TXMLfile.h	2010-06-02 22:22:32.000000000 +0200
-@@ -25,7 +25,7 @@
+--- a/TXMLfile.h
++++ b/TXMLfile.h
+@@ -25,7 +25,7 @@ class TXMLfile
      TVector *getVector ( int a ) ; ///< Returns pointer to one of the vectors
      
      private :