[med-svn] [gentle] 02/02: Refresh patches to apply cleanly

Matthias Klumpp mak at moszumanska.debian.org
Sat Aug 22 19:51:23 UTC 2015


This is an automated email from the git hooks/post-receive script.

mak pushed a commit to branch master
in repository gentle.

commit 2d88f237ca076b051fd3a3dd84f2b3cadb15e732
Author: Matthias Klumpp <matthias at tenstral.net>
Date:   Sat Aug 22 21:50:37 2015 +0200

    Refresh patches to apply cleanly
---
 debian/patches/fix-format-codes.patch  | 30 ++++++++++----------
 debian/patches/forward_slashes.patch   |  2 +-
 debian/patches/remove-sqlite-dep.patch |  6 ++--
 debian/patches/remove_clustalw.patch   |  4 +--
 debian/patches/remove_tinyxml.patch    | 12 ++++----
 debian/patches/wx3.0-compat.patch      | 52 +++++++++++++++++-----------------
 6 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/debian/patches/fix-format-codes.patch b/debian/patches/fix-format-codes.patch
index 33e4a7d..5f7346e 100644
--- a/debian/patches/fix-format-codes.patch
+++ b/debian/patches/fix-format-codes.patch
@@ -5,7 +5,7 @@ Bug-Debian: http://bugs.debian.org/750906
 
 --- a/ureadseq.c
 +++ b/ureadseq.c
