[med-svn] [indelible] 01/02: remove unnecessary whitespace from the end of sequences

[Fabian Klötzl]

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

kloetzl-guest pushed a commit to branch master
in repository indelible.

commit ad2778d5af7709ccb75205dba5918a4af4568d69
Author: Fabian Klötzl <fabian at kloetzl.info>
Date:   Mon Oct 2 15:01:15 2017 +0200

    remove unnecessary whitespace from the end of sequences
---
 .../0004-added-auto-tools-build-system.patch       |  2 +-
 ...cessary-whitespace-from-the-end-of-sequen.patch | 66 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/debian/patches/0004-added-auto-tools-build-system.patch b/debian/patches/0004-added-auto-tools-build-system.patch
index 20b2ee5..6151ded 100644
--- a/debian/patches/0004-added-auto-tools-build-system.patch
+++ b/debian/patches/0004-added-auto-tools-build-system.patch
@@ -13,7 +13,7 @@ I added files for autoconf and automake to help with the installation.
 
 diff --git a/Makefile.am b/Makefile.am
 new file mode 100644
-index 0000000..26441f1
+index 0000000..dd11268
 --- /dev/null
 +++ b/Makefile.am
 @@ -0,0 +1,30 @@
diff --git a/debian/patches/0005-remove-unnecessary-whitespace-from-the-end-of-sequen.patch b/debian/patches/0005-remove-unnecessary-whitespace-from-the-end-of-sequen.patch
new file mode 100644
index 0000000..68040b0
--- /dev/null
+++ b/debian/patches/0005-remove-unnecessary-whitespace-from-the-end-of-sequen.patch
@@ -0,0 +1,66 @@
+From: =?utf-8?q?Fabian_Kl=C3=B6tzl?= <fabian at kloetzl.info>
+Date: Mon, 2 Oct 2017 14:56:30 +0200
+Subject: remove unnecessary whitespace from the end of sequences
+
+---
+ src/indelible.cpp | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/indelible.cpp b/src/indelible.cpp
+index 75ce82a..8c4a696 100644
+--- a/src/indelible.cpp
++++ b/src/indelible.cpp
+@@ -3771,7 +3771,7 @@ void printresultsout(int currentrep,  string filenamestub, int ntaxa, int myleng
+ 		//	PrintProgress2( blocknumber,  numberofevolveblocks,  thisrep,  reps, printcount);
+ 
+ 			for(int j=0; j<TsequencesINT.size(); j++) makeprintseqLEAF(j,lastlengthcount, (TinsPOS.at(j)).at(i), (TsequencesINT.at(j)).at(i), (TinsINT.at(j)).at(i), i, (*results), (*results2),  0) ;
+-			(*results)<<"     "<<endl; (*results2)<<"     "<<endl;
++			(*results)<<endl; (*results2)<<endl;
+ 		}
+ 
+ //cout<<endl;
+@@ -3809,7 +3809,7 @@ if(ancestralprint)
+ 				//		PrintProgress2( blocknumber,  numberofevolveblocks,  thisrep,  reps, printcount);
+ 						
+ 						for(int j=0; j<TsequencesINT.size(); j++) makeprintseqINT(j,lastlengthcount, (TinsPOS.at(j)).at(i), (TsequencesINT.at(j)).at(i),(TinsINT.at(j)).at(i),i,(*results3), 1); 
+-						(*results3)<<"     "<<endl;
++						(*results3)<<endl;
+ 
+ 					//}
+ 
+@@ -3827,7 +3827,7 @@ if(ancestralprint)
+ //		cout<<" Printing root."<<endl;
+ 		
+ 		for(int j=0; j<TsequencesINT.size(); j++) makeprintseqINT(j,lastlengthcount, (TinsPOS.at(j)).at(0), (TsequencesINT.at(j)).at(0),(TinsINT.at(j)).at(0),0,*results3, 1); 
+-		(*results3)<<"     "<<endl;
++		(*results3)<<endl;
+ 	}
+ 	else
+ 	{
+@@ -3853,7 +3853,7 @@ if(ancestralprint)
+ 		//		PrintProgress2( blocknumber,  numberofevolveblocks,  thisrep,  reps, printcount);
+ 				
+ 				for(int j=0; j<TsequencesINT.size(); j++) makeprintseqINT(j,lastlengthcount, (TinsPOS.at(j)).at(i), (TsequencesINT.at(j)).at(i),(TinsINT.at(j)).at(i),i,*results, 1); 
+-				(*results)<<"     "<<endl;
++				(*results)<<endl;
+ 
+ 			}
+ 	
+@@ -3871,7 +3871,7 @@ if(ancestralprint)
+ 	//	cout<<" Printing root."<<endl;
+ 
+ 		for(int j=0; j<TsequencesINT.size(); j++) makeprintseqINT(j,lastlengthcount, (TinsPOS.at(j)).at(0), (TsequencesINT.at(j)).at(0),(TinsINT.at(j)).at(0),0,*results, 1); 
+-		(*results)<<"     "<<endl;
++		(*results)<<endl;
+ 
+ 	}
+ 		
+@@ -3885,7 +3885,7 @@ if(ancestralprint)
+ 		
+ 		if(fileperrep) (*results)<<paupend; else (*results)<<paupmiddle;
+ 		
+-		(*results)<<"     "<<endl;(*results2)<<"     "<<endl;
++		(*results)<<endl;(*results2)<<endl;
+ 		
+ 		
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 5cf56d6..a60b50c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-added-documentation-index-page.patch
 0003-added-manpage.patch
 0004-added-auto-tools-build-system.patch
+0005-remove-unnecessary-whitespace-from-the-end-of-sequen.patch

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