[med-svn] [Git][med-team/examl][master] 6 commits: New upstream version 3.0.21

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / examl


Commits:
e5ccf5f0 by Andreas Tille at 2018-06-08T13:10:40+02:00
New upstream version 3.0.21
- - - - -
50cede5c by Andreas Tille at 2018-06-08T13:10:43+02:00
Update upstream source from tag 'upstream/3.0.21'

Update to upstream version '3.0.21'
with Debian dir c702ea2c3f8dfa1900586025b4dc938d3b454962
- - - - -
72cb7986 by Andreas Tille at 2018-06-08T13:10:43+02:00
New upstream version

- - - - -
1c3467c2 by Andreas Tille at 2018-06-08T13:10:46+02:00
Point Vcs fields to salsa.debian.org

- - - - -
2825a1f3 by Andreas Tille at 2018-06-08T13:10:46+02:00
Standards-Version: 4.1.4

- - - - -
3565c6f9 by Andreas Tille at 2018-06-08T13:16:02+02:00
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- parser/parsePartitions.c
- versionHeader/version.h


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+examl (3.0.21-1) unstable; urgency=medium
+
+  * New upstream version
+  * Point Vcs fields to salsa.debian.org
+  * Standards-Version: 4.1.4
+
+ -- Andreas Tille <tille at debian.org>  Fri, 08 Jun 2018 13:10:46 +0200
+
 examl (3.0.20-1) unstable; urgency=medium
 
   * New upstream version


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -5,9 +5,9 @@ Section: science
 Priority: optional
 Build-Depends: debhelper (>= 11~),
                libopenmpi-dev
-Standards-Version: 4.1.3
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/examl.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/examl.git
+Standards-Version: 4.1.4
+Vcs-Browser: https://salsa.debian.org/med-team/examl
+Vcs-Git: https://salsa.debian.org/med-team/examl.git
 Homepage: https://github.com/stamatak/ExaML
 
 Package: examl


=====================================
parser/parsePartitions.c
=====================================
--- a/parser/parsePartitions.c
+++ b/parser/parsePartitions.c
@@ -370,7 +370,15 @@ static int myGetline(char **lineptr, int *n, FILE *stream)
   return p - *lineptr;
 }
 
-
+static void nonContiguousError(analdef *adef)
+{
+  if(adef->compressPatterns == FALSE)
+    {
+      printf("\nError: You are not allowed to use interleaved partitions, that is, assign non-contiguous sites\n");
+      printf("to the same partition model, when pattern compression is disabled via the -c flag!\n\n");
+      exit(-1);
+    }
+}
 
 void parsePartitions(analdef *adef, rawdata *rdta, tree *tr)
 {
@@ -499,6 +507,7 @@ void parsePartitions(analdef *adef, rawdata *rdta, tree *tr)
       if(*ch == ',')
 	{	     
 	  upper = lower;
+	  nonContiguousError(adef);
 	  goto SINGLE_NUMBER;
 	}
       
@@ -542,6 +551,7 @@ void parsePartitions(analdef *adef, rawdata *rdta, tree *tr)
       if(*ch == ',')
 	{	 
 	  ch++;
+	  nonContiguousError(adef);
 	  goto numberPairs;
 	}
       
@@ -556,13 +566,8 @@ void parsePartitions(analdef *adef, rawdata *rdta, tree *tr)
 	      exit(-1);
 	    }   
 
-	  if(adef->compressPatterns == FALSE)
-	    {
-	      printf("\nError: You are not allowed to use interleaved partitions, that is, assign non-contiguous sites\n");
-	      printf("to the same partition model, when pattern compression is disabled via the -c flag!\n\n");
-	      exit(-1);
-	    }
-	  
+	  nonContiguousError(adef);
+
 	  l = 0;
 	  while(isNum(*ch))
 	    {
@@ -582,6 +587,7 @@ void parsePartitions(analdef *adef, rawdata *rdta, tree *tr)
 	  if(*ch == ',')
 	    {	       
 	      ch++;
+	      nonContiguousError(adef);
 	      goto numberPairs;
 	    }
 	}  


=====================================
versionHeader/version.h
=====================================
--- a/versionHeader/version.h
+++ b/versionHeader/version.h
@@ -1,4 +1,4 @@
 #define programName        "ExaML"
-#define programVersion     "3.0.20"
-#define programVersionInt  3020
-#define programDate        "January 26 2018"
+#define programVersion     "3.0.21"
+#define programVersionInt  3021
+#define programDate        "May 29 2018"



View it on GitLab: https://salsa.debian.org/med-team/examl/compare/648da51a8bfc03fe8e1526621111f1ef62b8c473...3565c6f9a4f2a90d69b46de02bc6e2174e6c3c6c

-- 
View it on GitLab: https://salsa.debian.org/med-team/examl/compare/648da51a8bfc03fe8e1526621111f1ef62b8c473...3565c6f9a4f2a90d69b46de02bc6e2174e6c3c6c
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20180608/02479dd9/attachment-0001.html>