-@@ -1344,7 +1344,7 @@ short seqFileFormatFp(
+@@ -1344,7 +1344,7 @@
      for (i=0; i < *skiplines; i++) ReadOneLine(sp);
      nlines= 0;
      ReadOneLine(sp);
@@ -14,7 +14,7 @@ Bug-Debian: http://bugs.debian.org/750906
      ReadOneLine(sp); /* 1st seq line */
      for (ps= sp+10, ilen=0; *ps!=0; ps++) if (isprint(*ps)) ilen++;
  
-@@ -1590,7 +1590,7 @@ short writeSeq(FILE *outf, const char *s
+@@ -1590,7 +1590,7 @@
    seqname[l] = 0;
  
    sscanf( seqname, "%30s", idword);
@@ -23,7 +23,7 @@ Bug-Debian: http://bugs.debian.org/750906
    numwidth= strlen(numform)+1;
    nameform[0]= '\0';
  
-@@ -1619,8 +1619,8 @@ short writeSeq(FILE *outf, const char *s
+@@ -1619,8 +1619,8 @@
  
      case kOlsen:  /* Olsen seq. editor takes plain nucs OR Genbank  */
      case kGenBank:
@@ -34,7 +34,7 @@ Bug-Debian: http://bugs.debian.org/750906
     /* fprintf(outf,"ACCESSION   %s\n", accnum); */
        fprintf(outf,"ORIGIN      \n");
        spacer = 11;
-@@ -1634,7 +1634,7 @@ short writeSeq(FILE *outf, const char *s
+@@ -1634,7 +1634,7 @@
        /* somewhat like genbank... \\\*/
        /* fprintf(outf,"\\\\\\\n"); << only at top of file, not each entry... */
        fprintf(outf,"ENTRY           %s \n", idword);
@@ -43,7 +43,7 @@ Bug-Debian: http://bugs.debian.org/750906
     /* fprintf(outf,"ACCESSION       %s\n", accnum); */
        fprintf(outf,"SEQUENCE        \n");
        numwidth = 7;
-@@ -1644,7 +1644,7 @@ short writeSeq(FILE *outf, const char *s
+@@ -1644,7 +1644,7 @@
        strcpy(endstr, "\n///");
        /* run a top number line for PIR */
        for (j=0; j<numwidth; j++) fputc(' ',outf);
@@ -52,7 +52,7 @@ Bug-Debian: http://bugs.debian.org/750906
        fputc('\n',outf);
        linesout += 5;
        break;
-@@ -1654,7 +1654,7 @@ short writeSeq(FILE *outf, const char *s
+@@ -1654,7 +1654,7 @@
          fprintf(outf,">P1;%s\n", idword);
        else
          fprintf(outf,">DL;%s\n", idword);
@@ -61,7 +61,7 @@ Bug-Debian: http://bugs.debian.org/750906
        spacer = 11;
        strcpy(endstr,"*\n");
        linesout += 3;
-@@ -1663,8 +1663,8 @@ short writeSeq(FILE *outf, const char *s
+@@ -1663,8 +1663,8 @@
      case kEMBL:
        fprintf(outf,"ID   %s\n", idword);
    /*  fprintf(outf,"AC   %s\n", accnum); */
@@ -72,7 +72,7 @@ Bug-Debian: http://bugs.debian.org/750906
        strcpy(endstr, "\n//"); /* 11Oct90: bug fix*/
        tab = 4;     /** added 31jan91 */
        spacer = 11; /** added 31jan91 */
-@@ -1675,7 +1675,7 @@ short writeSeq(FILE *outf, const char *s
+@@ -1675,7 +1675,7 @@
      case kGCG:
        fprintf(outf,"%s\n", seqname);
     /* fprintf(outf,"ACCESSION   %s\n", accnum); */
@@ -81,7 +81,7 @@ Bug-Debian: http://bugs.debian.org/750906
        spacer = 11;
        numleft = true;
        strcpy(endstr, "\n");  /* this is insurance to help prevent misreads at eof */
-@@ -1684,13 +1684,13 @@ short writeSeq(FILE *outf, const char *s
+@@ -1684,13 +1684,13 @@
  
      case kStrider: /* ?? map ?*/
        fprintf(outf,"; ### from DNA Strider ;-)\n");
@@ -97,7 +97,7 @@ Bug-Debian: http://bugs.debian.org/750906
        spacer = 4;
        width = 60;
        linesout += 1;
-@@ -1721,7 +1721,7 @@ short writeSeq(FILE *outf, const char *s
+@@ -1721,7 +1721,7 @@
        fprintf(outf,"    id { local id %d },\n", gPretty.atseq);
        fprintf(outf,"    descr { title \"%s\" },\n", seqid);
        fprintf(outf,"    inst {\n");
@@ -106,7 +106,7 @@ Bug-Debian: http://bugs.debian.org/750906
        fprintf(outf,"      seq-data\n");
        if (seqtype == kAmino)
          fprintf(outf,"        iupacaa \"");
-@@ -1743,7 +1743,7 @@ short writeSeq(FILE *outf, const char *s
+@@ -1743,7 +1743,7 @@
        tab  = 0; /* 1; */
        /* strcpy(endstr,";\nend;"); << this is end of all seqs.. */
        /* do a header comment line for paup */
@@ -115,7 +115,7 @@ Bug-Debian: http://bugs.debian.org/750906
        linesout += 1;
        break;
  
-@@ -1760,13 +1760,13 @@ short writeSeq(FILE *outf, const char *s
+@@ -1760,13 +1760,13 @@
        tab  = gPretty.tab;
        /* also add rtf formatting w/ font, size, style */
        if (gPretty.nametop) {
@@ -131,7 +131,7 @@ Bug-Debian: http://bugs.debian.org/750906
                      idword, seqlen, checksum);
        linesout++;
        nameleft= true;
-@@ -1778,7 +1778,7 @@ short writeSeq(FILE *outf, const char *s
+@@ -1778,7 +1778,7 @@
        break;
  
      case kIG:
@@ -140,7 +140,7 @@ Bug-Debian: http://bugs.debian.org/750906
        fprintf(outf,"%s\n", idword);
        strcpy(endstr,"1"); /* == linear dna */
        linesout += 2;
-@@ -1787,7 +1787,7 @@ short writeSeq(FILE *outf, const char *s
+@@ -1787,7 +1787,7 @@
      default :
      case kZuker: /* don't attempt Zuker's ftn format */
      case kPearson:
@@ -149,7 +149,7 @@ Bug-Debian: http://bugs.debian.org/750906
        linesout += 1;
        break;
      }
-@@ -1828,7 +1828,7 @@ short writeSeq(FILE *outf, const char *s
+@@ -1828,7 +1828,7 @@
          s[l++] = ' ';
          }
        if (l1 % 10 == 1 || l1 == width) {
diff --git a/debian/patches/forward_slashes.patch b/debian/patches/forward_slashes.patch
index 1f574f5..b426c2e 100644
--- a/debian/patches/forward_slashes.patch
+++ b/debian/patches/forward_slashes.patch
@@ -2,7 +2,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
+@@ -586,7 +586,7 @@
  	{
          wxHtmlHelpController *hc = new wxHtmlHelpController ( wxHF_DEFAULT_STYLE|wxHF_OPEN_FILES ) ;
          helpfile += myapp()->homedir ;
diff --git a/debian/patches/remove-sqlite-dep.patch b/debian/patches/remove-sqlite-dep.patch
index 2de4a81..a10edcc 100644
--- a/debian/patches/remove-sqlite-dep.patch
+++ b/debian/patches/remove-sqlite-dep.patch
@@ -1,9 +1,9 @@
 Description: remove unused sqlite dep
 Author: Dmitrijs Ledkovs <dmitrij.ledkov at ubuntu.com>
 
---- gentle-1.9+cvs20100605+dfsg1.orig/Makefile.am
-+++ gentle-1.9+cvs20100605+dfsg1/Makefile.am
-@@ -63,7 +63,7 @@ bitmaps/print.bmp \
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -63,7 +63,7 @@
  bitmaps/scissors.bmp
  
  
diff --git a/debian/patches/remove_clustalw.patch b/debian/patches/remove_clustalw.patch
index 49008cb..63d118d 100644
--- a/debian/patches/remove_clustalw.patch
+++ b/debian/patches/remove_clustalw.patch
@@ -3,7 +3,7 @@ Description: Since Debian packaged clustalw is used there is no point in using
 
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -137,24 +137,6 @@ TPhylip.cpp\
+@@ -137,24 +137,6 @@
  TPhyloTree.cpp\
  PCR_Troubleshoot.cpp\
  TProteolysis.cpp\
@@ -28,7 +28,7 @@ Description: Since Debian packaged clustalw is used there is no point in using
  ipc/element.cpp\
  ipc/gp_out.cpp\
  ipc/ipc.cpp\
-@@ -231,12 +213,6 @@ TPhylip.h\
+@@ -231,12 +213,6 @@
  TPhyloTree.h\
  TEliteLaChromLogDialog.h\
  ncoils.h\
diff --git a/debian/patches/remove_tinyxml.patch b/debian/patches/remove_tinyxml.patch
index 53da048..954f054 100644
--- a/debian/patches/remove_tinyxml.patch
+++ b/debian/patches/remove_tinyxml.patch
@@ -3,7 +3,7 @@ Description: Since Debian packaged tinyxml is used there is no point in using
 
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -63,7 +63,7 @@ bitmaps/print.bmp \
+@@ -63,7 +63,7 @@
  bitmaps/scissors.bmp
  
  
@@ -12,7 +12,7 @@ Description: Since Debian packaged tinyxml is used there is no point in using
  GENtle_LDFLAGS = -s
  GENtle_SOURCES = TXMLfile.cpp\
  TVectorTree.cpp\
-@@ -137,10 +137,6 @@ TPhylip.cpp\
+@@ -137,10 +137,6 @@
  TPhyloTree.cpp\
  PCR_Troubleshoot.cpp\
  TProteolysis.cpp\
@@ -23,7 +23,7 @@ Description: Since Debian packaged tinyxml is used there is no point in using
  clustalw/alnscore.cpp\
  clustalw/amenu.cpp\
  clustalw/calcgap.cpp\
-@@ -235,8 +231,6 @@ TPhylip.h\
+@@ -235,8 +231,6 @@
  TPhyloTree.h\
  TEliteLaChromLogDialog.h\
  ncoils.h\
@@ -34,7 +34,7 @@ Description: Since Debian packaged tinyxml is used there is no point in using
  clustalw/general.h \
 --- a/main.h
 +++ b/main.h
-@@ -129,7 +129,11 @@ using namespace std ;
+@@ -129,7 +129,11 @@
  
  // Don't you *EVER* turn this on again!!!!
  //#define TIXML_USE_STL
@@ -48,7 +48,7 @@ Description: Since Debian packaged tinyxml is used there is no point in using
  #include <wx/toolbar.h>
 --- a/TXMLfile.cpp
 +++ b/TXMLfile.cpp
-@@ -50,7 +50,7 @@ void TXMLfile::load ( wxString file )
+@@ -50,7 +50,7 @@
      analyze ( doc ) ;
      }
  
@@ -59,7 +59,7 @@ Description: Since Debian packaged tinyxml is used there is no point in using
          {
 --- a/TXMLfile.h
 +++ b/TXMLfile.h
-@@ -25,7 +25,7 @@ class TXMLfile
+@@ -25,7 +25,7 @@
      TVector *getVector ( int a ) ; ///< Returns pointer to one of the vectors
      
      private :
diff --git a/debian/patches/wx3.0-compat.patch b/debian/patches/wx3.0-compat.patch
index 80f55f6..3270658 100644
--- a/debian/patches/wx3.0-compat.patch
+++ b/debian/patches/wx3.0-compat.patch
@@ -5,7 +5,7 @@ Bug-Debian: http://bugs.debian.org/750906
 
 --- a/TClone.h
 +++ b/TClone.h
-@@ -68,7 +68,7 @@ class TClone
+@@ -68,7 +68,7 @@
  	void parseLines ( wxArrayString &v , char *t , long l ) ; ///< Breaks text into lines
  	void separateNames ( wxString &s1 , wxString &s2 ) ; ///< ???
  	int cmp ( const wxString &s1 , const wxString &s2 ) ; ///< String comparison
@@ -16,7 +16,7 @@ Bug-Debian: http://bugs.debian.org/750906
  	int size ; ///< Sequence length
 --- a/TXMLfile.cpp
 +++ b/TXMLfile.cpp
-@@ -221,7 +221,7 @@ void TXMLfile::readGBqualifiers ( TVecto
+@@ -221,7 +221,7 @@
          {
          char u[100] ;
          sprintf ( u , "short_itemtype%d" , i.getType() ) ;
@@ -37,7 +37,7 @@ Bug-Debian: http://bugs.debian.org/750906
      EVT_CHOICE(VG_MARKER,TVirtualGel::OnMarker)
 --- a/MyChild.cpp
 +++ b/MyChild.cpp
-@@ -1141,7 +1141,7 @@ bool MyChild::runRestriction ( wxString
+@@ -1141,7 +1141,7 @@
  	{
      MyFrame *f = myapp()->frame ; //(MyFrame*) GetParent() ;
      TRestrictionEditor ed ( f , _T("") , wxPoint(-1,-1) , wxSize(600,400) ,
@@ -48,7 +48,7 @@ Bug-Debian: http://bugs.debian.org/750906
      ed.remoteCocktail = &vec->cocktail ;
 --- a/TRestrictionEditor.cpp
 +++ b/TRestrictionEditor.cpp
-@@ -376,7 +376,7 @@ void TRestrictionEditor::res_ll_act ( wx
+@@ -376,7 +376,7 @@
      wxString s = el->GetItemText ( i ) ;
      TRestrictionEnzyme *e = myapp()->frame->LS->getRestrictionEnzyme ( s ) ;
      TEnzymeDialog ed ( this , s , wxPoint(-1,-1) , wxSize(600,400) , 
@@ -59,7 +59,7 @@ Bug-Debian: http://bugs.debian.org/750906
  }
 --- a/TVectorEditor.cpp
 +++ b/TVectorEditor.cpp
-@@ -400,7 +400,7 @@ void TVectorEditor::newProtease ( wxComm
+@@ -400,7 +400,7 @@
      e->setCut ( 0 ) ;
      e->setOverlap ( 0 ) ;
      TEnzymeDialog ed ( this , txt("t_new_protease") , wxPoint(-1,-1) , wxSize(600,400) , 
@@ -70,7 +70,7 @@ Bug-Debian: http://bugs.debian.org/750906
         {
 --- a/TVectorEditorEnzymes.cpp
 +++ b/TVectorEditorEnzymes.cpp
-@@ -116,7 +116,7 @@ void TVectorEditor::enzymeListDlbClick (
+@@ -116,7 +116,7 @@
              wxString s = lb->GetString ( vi[k] ) ;
              TRestrictionEnzyme *e = myapp()->frame->LS->getRestrictionEnzyme ( s ) ;
              TEnzymeDialog ed ( this , s , wxPoint(-1,-1) , wxSize(600,400) , 
@@ -79,7 +79,7 @@ Bug-Debian: http://bugs.debian.org/750906
              ed.initme ( e ) ;
              if ( ed.ShowModal() == wxID_OK )
                 {
-@@ -149,7 +149,7 @@ void TVectorEditor::enzymeListDlbClick (
+@@ -149,7 +149,7 @@
          wxString s = lb->GetString ( vi[0] ) ;
          TRestrictionEnzyme *e = myapp()->frame->LS->getRestrictionEnzyme ( s ) ;
          TEnzymeDialog ed ( this , s , wxPoint(-1,-1) , wxSize(600,400) , 
@@ -88,7 +88,7 @@ Bug-Debian: http://bugs.debian.org/750906
          ed.initme ( e ) ;
          ed.ShowModal() ;
          }
-@@ -335,7 +335,7 @@ void TVectorEditor::newEnzyme ( wxComman
+@@ -335,7 +335,7 @@
      e->setCut ( 0 ) ;
      e->setOverlap ( 0 ) ;
      TEnzymeDialog ed ( this , txt("t_new_enzyme") , wxPoint(-1,-1) , wxSize(600,400) , 
@@ -99,7 +99,7 @@ Bug-Debian: http://bugs.debian.org/750906
         {
 --- a/AminoAcids.cpp
 +++ b/AminoAcids.cpp
-@@ -656,7 +656,7 @@ void TAminoAcids::handleListBox ( wxStri
+@@ -656,7 +656,7 @@
  		{
  		if ( curDisplay )
  			{
@@ -110,7 +110,7 @@ Bug-Debian: http://bugs.debian.org/750906
  		curDisplay = NULL ;
 --- a/CGview.cpp
 +++ b/CGview.cpp
-@@ -111,7 +111,7 @@ void CGdialog::OnRunCGviewer ( wxCommand
+@@ -111,7 +111,7 @@
  
  void CGdialog::OnChooseJar ( wxCommandEvent &event )
  	{
@@ -121,7 +121,7 @@ Bug-Debian: http://bugs.debian.org/750906
  	}
 --- a/ManageDatabase.cpp
 +++ b/ManageDatabase.cpp
-@@ -634,7 +634,7 @@ void TManageDatabaseDialog::pdOnDBchange
+@@ -634,7 +634,7 @@
  void TManageDatabaseDialog::pdOnNew ( wxCommandEvent &ev )
      {
      wxString wildcard = _T("GENtle database (*.db)|*.db") ;
@@ -130,7 +130,7 @@ Bug-Debian: http://bugs.debian.org/750906
      int x = d.ShowModal() ;
      if ( x != wxID_OK ) return ;
  
-@@ -655,7 +655,7 @@ void TManageDatabaseDialog::pdOnNew ( wx
+@@ -655,7 +655,7 @@
  void TManageDatabaseDialog::pdOnAdd ( wxCommandEvent &ev )
      {
      wxString wildcard = _T("GENtle database (*.db)|*.db") ;
@@ -139,7 +139,7 @@ Bug-Debian: http://bugs.debian.org/750906
      int x = d.ShowModal() ;
      if ( x != wxID_OK ) return ;
      
-@@ -965,7 +965,7 @@ bool TManageDatabaseDialog::do_load_DNA
+@@ -965,7 +965,7 @@
          TVectorItem i ;
          i.name = sr[a][sr["di_name"]] ;
          i.desc = sr[a][sr["di_description"]] ;
@@ -150,7 +150,7 @@ Bug-Debian: http://bugs.debian.org/750906
          i.setDirection ( atoi ( sr[a][sr["di_direction"]].mb_str() ) ) ;
 --- a/MyFrame.cpp
 +++ b/MyFrame.cpp
-@@ -727,7 +727,7 @@ void MyFrame::saveImage ( wxBitmap *bmp
+@@ -727,7 +727,7 @@
      name.Replace ( _T("\\") , _T("_") , TRUE ) ;
  	
      wxString lastdir = LS->getOption ( _T("LAST_IMPORT_DIR") , _T("C:") ) ;
@@ -159,7 +159,7 @@ Bug-Debian: http://bugs.debian.org/750906
      if ( d.ShowModal() != wxID_OK ) return ;
      wxString filename = d.GetPath() ;
      
-@@ -764,7 +764,7 @@ void MyFrame::OnFileImport(wxCommandEven
+@@ -764,7 +764,7 @@
  	_T("|") + wcCM5format ;
      wxString lastdir = LS->getOption ( _T("LAST_IMPORT_DIR") , _T("C:") ) ;
      wxFileDialog d ( this , txt("import_file") , lastdir , 
@@ -168,7 +168,7 @@ Bug-Debian: http://bugs.debian.org/750906
      int x = d.ShowModal() ;
      if ( x != wxID_OK ) return ;
      
-@@ -2616,8 +2616,8 @@ void TTestSuite::vectorPressKey ( ChildB
+@@ -2616,8 +2616,8 @@
      if ( r == 10 ) { ev.m_keyCode = WXK_LEFT ; msg = _T("LEFT") ; }
      if ( r == 11 ) { ev.m_keyCode = WXK_UP ; msg = _T("UP") ; }
      if ( r == 12 ) { ev.m_keyCode = WXK_DOWN ; msg = _T("DOWN") ; }
@@ -181,7 +181,7 @@ Bug-Debian: http://bugs.debian.org/750906
      else ac->cSequence->OnCharHook(ev) ;
 --- a/PCR_Troubleshoot.cpp
 +++ b/PCR_Troubleshoot.cpp
-@@ -415,13 +415,13 @@ void PCR_troubleshoot_dialog::scan_Runs
+@@ -415,13 +415,13 @@
  		if ( ( b - a ) / length > 4 )
  			{
  			add_error ( p , nr , msg ,
@@ -197,7 +197,7 @@ Bug-Debian: http://bugs.debian.org/750906
  			a = b - length ;
  			}
  		}
-@@ -489,7 +489,7 @@ wxString PCR_troubleshoot_dialog::invert
+@@ -489,7 +489,7 @@
  	int a ;
  	for ( a = 0 ; a < s.length() ; a++ )
  		{
@@ -208,7 +208,7 @@ Bug-Debian: http://bugs.debian.org/750906
  			case 'C' : s.SetChar ( a , 'G' ) ; break ;
 --- a/SequenceCanvas.cpp
 +++ b/SequenceCanvas.cpp
-@@ -394,13 +394,13 @@ void SequenceCanvas::editSpecialKeyPress
+@@ -394,13 +394,13 @@
        {
        mark ( id , the_sequence->length() , the_sequence->length() , 2 ) ;
        }   	
@@ -226,7 +226,7 @@ Bug-Debian: http://bugs.debian.org/750906
        if ( from > the_sequence->length() ) from = the_sequence->length() ;
 --- a/SequenceTypeAAstructure.cpp
 +++ b/SequenceTypeAAstructure.cpp
-@@ -400,7 +400,7 @@ void SeqAAstructure::draw_amino_acid ( w
+@@ -400,7 +400,7 @@
  	dc.SetPen ( *pen_C ) ;
  	for ( a = 0 ; a < atom_pos.size() ; a++ )
  		{
@@ -237,7 +237,7 @@ Bug-Debian: http://bugs.debian.org/750906
  			case 'S' : if ( can->isPrinting() ) dc.SetPen ( *pen_S ) ; dc.SetBrush ( *brush_S ) ; break ;
 --- a/SequenceTypePlot.cpp
 +++ b/SequenceTypePlot.cpp
-@@ -538,7 +538,7 @@ void SeqPlot::useNcoils ()
+@@ -538,7 +538,7 @@
  		mylog ( "SeqPlot::useNcoils" , wxString::Format ( _T("BEGIN ncoils_function (%d): ") , b ) + s ) ;
  		x = ncoils_function ( (const char*) s.mb_str() , b ) . c_str() ;
  		mylog ( "SeqPlot::useNcoils" , "END ncoils_function" ) ;
@@ -248,7 +248,7 @@ Bug-Debian: http://bugs.debian.org/750906
  		for ( b = 0 ; b < s.length() ; b++ )
 --- a/TImageDisplay.cpp
 +++ b/TImageDisplay.cpp
-@@ -310,7 +310,7 @@ void TMyImagePanel::OnDraw(wxDC& pdc)
+@@ -310,7 +310,7 @@
  
      if ( invert )
      	{
@@ -269,7 +269,7 @@ Bug-Debian: http://bugs.debian.org/750906
      EVT_MENU(MDI_FILE_SAVE,TPhyloTree::OnFileSave)
 --- a/TStorage.cpp
 +++ b/TStorage.cpp
-@@ -272,7 +272,7 @@ TSQLresult TStorage::getObjectSqlite3 (
+@@ -272,7 +272,7 @@
          } while ( rc == SQLITE_BUSY ) ;
      
      ierror = e ? 1 : 0 ;
@@ -278,7 +278,7 @@ Bug-Debian: http://bugs.debian.org/750906
      else error = _T("Alles OK") ;
  
      sqlite3_close ( db ) ;
-@@ -531,7 +531,7 @@ void TStorage::replaceTable ( wxString t
+@@ -531,7 +531,7 @@
          s1 = s2 = _T("") ;
          for ( b = 0 ; b < f.GetCount() ; b++ )
             {
@@ -289,7 +289,7 @@ Bug-Debian: http://bugs.debian.org/750906
             }
 --- a/main.cpp
 +++ b/main.cpp
-@@ -253,7 +253,7 @@ bool MyApp::OnInit()
+@@ -253,7 +253,7 @@
  	if ( wxGetEnv ( _T("COILSDIR") , NULL ) ) wxUnsetEnv ( _T("COILSDIR") ) ;
  	wxSetEnv ( _T("COILSDIR") , homedir ) ;
  #else
@@ -300,7 +300,7 @@ Bug-Debian: http://bugs.debian.org/750906
  	
 --- a/ChildBase.cpp
 +++ b/ChildBase.cpp
-@@ -223,7 +223,7 @@ void ChildBase::OnExport (wxCommandEvent
+@@ -223,7 +223,7 @@
  
  	 wxString wildcard = getExportFilters () ;
      wxString lastdir = myapp()->frame->LS->getOption ( _T("LAST_IMPORT_DIR") , _T("C:") ) ;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/gentle.git



More information about the debian-med-commit mailing list